Skip to content

Commit 1a47458

Browse files
aleks-faleks-f
committed
mac/clang build fixes
1 parent 2392f34 commit 1a47458

10 files changed

Lines changed: 18 additions & 16 deletions

File tree

‎Foundation/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel \
2222
NotificationQueue PriorityNotificationQueue TimedNotificationQueue \
2323
NullStream NumberFormatter NumberParser NumericString AbstractObserver \
2424
Path PatternFormatter Process PurgeStrategy RWLock Random RandomStream \
25-
RecursiveDirectoryIteratorStrategy RegularExpression RefCountedObject Runnable RotateStrategy \
25+
DirectoryIteratorStrategy RegularExpression RefCountedObject Runnable RotateStrategy \
2626
SHA1Engine Semaphore SharedLibrary SimpleFileChannel \
2727
SignalHandler SplitterChannel SortedDirectoryIterator Stopwatch StreamChannel \
2828
StreamConverter StreamCopier StreamTokenizer String StringTokenizer SynchronizedObject \

‎Foundation/include/Poco/ListMap.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ class ListMap
128128
/// or iterator pointing to the end if entry is
129129
/// not found.
130130
{
131-
Container::const_iterator it = _list.begin();
132-
Container::const_iterator end = _list.end();
131+
typename Container::const_iterator it = _list.begin();
132+
typename Container::const_iterator end = _list.end();
133133
for(; it != end; ++it)
134134
{
135135
if (isEqual(it->first, key)) return it;
@@ -143,8 +143,8 @@ class ListMap
143143
/// or iterator pointing to the end if entry is
144144
/// not found.
145145
{
146-
Container::iterator it = _list.begin();
147-
Container::iterator end = _list.end();
146+
typename Container::iterator it = _list.begin();
147+
typename Container::iterator end = _list.end();
148148
for(; it != end; ++it)
149149
{
150150
if (isEqual(it->first, key)) return it;

‎Foundation/testsuite/Makefile-Driver‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
1616
DateTimeParserTest DateTimeTest LocalDateTimeTest DateTimeTestSuite DigestStreamTest \
1717
Driver DynamicFactoryTest FPETest FileChannelTest FileTest GlobTest FilesystemTestSuite \
1818
FIFOBufferStreamTest FoundationTestSuite HMACEngineTest HexBinaryTest LoggerTest \
19-
LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest \
19+
ListMapTest LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest \
2020
NamedEventTest NamedMutexTest ProcessesTestSuite ProcessTest \
2121
MemoryPoolTest MD4EngineTest MD5EngineTest ManifestTest \
2222
NDCTest NotificationCenterTest NotificationQueueTest \

‎JSON/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ include $(POCO_BASE)/build/rules/global
1010

1111
INCLUDE += -I $(POCO_BASE)/JSON/include/Poco/JSON
1212

13-
objects = Array Object Parser Handler \
14-
Stringifier ParseHandler Query JSONException \
13+
objects = Array Object Parser Handler Stringifier \
14+
ParseHandler PrintHandler Query JSONException \
1515
Template TemplateCache
1616

1717
target = PocoJSON

‎JSON/include/Poco/JSON/Object.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
#include "Poco/JSON/JSON.h"
4444
#include "Poco/JSON/Array.h"
45+
#include "Poco/JSON/Stringifier.h"
4546
#include "Poco/SharedPtr.h"
4647
#include "Poco/Dynamic/Var.h"
4748
#include <map>
@@ -156,8 +157,10 @@ class JSON_API Object
156157
out << '{';
157158

158159
if (indent > 0) out << std::endl;
159-
160-
for (C::const_iterator it = container.begin(); it != container.end();)
160+
161+
typename C::const_iterator it = container.begin();
162+
typename C::const_iterator end = container.end();
163+
for (; it != end;)
161164
{
162165
for(int i = 0; i < indent; i++) out << ' ';
163166

‎JSON/src/Object.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535

3636

3737
#include "Poco/JSON/Object.h"
38-
#include "Poco/JSON/Array.h"
39-
#include "Poco/JSON/Stringifier.h"
4038
#include <iostream>
4139
#include <sstream>
4240

‎JSON/src/PrintHandler.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
#include "Poco/JSON/PrintHandler.h"
3838
#include "Poco/JSON/Stringifier.h"
39+
#include <iostream>
3940

4041

4142
namespace Poco {

‎Net/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SHAREDOPT_CXX += -DNet_EXPORTS
1212

1313
objects = \
1414
DNS HTTPResponse HostEntry Socket \
15-
DatagramSocket HTTPServer IPAddress IPAddressImpl SocketAddress SocketAddress \
15+
DatagramSocket HTTPServer IPAddress IPAddressImpl SocketAddress SocketAddressImpl \
1616
HTTPBasicCredentials HTTPCookie HTMLForm MediaType DialogSocket \
1717
DatagramSocketImpl FilePartSource HTTPServerConnection MessageHeader \
1818
HTTPChunkedStream HTTPServerConnectionFactory MulticastSocket SocketStream \
@@ -25,7 +25,7 @@ objects = \
2525
HTTPRequestHandler HTTPStream HTTPIOStream ServerSocket TCPServerDispatcher TCPServerConnectionFactory \
2626
HTTPRequestHandlerFactory HTTPStreamFactory ServerSocketImpl TCPServerParams \
2727
QuotedPrintableEncoder QuotedPrintableDecoder StringPartSource \
28-
FTPClientSession FTPStreamFactory PartHandler PartSource NullPartHandler \
28+
FTPClientSession FTPStreamFactory PartHandler PartSource PartStore NullPartHandler \
2929
SocketReactor SocketNotifier SocketNotification AbstractHTTPRequestHandler \
3030
MailRecipient MailMessage MailStream SMTPClientSession POP3ClientSession \
3131
RawSocket RawSocketImpl ICMPClient ICMPEventArgs ICMPPacket ICMPPacketImpl \

‎Net/include/Poco/Net/FilePartSource.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class Net_API FilePartSource: public PartSource
8080
std::istream& stream();
8181
/// Returns a file input stream for the given file.
8282

83-
const std::string& filename();
83+
const std::string& filename() const;
8484
/// Returns the filename portion of the path.
8585

8686
private:

‎Net/src/FilePartSource.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ std::istream& FilePartSource::stream()
9090
}
9191

9292

93-
const std::string& FilePartSource::filename()
93+
const std::string& FilePartSource::filename() const
9494
{
9595
return _filename;
9696
}

0 commit comments

Comments
 (0)