mirror of
https://github.com/pocoproject/poco.git
synced 2025-03-30 07:26:33 +02:00
mac/clang build fixes
This commit is contained in:
parent
2392f34974
commit
1a474584c3
@ -22,7 +22,7 @@ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel \
|
||||
NotificationQueue PriorityNotificationQueue TimedNotificationQueue \
|
||||
NullStream NumberFormatter NumberParser NumericString AbstractObserver \
|
||||
Path PatternFormatter Process PurgeStrategy RWLock Random RandomStream \
|
||||
RecursiveDirectoryIteratorStrategy RegularExpression RefCountedObject Runnable RotateStrategy \
|
||||
DirectoryIteratorStrategy RegularExpression RefCountedObject Runnable RotateStrategy \
|
||||
SHA1Engine Semaphore SharedLibrary SimpleFileChannel \
|
||||
SignalHandler SplitterChannel SortedDirectoryIterator Stopwatch StreamChannel \
|
||||
StreamConverter StreamCopier StreamTokenizer String StringTokenizer SynchronizedObject \
|
||||
|
@ -128,8 +128,8 @@ public:
|
||||
/// or iterator pointing to the end if entry is
|
||||
/// not found.
|
||||
{
|
||||
Container::const_iterator it = _list.begin();
|
||||
Container::const_iterator end = _list.end();
|
||||
typename Container::const_iterator it = _list.begin();
|
||||
typename Container::const_iterator end = _list.end();
|
||||
for(; it != end; ++it)
|
||||
{
|
||||
if (isEqual(it->first, key)) return it;
|
||||
@ -143,8 +143,8 @@ public:
|
||||
/// or iterator pointing to the end if entry is
|
||||
/// not found.
|
||||
{
|
||||
Container::iterator it = _list.begin();
|
||||
Container::iterator end = _list.end();
|
||||
typename Container::iterator it = _list.begin();
|
||||
typename Container::iterator end = _list.end();
|
||||
for(; it != end; ++it)
|
||||
{
|
||||
if (isEqual(it->first, key)) return it;
|
||||
|
@ -16,7 +16,7 @@ objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
|
||||
DateTimeParserTest DateTimeTest LocalDateTimeTest DateTimeTestSuite DigestStreamTest \
|
||||
Driver DynamicFactoryTest FPETest FileChannelTest FileTest GlobTest FilesystemTestSuite \
|
||||
FIFOBufferStreamTest FoundationTestSuite HMACEngineTest HexBinaryTest LoggerTest \
|
||||
LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest \
|
||||
ListMapTest LoggingFactoryTest LoggingRegistryTest LoggingTestSuite LogStreamTest \
|
||||
NamedEventTest NamedMutexTest ProcessesTestSuite ProcessTest \
|
||||
MemoryPoolTest MD4EngineTest MD5EngineTest ManifestTest \
|
||||
NDCTest NotificationCenterTest NotificationQueueTest \
|
||||
|
@ -10,8 +10,8 @@ include $(POCO_BASE)/build/rules/global
|
||||
|
||||
INCLUDE += -I $(POCO_BASE)/JSON/include/Poco/JSON
|
||||
|
||||
objects = Array Object Parser Handler \
|
||||
Stringifier ParseHandler Query JSONException \
|
||||
objects = Array Object Parser Handler Stringifier \
|
||||
ParseHandler PrintHandler Query JSONException \
|
||||
Template TemplateCache
|
||||
|
||||
target = PocoJSON
|
||||
|
@ -42,6 +42,7 @@
|
||||
|
||||
#include "Poco/JSON/JSON.h"
|
||||
#include "Poco/JSON/Array.h"
|
||||
#include "Poco/JSON/Stringifier.h"
|
||||
#include "Poco/SharedPtr.h"
|
||||
#include "Poco/Dynamic/Var.h"
|
||||
#include <map>
|
||||
@ -156,8 +157,10 @@ private:
|
||||
out << '{';
|
||||
|
||||
if (indent > 0) out << std::endl;
|
||||
|
||||
for (C::const_iterator it = container.begin(); it != container.end();)
|
||||
|
||||
typename C::const_iterator it = container.begin();
|
||||
typename C::const_iterator end = container.end();
|
||||
for (; it != end;)
|
||||
{
|
||||
for(int i = 0; i < indent; i++) out << ' ';
|
||||
|
||||
|
@ -35,8 +35,6 @@
|
||||
|
||||
|
||||
#include "Poco/JSON/Object.h"
|
||||
#include "Poco/JSON/Array.h"
|
||||
#include "Poco/JSON/Stringifier.h"
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
|
@ -36,6 +36,7 @@
|
||||
|
||||
#include "Poco/JSON/PrintHandler.h"
|
||||
#include "Poco/JSON/Stringifier.h"
|
||||
#include <iostream>
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
@ -12,7 +12,7 @@ SHAREDOPT_CXX += -DNet_EXPORTS
|
||||
|
||||
objects = \
|
||||
DNS HTTPResponse HostEntry Socket \
|
||||
DatagramSocket HTTPServer IPAddress IPAddressImpl SocketAddress SocketAddress \
|
||||
DatagramSocket HTTPServer IPAddress IPAddressImpl SocketAddress SocketAddressImpl \
|
||||
HTTPBasicCredentials HTTPCookie HTMLForm MediaType DialogSocket \
|
||||
DatagramSocketImpl FilePartSource HTTPServerConnection MessageHeader \
|
||||
HTTPChunkedStream HTTPServerConnectionFactory MulticastSocket SocketStream \
|
||||
@ -25,7 +25,7 @@ objects = \
|
||||
HTTPRequestHandler HTTPStream HTTPIOStream ServerSocket TCPServerDispatcher TCPServerConnectionFactory \
|
||||
HTTPRequestHandlerFactory HTTPStreamFactory ServerSocketImpl TCPServerParams \
|
||||
QuotedPrintableEncoder QuotedPrintableDecoder StringPartSource \
|
||||
FTPClientSession FTPStreamFactory PartHandler PartSource NullPartHandler \
|
||||
FTPClientSession FTPStreamFactory PartHandler PartSource PartStore NullPartHandler \
|
||||
SocketReactor SocketNotifier SocketNotification AbstractHTTPRequestHandler \
|
||||
MailRecipient MailMessage MailStream SMTPClientSession POP3ClientSession \
|
||||
RawSocket RawSocketImpl ICMPClient ICMPEventArgs ICMPPacket ICMPPacketImpl \
|
||||
|
@ -80,7 +80,7 @@ public:
|
||||
std::istream& stream();
|
||||
/// Returns a file input stream for the given file.
|
||||
|
||||
const std::string& filename();
|
||||
const std::string& filename() const;
|
||||
/// Returns the filename portion of the path.
|
||||
|
||||
private:
|
||||
|
@ -90,7 +90,7 @@ std::istream& FilePartSource::stream()
|
||||
}
|
||||
|
||||
|
||||
const std::string& FilePartSource::filename()
|
||||
const std::string& FilePartSource::filename() const
|
||||
{
|
||||
return _filename;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user