From 325a98a91fef683979ce7da28f8c94bd34099bd1 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 4 Nov 2012 23:25:57 -0600 Subject: [PATCH 001/165] Net::Route (windows compile) Net::Route (windows compile only) --- Net/Net_vs100.vcxproj | 530 +++++++++--------- Net/Net_vs100.vcxproj.filters | 15 + Net/include/Poco/Net/Route.h | 410 ++++++++++++++ Net/src/NetworkInterface.cpp | 8 +- Net/src/Route.cpp | 263 +++++++++ Net/src/Route_BSD.cpp | 237 ++++++++ Net/src/Route_Linux.cpp | 332 +++++++++++ Net/src/Route_WIN32.cpp | 76 +++ Net/testsuite/TestSuite_vs100.vcxproj | 354 ++++++------ Net/testsuite/TestSuite_vs100.vcxproj.filters | 6 + Net/testsuite/src/NetCoreTestSuite.cpp | 2 + Net/testsuite/src/RouteTest.cpp | 119 ++++ Net/testsuite/src/RouteTest.h | 63 +++ 13 files changed, 1983 insertions(+), 432 deletions(-) create mode 100644 Net/include/Poco/Net/Route.h create mode 100644 Net/src/Route.cpp create mode 100644 Net/src/Route_BSD.cpp create mode 100644 Net/src/Route_Linux.cpp create mode 100644 Net/src/Route_WIN32.cpp create mode 100644 Net/testsuite/src/RouteTest.cpp create mode 100644 Net/testsuite/src/RouteTest.h diff --git a/Net/Net_vs100.vcxproj b/Net/Net_vs100.vcxproj index 3534003d2..8746d1b03 100644 --- a/Net/Net_vs100.vcxproj +++ b/Net/Net_vs100.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,76 +32,76 @@ Net Win32Proj - - + + StaticLibrary MultiByte - + StaticLibrary MultiByte - + StaticLibrary MultiByte - + StaticLibrary MultiByte - + DynamicLibrary MultiByte - + DynamicLibrary MultiByte - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoNetd - PocoNetmdd - PocoNetmtd - PocoNet - PocoNetmd - PocoNetmt + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoNetd + PocoNetmdd + PocoNetmtd + PocoNet + PocoNetmd + PocoNetmt - + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) @@ -114,7 +114,7 @@ true true true - + Level3 EditAndContinue Default @@ -132,7 +132,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -147,9 +147,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -166,7 +166,7 @@ MachineX86 - + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) @@ -179,7 +179,7 @@ true true true - + ..\lib\PocoNetmtd.pdb Level3 EditAndContinue @@ -190,7 +190,7 @@ ..\lib\PocoNetmtd.lib - + Disabled OnlyExplicitInline @@ -205,9 +205,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -215,7 +215,7 @@ ..\lib\PocoNetmt.lib - + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) @@ -228,7 +228,7 @@ true true true - + ..\lib\PocoNetmdd.pdb Level3 EditAndContinue @@ -239,7 +239,7 @@ ..\lib\PocoNetmdd.lib - + Disabled OnlyExplicitInline @@ -254,10 +254,10 @@ true true true - + ..\lib\PocoNetmd.pdb Level3 - + Default %(DisableSpecificWarnings) @@ -267,204 +267,230 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - true - true - true - true - true - true + true + true + true + true + true + true - - - + + + \ No newline at end of file diff --git a/Net/Net_vs100.vcxproj.filters b/Net/Net_vs100.vcxproj.filters index 99be453f5..23b201230 100644 --- a/Net/Net_vs100.vcxproj.filters +++ b/Net/Net_vs100.vcxproj.filters @@ -414,6 +414,9 @@ WebSocket\Header Files + + NetCore\Header Files + @@ -686,6 +689,18 @@ WebSocket\Source Files + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + diff --git a/Net/include/Poco/Net/Route.h b/Net/include/Poco/Net/Route.h new file mode 100644 index 000000000..7849e9d7e --- /dev/null +++ b/Net/include/Poco/Net/Route.h @@ -0,0 +1,410 @@ +// +// Route.h +// +// $Id: //poco/1.4/Net/include/Poco/Net/Route.h#1 $ +// +// Library: Net +// Package: NetCore +// Module: Route +// +// Definition of the Route class. +// +// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Net_Route_INCLUDED +#define Net_Route_INCLUDED + + +#include "Poco/Net/Net.h" + + +#if defined(POCO_OS_FAMILY_WINDOWS) + #ifndef POCO_NET_HAS_ROUTE + #define POCO_NET_HAS_ROUTE + #endif +#elif defined(POCO_OS_FAMILY_BSD) + #ifndef POCO_NET_HAS_ROUTE + #define POCO_NET_HAS_ROUTE + #endif +#elif defined(POCO_OS_FAMILY_UNIX) && (POCO_OS == POCO_OS_LINUX) + #ifndef POCO_NET_HAS_ROUTE + #define POCO_NET_HAS_ROUTE + #endif +#else + #ifdef POCO_NET_HAS_ROUTE + #undef POCO_NET_HAS_ROUTE + #endif +#endif + + +#ifdef POCO_NET_HAS_ROUTE + + +#include "Poco/Net/IPAddress.h" +#include "Poco/Net/NetworkInterface.h" +#include "Poco/Timestamp.h" +#include +#include + + +namespace Poco { +namespace Net { + + +class RouteHelper; + + +class Net_API Route +{ +public: + typedef std::list RouteList; + + enum RouteType + { + ROUTE_NONE = 0, + ROUTE_OTHER = 1, + ROUTE_INVALID = 2, + ROUTE_DIRECT = 3, + ROUTE_INDIRECT = 4 + }; + + enum RouteProto + { + ROUTE_PROTO_NONE = 0, + ROUTE_PROTO_OTHER = 1, + ROUTE_PROTO_LOCAL = 2, + ROUTE_PROTO_NET_MGMT = 3, + ROUTE_PROTO_ICMP = 4, + ROUTE_PROTO_EGP = 5, + ROUTE_PROTO_GGP = 6, + ROUTE_PROTO_HELLO = 7, + ROUTE_PROTO_RIP = 8, + ROUTE_PROTO_ISIS = 9, + ROUTE_PROTO_ESIS = 10, + ROUTE_PROTO_CISCO = 11, // EIGRP? + ROUTE_PROTO_BBN = 12, + ROUTE_PROTO_OSPF = 13, + ROUTE_PROTO_BGP = 14, + }; + + ~Route(); + /// Destroys Route. + + const IPAddress getDest() const; + /// Returns destination. + + unsigned getPrefix() const; + /// Returns prefix. + + const IPAddress getNetmask() const; + /// Returns net mask (IPv4 only). + + const IPAddress getNextHop() const; + /// Returns next hop. + + unsigned getIfIndex() const; + /// Returns interface index. + + const NetworkInterface getNetworkInterface() const; + /// Returns netwrok interface. + + RouteType getType() const; + /// Returns route type. + + unsigned getMetric() const; + /// Returns metric; not available on all platforms. + + unsigned getHops() const; + /// Returns hops count; not available on all platforms. + + unsigned getMTU() const; + /// Returns MTU; not available on all platforms. + + unsigned getUsage() const; + /// Returns usage; not available on all platforms. + + RouteProto getProto() const; + /// Returns proto; not available on all platforms. + + std::time_t getAge() const; + /// Returns age; not available on all platforms. + + bool validMetric() const; + /// Returns true if metric is valid; not available on all platforms. + + bool validHops() const; + /// Returns true if hops are valid; not available on all platforms. + + bool validMTU() const; + /// Returns true if MTU is valid; not available on all platforms. + + bool validUsage() const; + /// Returns true if usage is valid; not available on all platforms. + + bool validProto() const; + /// Returns true if proto is valid; not available on all platforms. + + bool validAge() const; + /// Returns true if age is valid; not available on all platforms. + + + bool operator == (const Route& other) const; + /// Return strue if this route is equal to other. + + bool operator != (const Route& other) const; + /// Return strue if this route is not equal to other. + + static RouteList list(IPAddress::Family family); + /// Retruns the list of routes. + + static RouteList defaults(IPAddress::Family family); + /// Returns default routes. + + static RouteList match(IPAddress target); + /// Retruns routes matching target. + + static const IPAddress getDefaultAddress(IPAddress::Family family); + /// Returns default IP address for the family. + + static std::string protocolName(RouteProto proto); + /// Returns protocol as string. + +protected: + void setMTU(unsigned mtu); + /// Sets the MTU to specified value. + + void setAge(std::time_t created); + /// Sets MTU to specified value. + + void setProto(RouteProto proto); + /// Sets proto to specified value. + + void setMetric(unsigned metric); + /// Sets metric to specified value. + + void setHops(unsigned hops); + /// Sets hops to specified value. + + void setUsage(unsigned use); + /// Sets usage to specified value. + +private: + Route(const IPAddress& dst, const IPAddress& netmask, const IPAddress& nextHop, unsigned ifIndex, RouteType type); + /// Creates Route. + + Route(const IPAddress& dst, const IPAddress& netmask, unsigned ifIndex, RouteType type); + /// Creates Route. + + Route(const IPAddress& dst, unsigned prefix, const IPAddress& nextHop, unsigned ifIndex, RouteType type); + /// Creates Route. + + Route(const IPAddress& dst, unsigned prefix, unsigned ifIndex, RouteType type); + /// Creates Route. + + // portable attributes + IPAddress _dst; + IPAddress _netmask; + IPAddress _nextHop; + unsigned _ifIndex; + RouteType _type; + + // optional attributes supported on some platforms + unsigned _metric; + unsigned _mtu; + unsigned _hops; + unsigned _use; + RouteProto _proto; + Timestamp _created; + + friend class RouteHelper; +}; + + +// +// inlines +// + + +inline const IPAddress Route::getDest() const +{ + return _dst; +} + + +inline unsigned Route::getPrefix() const +{ + return _netmask.prefixLength(); +} + + +inline const IPAddress Route::getNetmask() const +{ + return _netmask; +} + + +inline const IPAddress Route::getNextHop() const +{ + return _nextHop; +} + + +inline unsigned Route::getIfIndex() const +{ + return _ifIndex; +} + + +inline const NetworkInterface Route::getNetworkInterface() const +{ + return NetworkInterface::forIndex(_ifIndex); +} + + +inline Route::RouteType Route::getType() const +{ + return _type; +} + + +inline unsigned Route::getMetric() const +{ + return _metric; +} + + +inline unsigned Route::getHops() const +{ + return _hops; +} + + +inline unsigned Route::getMTU() const +{ + return _mtu; +} + + +inline unsigned Route::getUsage() const +{ + return _use; +} + + +inline Route::RouteProto Route::getProto() const +{ + return _proto; +} + + +inline bool Route::validMetric() const +{ + return (_metric != ~0U); +} + + +inline bool Route::validHops() const +{ + return (_hops != ~0U); +} + + +inline bool Route::validMTU() const +{ + return (_mtu != 0U); +} + + +inline bool Route::validUsage() const +{ + return (_use != ~0U); +} + + +inline bool Route::validProto() const +{ + return (_proto != (RouteProto)0); +} + + +inline bool Route::validAge() const +{ + return (_created != 0U); +} + + +inline bool Route::operator == (const Route& other) const +{ + return (_dst == other._dst + && _netmask == other._netmask + && _nextHop == other._nextHop + && _metric == other._metric + && _ifIndex == other._ifIndex + && _type == other._type + && _proto == other._proto + && _created == other._created); +} + + +inline bool Route::operator != (const Route& other) const +{ + return !(*this == other); +} + + +inline void Route::setMTU(unsigned mtu) +{ + _mtu = mtu; +} + + +inline void Route::setMetric(unsigned metric) +{ + _metric = metric; +} + + +inline void Route::setHops(unsigned hops) +{ + _hops = hops; +} + + +inline void Route::setUsage(unsigned use) +{ + _use = use; +} + + +} } // Poco::Net + + +#endif // POCO_NET_HAS_ROUTE + + +#endif // Net_Route_INCLUDED diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp index 0884dcb35..a6c37d7c9 100644 --- a/Net/src/NetworkInterface.cpp +++ b/Net/src/NetworkInterface.cpp @@ -131,7 +131,7 @@ public: #endif void setUp(bool up); - void setMtu(unsigned mtu); + void setMTU(unsigned mtu); void setType(Type type); void setIndex(unsigned index); void setPhyParams(); @@ -227,7 +227,7 @@ void NetworkInterfaceImpl::setPhyParams() setFlags(ifr.ifr_flags); ds.impl()->ioctl(SIOCGIFMTU, &ifr); - setMtu(ifr.ifr_mtu); + setMTU(ifr.ifr_mtu); #endif } @@ -466,7 +466,7 @@ inline void NetworkInterfaceImpl::setUp(bool up) } -inline void NetworkInterfaceImpl::setMtu(unsigned mtu) +inline void NetworkInterfaceImpl::setMTU(unsigned mtu) { _mtu = mtu; } @@ -1011,7 +1011,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly) ifIt = result.insert(Map::value_type(ifIndex, ni)).first; ifIt->second.impl().setFlags(pAddress->Flags, pAddress->IfType); - ifIt->second.impl().setMtu(pAddress->Mtu); + ifIt->second.impl().setMTU(pAddress->Mtu); ifIt->second.impl().setUp(pAddress->OperStatus == IfOperStatusUp); #if (_WIN32_WINNT >= 0x0600) // Vista and newer only ifIt->second.impl().setRunning(pAddress->ReceiveLinkSpeed > 0 || pAddress->TransmitLinkSpeed > 0); diff --git a/Net/src/Route.cpp b/Net/src/Route.cpp new file mode 100644 index 000000000..5f8be6c23 --- /dev/null +++ b/Net/src/Route.cpp @@ -0,0 +1,263 @@ +// +// Route.cpp +// +// $Id: //poco/1.4/Foundation/src/Route.cpp#2 $ +// +// Library: Net +// Package: NetCore +// Module: Route +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Net/Route.h" + + +#ifdef POCO_NET_HAS_ROUTE + + +#include "Poco/Net/IPAddress.h" +#include "Poco/Net/NetException.h" +#include + + +#if defined(POCO_OS_FAMILY_WINDOWS) + #include "Route_WIN32.cpp" +#elif defined(POCO_OS_FAMILY_BSD) + #include "Route_BSD.cpp" +#elif defined(POCO_OS_FAMILY_UNIX) && (POCO_OS == POCO_OS_LINUX) + #include "Route_Linux.cpp" +#endif + + +namespace Poco { +namespace Net { + + +Route::Route(const IPAddress& dst, const IPAddress& netmask, const IPAddress& nextHop, unsigned ifIndex, RouteType type) : + _dst(dst), + _netmask(netmask), + _nextHop(nextHop), + _ifIndex(ifIndex), + _type(type), + // attributes that might not be available on all platforms are set to sentinel values. + _metric(~0), + _hops(~0), + _mtu(0), + _use(~1), + _proto(ROUTE_PROTO_NONE), + _created(0) +{ + if (_dst.family() != _nextHop.family()) + throw InvalidArgumentException("Destination and nextHop have different families"); +} + + +Route::Route(const IPAddress& dst, const IPAddress& netmask, unsigned ifIndex, RouteType type) : + _dst(dst), + _netmask(netmask), + _nextHop(IPAddress(dst.family())), + _ifIndex(ifIndex), + _type(type), + // attributes that might not be available on all platforms are set to sentinel values. + _metric(~0), + _hops(~0), + _mtu(0), + _use(~1), + _proto(ROUTE_PROTO_NONE), + _created(0) +{ + if (_dst.family() != _nextHop.family()) + throw InvalidArgumentException("Destination and nextHop have different families"); +} + + +Route::Route(const IPAddress& dst, unsigned prefix, const IPAddress& nextHop, unsigned ifIndex, RouteType type) : + _dst(dst), + _netmask(IPAddress(prefix, dst.family())), + _nextHop(nextHop), + _ifIndex(ifIndex), + _type(type), + // attributes that might not be available on all platforms are set to sentinel values. + _metric(~0), + _hops(~0), + _mtu(0), + _use(~1), + _proto(ROUTE_PROTO_NONE), + _created(0) +{ + if (_dst.family() != _nextHop.family()) + throw InvalidArgumentException("Destination and nextHop have different families"); +} + +Route::Route(const IPAddress& dst, unsigned prefix, unsigned ifIndex, RouteType type) : + _dst(dst), + _netmask(IPAddress(prefix, dst.family())), + _nextHop(IPAddress(dst.family())), + _ifIndex(ifIndex), + _type(type), + // attributes that might not be available on all platforms are set to sentinel values. + _metric(~0), + _hops(~0), + _mtu(0), + _use(~1), + _proto(ROUTE_PROTO_NONE), + _created(0) +{ + if (_dst.family() != _nextHop.family()) + throw InvalidArgumentException("Destination and nextHop have different families"); +} + + +Route::~Route() +{ +} + + +std::time_t Route::getAge() const +{ + std::time_t now = std::time(NULL); + return ((_created != 0) ? (now - _created.epochTime()) : 0); +} + + +void Route::setAge(std::time_t created) +{ + std::time_t now; + time(&now); + if (_created > now) + throw std::invalid_argument("Creation time can't be in future"); + _created = Timestamp::fromEpochTime(created); +} + + +void Route::setProto(RouteProto proto) +{ +#if defined(_WIN32) + if (proto > ROUTE_PROTO_BGP) proto = ROUTE_PROTO_OTHER; +#endif + _proto = proto; +} + + +Route::RouteList Route::defaults(IPAddress::Family family) +{ + Route::RouteList defaults, routes = Route::list(family); + + for (Route::RouteList::const_iterator it = routes.begin(); + it != routes.end(); it++) { + if (it->getPrefix() != 0) continue; + + // look for insertion point + Route::RouteList::iterator it2 = defaults.begin(); + Route::RouteList::const_iterator end = defaults.end(); + while (it2 != end && it2->getMetric() <= it->getMetric()) + it2++; + defaults.insert(it2, *it); + } + + return defaults; +} + + +Route::RouteList Route::match(IPAddress target) +{ + Route::RouteList targets, routes = Route::list(target.family()); + + for (Route::RouteList::const_iterator it = routes.begin(); + it != routes.end(); it++) { + if ((target & it->getNetmask()) != it->getDest()) continue; + + // look for insertion point + Route::RouteList::iterator it2 = targets.begin(); + while (it2 != targets.end() + && (it2->getPrefix() > it->getPrefix() + || (it2->getPrefix() == it->getPrefix() && it2->getMetric() <= it->getMetric()))) + it2++; + targets.insert(it2, *it); + } + + return targets; +} + + +const IPAddress Route::getDefaultAddress(IPAddress::Family family) +{ + Route::RouteList routes = Route::defaults(family); + + if (! routes.empty()) { + Route::RouteList::const_iterator it = routes.begin(); + + IPAddress addr = it->getNetworkInterface().firstAddress(family); + return addr; + } + + return IPAddress::wildcard(family); +} + + +std::string Route::protocolName(Route::RouteProto proto) +{ + switch (proto) { + default: + return "unknown"; + case ROUTE_PROTO_OTHER: + return "other"; + case ROUTE_PROTO_LOCAL: + return "local"; + case ROUTE_PROTO_NET_MGMT: + return "netmgmt"; + case ROUTE_PROTO_ICMP: + return "icmp"; + case ROUTE_PROTO_EGP: + return "egp"; + case ROUTE_PROTO_GGP: + return "ggp"; + case ROUTE_PROTO_HELLO: + return "hello"; + case ROUTE_PROTO_RIP: + return "rip"; + case ROUTE_PROTO_ISIS: + return "isis"; + case ROUTE_PROTO_ESIS: + return "esis"; + case ROUTE_PROTO_CISCO: + return "cisco"; + case ROUTE_PROTO_BBN: + return "bbn"; + case ROUTE_PROTO_OSPF: + return "ospf"; + case ROUTE_PROTO_BGP: + return "bgp"; + } +} + + +}} // namespace Poco::Net + + +#endif // POCO_NET_HAS_ROUTE diff --git a/Net/src/Route_BSD.cpp b/Net/src/Route_BSD.cpp new file mode 100644 index 000000000..6093829e2 --- /dev/null +++ b/Net/src/Route_BSD.cpp @@ -0,0 +1,237 @@ +// +// Route_BSD.cpp +// +// $Id: //poco/1.4/Foundation/src/Route_BSD.cpp#2 $ +// +// Library: Net +// Package: NetCore +// Module: Route +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include +#include +#include +#include +#include +#include +#include + +#include + + +#define RTMSG_LEN (sizeof(struct rt_msghdr) + 512) +#define ROUNDUP(a) ((a) > 0 ? (((a) + sizeof(uint32_t) - 1) & ~(sizeof(uint32_t) - 1)) : sizeof(long)) +#define NEXTADDR(w, u) \ + if (rtm_addrs & (w)) {\ + int l = ROUNDUP(u.sin_len); memmove(cp, &(u), l); cp += l;\ + } +#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) + +#define SIN_OFFSET (offsetof(sockaddr_in,sin_addr)) +#define SIN_LENGTH (sizeof(struct in_addr)) +#define SIN6_OFFSET (offsetof(sockaddr_in6,sin6_addr)) +#define SIN6_LENGTH (sizeof(struct in6_addr)) + + +static int seq = rand(); + +static void get_rtaddrs(unsigned addrs, struct sockaddr *sa, struct sockaddr **rti_info) +{ + for (unsigned i = 0; i < RTAX_MAX; i++) { + if (addrs & (1 << i)) { + rti_info[i] = sa; + sa = (struct sockaddr *)((char *)sa + ROUNDUP(sa->sa_len)); + } else { + rti_info[i] = NULL; + } + } +} + +static IPAddress unpack_sockaddr_inX(struct sockaddr *sa, bool ipv4) +{ + const unsigned offset = (ipv4 ? SIN_OFFSET : SIN6_OFFSET); + unsigned char *addr = (unsigned char*)sa + offset; + + // return wildcard + if (sa->sa_len == 0) + return IPAddress(ipv4 ? IPAddress::IPv4 : IPAddress::IPv6); + + struct in6_addr buf; + memset(&buf, 0, sizeof(buf)); + memcpy(&buf, addr, sa->sa_len - offset); + + IPAddress ip(&buf, (ipv4 ? SIN_LENGTH : SIN6_LENGTH)); + + return ip; +} + +class RouteHelper { +public: + static Route* createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_info); + +private: + RouteHelper(); + ~RouteHelper(); +}; + +Route* RouteHelper::createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_info) +{ + IPAddress dest, netmask, nexthop; + int ifIndex = rtm->rtm_index; + bool adjacent = false; + sa_family_t family = AF_MAX; + char macaddr[16]; // should be plenty, right? + + for (unsigned i = 0; i < RTAX_MAX; i++) { + sockaddr* sa = (struct sockaddr*)rti_info[i]; + + if (sa == NULL) continue; + + switch (i) { + case RTAX_DST: + poco_assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6); + family = sa->sa_family; + if (family == AF_INET) { + struct sockaddr_in *sin = (struct sockaddr_in *)sa; + dest = IPAddress(&sin->sin_addr, SIN_LENGTH); + } else { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; + dest = IPAddress(&sin6->sin6_addr, SIN6_LENGTH, rtm->rtm_index); + } + break; + + case RTAX_GATEWAY: + poco_assert((sa->sa_family == family || sa->sa_family == AF_LINK)); + switch (sa->sa_family) { + case AF_INET: + { + struct sockaddr_in *sin = (struct sockaddr_in *)sa; + nexthop = IPAddress(&sin->sin_addr, SIN_LENGTH); + break; + } + case AF_INET6: + { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; + nexthop = IPAddress(&sin6->sin6_addr, SIN6_LENGTH, rtm->rtm_index); + break; + } + case AF_LINK: + { + struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa; + adjacent = true; + ifIndex = sdl->sdl_index; + memcpy(macaddr, sdl->sdl_data, sdl->sdl_alen); + break; + } + default: + break; + } + break; + + case RTAX_NETMASK: + netmask = unpack_sockaddr_inX(sa, (family == AF_INET)); + break; + + case RTAX_GENMASK: + // IPAddress genmask = unpack_sockaddr_inX(sa, (family == AF_INET)); + break; + + default: + // do something? + break; + } + } + + if (rtm->rtm_flags & RTF_HOST) { + poco_assert(! (rtm->rtm_addrs & RTA_NETMASK)); + if (family == AF_INET) + netmask = IPAddress(32, IPAddress::IPv4); + else + netmask = IPAddress(128, IPAddress::IPv6); + } + + Route *route; + + if (adjacent) + route = new Route(dest, netmask, ifIndex, Route::ROUTE_DIRECT); + else + route = new Route(dest, netmask, nexthop, ifIndex, Route::ROUTE_INDIRECT); + + route->setMTU(rtm->rtm_rmx.rmx_mtu); + route->setHops(rtm->rtm_rmx.rmx_hopcount); + route->setUsage(rtm->rtm_use); + + return route; +} + +Route::RouteList Route::list(IPAddress::Family family) +{ + Route::RouteList routes; + int mib[6]; + + mib[0] = CTL_NET; + mib[1] = PF_ROUTE; + mib[2] = mib[3] = 0; + mib[4] = NET_RT_DUMP2; + mib[5] = 0; + + size_t needed = 0; + if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) + throw std::runtime_error("sysctl failed to return routing table size");; + + char *buf = new char[needed]; + + if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) + throw std::runtime_error("sysctl faield to populate routing table"); + + struct rt_msghdr2 *rtm = NULL; + for (char *next = buf, *lim = &buf[needed]; next < lim; next += rtm->rtm_msglen) { + rtm = (struct rt_msghdr2 *)next; + + struct sockaddr_in *sin = (struct sockaddr_in*)(rtm + 1); + + if (sin->sin_family != ((family == IPAddress::IPv4) ? AF_INET : AF_INET6)) continue; + + // skip cloned routes + if (rtm->rtm_parentflags & RTF_PRCLONING) continue; + + struct sockaddr* rti_info[RTAX_MAX]; + get_rtaddrs(rtm->rtm_addrs, (struct sockaddr *)sin, rti_info); + + Route *route = RouteHelper::createRoute(rtm, rti_info); + + // RTF_IFSCOPE? + + routes.push_back(route); + } + + delete[] buf; + + return routes; +} diff --git a/Net/src/Route_Linux.cpp b/Net/src/Route_Linux.cpp new file mode 100644 index 000000000..97c49c44e --- /dev/null +++ b/Net/src/Route_Linux.cpp @@ -0,0 +1,332 @@ +// +// Route_Linux.cpp +// +// $Id: //poco/1.4/Foundation/src/Route_Linux.cpp#2 $ +// +// Library: Net +// Package: NetCore +// Module: Route +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + +#include +#include +#include + +#include +#include +#include +#include + +class RouteHelper +{ +public: + static void createRouteIPv4(Route::RouteList *routes, struct rt_container *rt_stuff); + static void createRouteIPv6(Route::RouteList *routes, struct rt_container *rt_stuff); + +private: + RouteHelper(); + ~RouteHelper(); +}; + +typedef union +{ + struct in_addr u_in; + struct in6_addr u_in6; +} in_addrX; + +#define in4 u_in +#define in6 u_in6 + +struct rt_container +{ + const struct nlattr *tb[RTA_MAX+1]; + in_addrX gw; + in_addrX dest; + in_addrX src; + in_addrX prefsrc; + uint32_t oif, flow, priority; + unsigned char family; + unsigned char prefix; + unsigned char table; + unsigned char protocol; + unsigned char scope; + unsigned char type; + uint32_t metrics[RTA_MAX+1]; +}; + +static inline bool in6zero(struct in6_addr in6) +{ + return ((in6.s6_addr32[0] | in6.s6_addr32[1] | in6.s6_addr32[2] | in6.s6_addr32[3]) == 0); +} + +static Route::RouteProto xlateProto(unsigned prot) +{ + switch (prot) { + default: + // fallthru + case RTPROT_UNSPEC: + return Route::ROUTE_PROTO_OTHER; + case RTPROT_REDIRECT: + return Route::ROUTE_PROTO_ICMP; + case RTPROT_KERNEL: + case RTPROT_BOOT: + case RTPROT_STATIC: + return Route::ROUTE_PROTO_LOCAL; + + // others? + } +} + +void RouteHelper::createRouteIPv4(Route::RouteList *routes, struct rt_container *rt_stuff) +{ + if (rt_stuff->table == RT_TABLE_MAIN && rt_stuff->type <= RTN_MULTICAST) { + Route *route; + + if (rt_stuff->gw.in4.s_addr != 0) + route = new Route(IPAddress(&rt_stuff->dest.in4, sizeof(rt_stuff->dest.in4)), IPAddress(rt_stuff->prefix, IPAddress::IPv4), IPAddress(&rt_stuff->gw.in4, sizeof(rt_stuff->gw.in4)), rt_stuff->oif, Route::ROUTE_INDIRECT); + else + route = new Route(IPAddress(&rt_stuff->dest.in4, sizeof(rt_stuff->dest.in4)), IPAddress(rt_stuff->prefix, IPAddress::IPv4), rt_stuff->oif, Route::ROUTE_DIRECT); + + route->setProto(xlateProto(rt_stuff->protocol)); + route->setMetric(rt_stuff->metrics[0]); + // route->setPriority(rt_stuff->priority); + + // no hops, usage, mtu, or age... + routes->push_back(route); + } +} + +void RouteHelper::createRouteIPv6(Route::RouteList *routes, struct rt_container *rt_stuff) +{ + if (rt_stuff->table == RT_TABLE_MAIN && rt_stuff->type <= RTN_MULTICAST) { + Route *route; + + if (!in6zero(rt_stuff->gw.in6)) + route = new Route(IPAddress(&rt_stuff->dest.in6, sizeof(rt_stuff->dest.in6)), IPAddress(rt_stuff->prefix, IPAddress::IPv6), IPAddress(&rt_stuff->gw.in6, sizeof(rt_stuff->gw.in6), rt_stuff->oif), rt_stuff->oif, Route::ROUTE_INDIRECT); + else + route = new Route(IPAddress(&rt_stuff->dest.in6, sizeof(rt_stuff->dest.in6)), IPAddress(rt_stuff->prefix, IPAddress::IPv6), rt_stuff->oif, Route::ROUTE_DIRECT); + + route->setProto(xlateProto(rt_stuff->protocol)); + route->setMetric(rt_stuff->metrics[0]); + // route->setPriority(rt_stuff->priority); + + // no hops, usage, mtu, or age... + routes->push_back(route); + } +} + +static int data_attr_cb2(const struct nlattr *attr, void *) +{ + // skip unsupported attribute in user-space + if (mnl_attr_type_valid(attr, RTAX_MAX) < 0) + return MNL_CB_OK; + + if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) + return MNL_CB_ERROR; + return MNL_CB_OK; +} + +static void parse_attrs_ipv4(struct rt_container *rt_stuff) +{ + if (rt_stuff->tb[RTA_TABLE]) + rt_stuff->table = mnl_attr_get_u32(rt_stuff->tb[RTA_TABLE]); + if (rt_stuff->tb[RTA_DST]) + rt_stuff->dest.in4 = *(struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_DST]); + if (rt_stuff->tb[RTA_SRC]) + rt_stuff->src.in4 = *(struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_SRC]); + if (rt_stuff->tb[RTA_OIF]) + rt_stuff->oif = mnl_attr_get_u32(rt_stuff->tb[RTA_OIF]); + if (rt_stuff->tb[RTA_FLOW]) + rt_stuff->flow = mnl_attr_get_u32(rt_stuff->tb[RTA_FLOW]); + if (rt_stuff->tb[RTA_PRIORITY]) + rt_stuff->priority = mnl_attr_get_u32(rt_stuff->tb[RTA_PRIORITY]); + if (rt_stuff->tb[RTA_PREFSRC]) + rt_stuff->prefsrc.in4 = *(struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_PREFSRC]); + if (rt_stuff->tb[RTA_GATEWAY]) + rt_stuff->gw.in4 = *(struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_GATEWAY]); + if (rt_stuff->tb[RTA_METRICS]) { + struct nlattr *tbx[RTAX_MAX+1] = {}; + mnl_attr_parse_nested(rt_stuff->tb[RTA_METRICS], data_attr_cb2, tbx); + + for (unsigned i = 0; i < RTAX_MAX; ++i) + if (tbx[i]) + rt_stuff->metrics[i] = mnl_attr_get_u32(tbx[i]); + } +} + +static void parse_attrs_ipv6(struct rt_container *rt_stuff) +{ + if (rt_stuff->tb[RTA_TABLE]) + rt_stuff->table = mnl_attr_get_u32(rt_stuff->tb[RTA_TABLE]); + if (rt_stuff->tb[RTA_DST]) + memcpy(&rt_stuff->dest.in6, (struct in6_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_DST]), sizeof(struct in6_addr)); + if (rt_stuff->tb[RTA_SRC]) + memcpy(&rt_stuff->src.in6, (struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_SRC]), sizeof(struct in6_addr)); + if (rt_stuff->tb[RTA_OIF]) + rt_stuff->oif = mnl_attr_get_u32(rt_stuff->tb[RTA_OIF]); + if (rt_stuff->tb[RTA_FLOW]) + rt_stuff->flow = mnl_attr_get_u32(rt_stuff->tb[RTA_FLOW]); + if (rt_stuff->tb[RTA_PRIORITY]) + rt_stuff->priority = mnl_attr_get_u32(rt_stuff->tb[RTA_PRIORITY]); + if (rt_stuff->tb[RTA_PREFSRC]) + memcpy(&rt_stuff->prefsrc.in6, (struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_PREFSRC]), sizeof(struct in6_addr)); + if (rt_stuff->tb[RTA_GATEWAY]) + memcpy(&rt_stuff->gw.in6, (struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_GATEWAY]), sizeof(struct in6_addr)); + if (rt_stuff->tb[RTA_METRICS]) { + struct nlattr *tbx[RTAX_MAX+1] = {}; + mnl_attr_parse_nested(rt_stuff->tb[RTA_METRICS], data_attr_cb2, tbx); + + for (unsigned i = 0; i < RTAX_MAX; ++i) + if (tbx[i]) + rt_stuff->metrics[i] = mnl_attr_get_u32(tbx[i]); + } +} + +static int data_attr_cb(const struct nlattr *attr, void *data) +{ + struct rt_container *rt_stuff = (struct rt_container*)data; + int type = mnl_attr_get_type(attr); + + if (mnl_attr_type_valid(attr, RTA_MAX) < 0) + return MNL_CB_OK; + + switch (type) { + case RTA_DST: + case RTA_SRC: + case RTA_PREFSRC: + case RTA_GATEWAY: + if (rt_stuff->family == AF_INET) { + if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) + return MNL_CB_ERROR; + } else { + if (mnl_attr_validate2(attr, MNL_TYPE_BINARY, sizeof(struct in6_addr)) < 0) + return MNL_CB_ERROR; + } + break; + case RTA_TABLE: + case RTA_OIF: + case RTA_FLOW: + case RTA_PRIORITY: + if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) + return MNL_CB_ERROR; + break; + case RTA_METRICS: + if (mnl_attr_validate(attr, MNL_TYPE_NESTED) < 0) + return MNL_CB_ERROR; + break; + } + rt_stuff->tb[type] = attr; + return MNL_CB_OK; +} + +static int data_cb(const struct nlmsghdr *nlh, void *data) +{ + const struct rtmsg *rm = (const struct rtmsg *)mnl_nlmsg_get_payload(nlh); + Route::RouteList *routes = (Route::RouteList *)data; + struct rt_container rt_stuff; + + memset(&rt_stuff, 0, sizeof(rt_stuff)); + + rt_stuff.family = rm->rtm_family; + rt_stuff.prefix = rm->rtm_dst_len; + rt_stuff.protocol = rm->rtm_protocol; + rt_stuff.scope = rm->rtm_scope; + rt_stuff.type = rm->rtm_type; + + mnl_attr_parse(nlh, sizeof(*rm), data_attr_cb, &rt_stuff); + + switch (rm->rtm_family) { + case AF_INET: + parse_attrs_ipv4(&rt_stuff); + + RouteHelper::createRouteIPv4(routes, &rt_stuff); + break; + + case AF_INET6: + parse_attrs_ipv6(&rt_stuff); + + RouteHelper::createRouteIPv6(routes, &rt_stuff); + break; + } + + return MNL_CB_OK; +} + +Route::RouteList Route::list(IPAddress::Family family) +{ + struct mnl_socket *nl; + char buf[MNL_SOCKET_BUFFER_SIZE]; + struct nlmsghdr *nlh; + struct rtmsg *rtm; + int ret; + unsigned seq, portid; + + nlh = mnl_nlmsg_put_header(buf); + nlh->nlmsg_type = RTM_GETROUTE; + nlh->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; + nlh->nlmsg_seq = seq = time(NULL); + + rtm = (struct rtmsg *)mnl_nlmsg_put_extra_header(nlh, sizeof(struct rtmsg)); + rtm->rtm_family = ((family == IPAddress::IPv4) ? AF_INET : AF_INET6); + + Route::RouteList routes; + + do { + + nl = mnl_socket_open(NETLINK_ROUTE); + if (nl == NULL) + break; + + if (mnl_socket_bind(nl, 0, MNL_SOCKET_AUTOPID) < 0) + break; + + portid = mnl_socket_get_portid(nl); + + if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) + break; + + while (1) { + ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); + if (ret <= 0) + break; + ret = mnl_cb_run(buf, ret, seq, portid, data_cb, &routes); + if (ret == MNL_CB_ERROR) + throw std::runtime_error("Couldn't parse routing table"); + else if (ret == MNL_CB_STOP) + break; + } + if (ret == -1) + throw std::runtime_error("Couldn't talk to kernel"); + + } while (false); + + if (nl) + mnl_socket_close(nl); + + return routes; +} diff --git a/Net/src/Route_WIN32.cpp b/Net/src/Route_WIN32.cpp new file mode 100644 index 000000000..d8cf2bde6 --- /dev/null +++ b/Net/src/Route_WIN32.cpp @@ -0,0 +1,76 @@ +// +// Route_WIN32.cpp +// +// $Id: //poco/1.4/Foundation/src/Route_WIN32.cpp#2 $ +// +// Library: Net +// Package: NetCore +// Module: Route +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +namespace Poco { +namespace Net { + + +Route::RouteList Route::list(IPAddress::Family family) +{ + std::time_t now; + PMIB_IPFORWARD_TABLE2 pIpForwardTable2 = NULL; + + if (GetIpForwardTable2(((family == IPAddress::IPv4) ? AF_INET : AF_INET6), &pIpForwardTable2) != NO_ERROR) + throw std::runtime_error("Couldn't fetch routing table"); + + ::time(&now); + + RouteList list; + + for (unsigned i = 0; i < pIpForwardTable2->NumEntries; ++i) + { + PMIB_IPFORWARD_ROW2 pIp2 = &pIpForwardTable2->Table[i]; + IPAddress::Family family2 = (pIp2->DestinationPrefix.Prefix.si_family == AF_INET ? IPAddress::IPv4 : IPAddress::IPv6); + + IPAddress dest(*(struct sockaddr *)&pIp2->DestinationPrefix.Prefix); + IPAddress netmask(pIp2->DestinationPrefix.PrefixLength, family2); + IPAddress nexthop(*(struct sockaddr *)&pIp2->NextHop); + + Route route(dest, netmask, nexthop, pIp2->InterfaceIndex, nexthop.isWildcard() ? ROUTE_INDIRECT : ROUTE_INDIRECT); + route.setMetric(pIp2->Metric); + route.setAge(now - pIp2->Age); + route.setProto((RouteProto) pIp2->Protocol); + + list.push_back(route); + } + + FreeMibTable(pIpForwardTable2); + + return list; +} + + +}} // namespace Poco::Net diff --git a/Net/testsuite/TestSuite_vs100.vcxproj b/Net/testsuite/TestSuite_vs100.vcxproj index 322544a4c..fd74296d7 100644 --- a/Net/testsuite/TestSuite_vs100.vcxproj +++ b/Net/testsuite/TestSuite_vs100.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,86 +32,86 @@ TestSuite Win32Proj - - + + Application Dynamic MultiByte - + Application Dynamic MultiByte - + Application Static MultiByte - + Application Static MultiByte - + Application Dynamic MultiByte - + Application Dynamic MultiByte - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite - + Disabled ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) @@ -124,7 +124,7 @@ true true true - + Level3 EditAndContinue Default @@ -141,7 +141,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -156,9 +156,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -173,7 +173,7 @@ MachineX86 - + Disabled ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) @@ -186,7 +186,7 @@ true true true - + Level3 EditAndContinue Default @@ -204,7 +204,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -219,9 +219,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -237,7 +237,7 @@ MachineX86 - + Disabled ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) @@ -250,7 +250,7 @@ true true true - + Level3 EditAndContinue Default @@ -267,7 +267,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -282,9 +282,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -300,120 +300,122 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + \ No newline at end of file diff --git a/Net/testsuite/TestSuite_vs100.vcxproj.filters b/Net/testsuite/TestSuite_vs100.vcxproj.filters index 5059d8153..d658d7770 100644 --- a/Net/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs100.vcxproj.filters @@ -309,6 +309,9 @@ WebSocket\Header Files + + NetCore\Header Files + @@ -479,5 +482,8 @@ WebSocket\Source Files + + NetCore\Source Files + \ No newline at end of file diff --git a/Net/testsuite/src/NetCoreTestSuite.cpp b/Net/testsuite/src/NetCoreTestSuite.cpp index 545480c77..aa332b175 100644 --- a/Net/testsuite/src/NetCoreTestSuite.cpp +++ b/Net/testsuite/src/NetCoreTestSuite.cpp @@ -35,6 +35,7 @@ #include "SocketAddressTest.h" #include "DNSTest.h" #include "NetworkInterfaceTest.h" +#include "RouteTest.h" CppUnit::Test* NetCoreTestSuite::suite() @@ -45,6 +46,7 @@ CppUnit::Test* NetCoreTestSuite::suite() pSuite->addTest(SocketAddressTest::suite()); pSuite->addTest(DNSTest::suite()); pSuite->addTest(NetworkInterfaceTest::suite()); + pSuite->addTest(RouteTest::suite()); return pSuite; } diff --git a/Net/testsuite/src/RouteTest.cpp b/Net/testsuite/src/RouteTest.cpp new file mode 100644 index 000000000..7bc17a4c6 --- /dev/null +++ b/Net/testsuite/src/RouteTest.cpp @@ -0,0 +1,119 @@ +// +// RouteTest.cpp +// +// $Id: //poco/1.4/Net/testsuite/src/RouteTest.cpp#2 $ +// +// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "RouteTest.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" +#include "Poco/Net/IPAddress.h" +#include "Poco/Net/Route.h" +#include "Poco/Net/NetException.h" + + +using Poco::Net::IPAddress; +using Poco::Net::Route; +using Poco::Net::InvalidAddressException; + + +RouteTest::RouteTest(const std::string& name): CppUnit::TestCase(name) +{ +} + + +RouteTest::~RouteTest() +{ +} + +// +// we should have on most systems at least 3 routes: one for the local subnet, +// one for the loopback subnet, and a default route. +// +// we should have at least one default route (possibly more on a multi-homed +// system). +// +// we should have at least 2 multicast all-hosts routes: one for the local subnet, +// and one for the loopback subnet. +// +// if we wish to do more sanity checking than this, we'd need to correlate it +// with results we get back from NetworkInterface::list(). +// + +void RouteTest::testDefaultRoute() +{ + Route::RouteList routes = Route::list(IPAddress::IPv4); + assert(routes.size() >= 3); +} + + +void RouteTest::testAllRoutes() +{ + Route::RouteList defaults = Route::defaults(IPAddress::IPv4); + assert(defaults.size() >= 1); +} + + +void RouteTest::testAllHostsRoutes() +{ + IPAddress target("224.0.0.1"); + Route::RouteList targets = Route::match(target); + assert(targets.size() >= 2); +} + + +void RouteTest::testLoopbackRoute() +{ + IPAddress target("127.0.0.1"); + Route::RouteList targets = Route::match(target); + assert(targets.size() >= 1); +} + + +void RouteTest::setUp() +{ +} + + +void RouteTest::tearDown() +{ +} + + +CppUnit::Test* RouteTest::suite() +{ + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("RouteTest"); + + CppUnit_addTest(pSuite, RouteTest, testDefaultRoute); + CppUnit_addTest(pSuite, RouteTest, testAllRoutes); +// CppUnit_addTest(pSuite, RouteTest, testAllHostsRoutes); + CppUnit_addTest(pSuite, RouteTest, testLoopbackRoute); + + return pSuite; +} diff --git a/Net/testsuite/src/RouteTest.h b/Net/testsuite/src/RouteTest.h new file mode 100644 index 000000000..9c9d6fadb --- /dev/null +++ b/Net/testsuite/src/RouteTest.h @@ -0,0 +1,63 @@ +// +// RouteTest.h +// +// $Id: //poco/1.4/Net/testsuite/src/RouteTest.h#1 $ +// +// Definition of the RouteTest class. +// +// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef RouteTest_INCLUDED +#define RouteTest_INCLUDED + + +#include "Poco/Net/Net.h" +#include "CppUnit/TestCase.h" + + +class RouteTest: public CppUnit::TestCase +{ +public: + RouteTest(const std::string& name); + ~RouteTest(); + + void testDefaultRoute(); + void testAllRoutes(); + void testAllHostsRoutes(); + void testLoopbackRoute(); + + void setUp(); + void tearDown(); + + static CppUnit::Test* suite(); + +private: +}; + + +#endif // RouteTest_INCLUDED From 15d27daea64f0a9d7f1e80ae1cedb32e38592baa Mon Sep 17 00:00:00 2001 From: aleks-f Date: Tue, 6 Nov 2012 22:17:17 -0600 Subject: [PATCH 002/165] Route on Windows Route on Windows tentatively complete, Mac/Linux TODO --- Foundation/Foundation_vs100.vcxproj | 2636 ++++++++++--------- Foundation/Foundation_vs100.vcxproj.filters | 6 + Foundation/include/Poco/Error.h | 68 + Foundation/src/Error.cpp | 77 + Net/include/Poco/Net/Route.h | 2 +- Net/src/NetworkInterface.cpp | 21 +- Net/src/Route_WIN32.cpp | 40 +- Net/testsuite/src/RouteTest.cpp | 56 +- 8 files changed, 1563 insertions(+), 1343 deletions(-) create mode 100644 Foundation/include/Poco/Error.h create mode 100644 Foundation/src/Error.cpp diff --git a/Foundation/Foundation_vs100.vcxproj b/Foundation/Foundation_vs100.vcxproj index 5be73d8d2..bb79f5be5 100644 --- a/Foundation/Foundation_vs100.vcxproj +++ b/Foundation/Foundation_vs100.vcxproj @@ -1,1323 +1,1325 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Foundation - {8164D41D-B053-405B-826C-CF37AC0EF176} - Foundation - Win32Proj - - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoFoundationd - PocoFoundationmdd - PocoFoundationmtd - PocoFoundation - PocoFoundationmd - PocoFoundationmt - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - EditAndContinue - Default - - - iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoFoundationd.dll - true - true - ..\bin\PocoFoundationd.pdb - Console - ..\lib\PocoFoundationd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - Default - - - iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoFoundation.dll - true - false - - - Console - true - true - ..\lib\PocoFoundation.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - Default - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmd.lib - /ignore:4221 %(AdditionalOptions) - - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - EditAndContinue - Default - ..\lib\PocoFoundationmdd.pdb - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmdd.lib - /ignore:4221 %(AdditionalOptions) - - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - Level3 - EditAndContinue - Default - ..\lib\PocoFoundationmtd.pdb - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmtd.lib - /ignore:4221 %(AdditionalOptions) - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreaded - false - true - true - true - - - Level3 - - - Default - /ignore:4221 %(AdditionalOptions) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmt.lib - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Foundation + {8164D41D-B053-405B-826C-CF37AC0EF176} + Foundation + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoFoundationd + PocoFoundationmdd + PocoFoundationmtd + PocoFoundation + PocoFoundationmd + PocoFoundationmt + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + EditAndContinue + Default + + + iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoFoundationd.dll + true + true + ..\bin\PocoFoundationd.pdb + Console + ..\lib\PocoFoundationd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) + false + false + false + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + Default + + + iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoFoundation.dll + true + false + + + Console + true + true + ..\lib\PocoFoundation.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + false + false + false + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + Default + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationmd.lib + /ignore:4221 %(AdditionalOptions) + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + EditAndContinue + Default + ..\lib\PocoFoundationmdd.pdb + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationmdd.lib + /ignore:4221 %(AdditionalOptions) + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + Level3 + EditAndContinue + Default + ..\lib\PocoFoundationmtd.pdb + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationmtd.lib + /ignore:4221 %(AdditionalOptions) + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + false + false + false + true + MultiThreaded + false + true + true + true + + + Level3 + + + Default + /ignore:4221 %(AdditionalOptions) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationmt.lib + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + true + true + true + true + true + true + + + + + + + + + true + true + true + true + true + true + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - - - - - true - true - true - true - - - - - - + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + + + + true + true + true + true + + + + + + \ No newline at end of file diff --git a/Foundation/Foundation_vs100.vcxproj.filters b/Foundation/Foundation_vs100.vcxproj.filters index 32d629673..b5213e459 100644 --- a/Foundation/Foundation_vs100.vcxproj.filters +++ b/Foundation/Foundation_vs100.vcxproj.filters @@ -885,6 +885,9 @@ Text\Source Files + + Core\Source Files + @@ -1832,6 +1835,9 @@ Core\Header Files + + Core\Header Files + diff --git a/Foundation/include/Poco/Error.h b/Foundation/include/Poco/Error.h new file mode 100644 index 000000000..c87e41d79 --- /dev/null +++ b/Foundation/include/Poco/Error.h @@ -0,0 +1,68 @@ +// +// Error.h +// +// $Id: //poco/1.4/Foundation/include/Poco/Error.h#1 $ +// +// Library: Foundation +// Package: Core +// Module: Error +// +// Definition of the Error class. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Foundation_Error_INCLUDED +#define Foundation_Error_INCLUDED + + +#include "Poco/Foundation.h" + + +namespace Poco { + + +class Foundation_API Error + /// The Error class provides utility functions + /// for error reporting. +{ +public: + +#ifdef POCO_OS_FAMILY_WINDOWS + static std::string getMessage(DWORD errorCode); + /// Utility function translating numeric error code to string. +#else + static std::string getMessage(int errorCode); + /// Utility function translating numeric error code to string. +#endif +}; + + +} // namespace Poco + + +#endif // Foundation_Error_INCLUDED diff --git a/Foundation/src/Error.cpp b/Foundation/src/Error.cpp new file mode 100644 index 000000000..2f864ecb9 --- /dev/null +++ b/Foundation/src/Error.cpp @@ -0,0 +1,77 @@ +// +// Error.cpp +// +// $Id: //poco/1.4/Foundation/src/Error.cpp#3 $ +// +// Library: Foundation +// Package: Core +// Module: Error +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Foundation.h" +#include "Poco/UnicodeConverter.h" +#include "Poco/Error.h" +#include + + +namespace Poco { + + +#ifdef POCO_OS_FAMILY_WINDOWS + + std::string Error::getMessage(DWORD errorCode) + { + std::string errMsg; + DWORD dwFlg = FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS; + #if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING) + LPWSTR lpMsgBuf = 0; + if (FormatMessageW(dwFlg, 0, errorCode, 0, (LPWSTR) & lpMsgBuf, 0, NULL)) + UnicodeConverter::toUTF8(lpMsgBuf, errMsg); + #else + LPTSTR lpMsgBuf = 0; + if (FormatMessageA(dwFlg, 0, errorCode, 0, (LPTSTR) & lpMsgBuf, 0, NULL)) + errMsg = lpMsgBuf; + #endif + LocalFree(lpMsgBuf); + return errMsg; + } + +#else + + std::string Error::getMessage(int errorCode) + { +#error todo + char errmsg[256]; + return std::string(strerror_r(errorCode, errMsg, 256)); + } + +#endif + + +} // namespace Poco diff --git a/Net/include/Poco/Net/Route.h b/Net/include/Poco/Net/Route.h index 7849e9d7e..d05538b76 100644 --- a/Net/include/Poco/Net/Route.h +++ b/Net/include/Poco/Net/Route.h @@ -43,7 +43,7 @@ #include "Poco/Net/Net.h" -#if defined(POCO_OS_FAMILY_WINDOWS) +#if defined(POCO_OS_FAMILY_WINDOWS) && (_WIN32_WINNT >= 0x600) // only Vista/Longhorn and up #ifndef POCO_NET_HAS_ROUTE #define POCO_NET_HAS_ROUTE #endif diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp index a6c37d7c9..df4f95cd2 100644 --- a/Net/src/NetworkInterface.cpp +++ b/Net/src/NetworkInterface.cpp @@ -43,6 +43,7 @@ #if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_WIN32_UTF8) #include "Poco/UnicodeConverter.h" + #include "Poco/Error.h" #endif #include #include @@ -892,24 +893,6 @@ IPAddress getBroadcastAddress(PIP_ADAPTER_PREFIX pPrefix, const IPAddress& addr, } -std::string getErrorMessage(DWORD errorCode) -{ - std::string errMsg; - DWORD dwFlg = FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS; -#if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING) - LPWSTR lpMsgBuf = 0; - if (FormatMessageW(dwFlg, 0, errorCode, 0, (LPWSTR) & lpMsgBuf, 0, NULL)) - UnicodeConverter::toUTF8(lpMsgBuf, errMsg); -#else - LPTSTR lpMsgBuf = 0; - if (FormatMessageA(dwFlg, 0, errorCode, 0, (LPTSTR) & lpMsgBuf, 0, NULL)) - errMsg = lpMsgBuf; -#endif - LocalFree(lpMsgBuf); - return errMsg; -} - - NetworkInterface::Type fromNative(DWORD type) { switch (type) @@ -957,7 +940,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly) else if (ERROR_NO_DATA == dwRetVal) // no network interfaces found return result; else if (NO_ERROR != dwRetVal) // error occurred - throw SystemException(format("An error occurred while trying to obtain list of network interfaces: [%s]", getErrorMessage(dwRetVal))); + throw SystemException(format("An error occurred while trying to obtain list of network interfaces: [%s]", Error::getMessage(dwRetVal))); else break; } while ((ERROR_BUFFER_OVERFLOW == dwRetVal) && (++iterations <= 2)); diff --git a/Net/src/Route_WIN32.cpp b/Net/src/Route_WIN32.cpp index d8cf2bde6..d632e3a82 100644 --- a/Net/src/Route_WIN32.cpp +++ b/Net/src/Route_WIN32.cpp @@ -34,17 +34,48 @@ // +#include "Poco/Error.h" + + namespace Poco { namespace Net { +static unsigned int getCompleteMetric(PMIB_IPFORWARD_ROW2 pIp2) + /// The route metric specified in the Metric member of the MIB_IPFORWARD_ROW2 structure + /// represents just the route metric offset. The complete metric is a combination of this + /// route metric offset added to the interface metric specified in the Metric member of + /// the MIB_IPINTERFACE_ROW structure of the associated interface. +{ + MIB_IPINTERFACE_ROW intfcRow; + intfcRow.InterfaceLuid = pIp2->InterfaceLuid; + intfcRow.InterfaceIndex = pIp2->InterfaceIndex; + intfcRow.Family = pIp2->DestinationPrefix.Prefix.si_family; + DWORD ret = GetIpInterfaceEntry(&intfcRow); + if (NO_ERROR == ret) return pIp2->Metric + intfcRow.Metric; + + std::string error; + switch (ret) + { + case ERROR_FILE_NOT_FOUND: + throw RuntimeException("Unknown network interface LUID or interface index"); + case ERROR_INVALID_PARAMETER: + throw RuntimeException("An invalid parameter was passed to the function."); + case ERROR_NOT_FOUND: + throw RuntimeException("Network interface/family mismatch."); + default: + throw RuntimeException(Error::getMessage(ret)); + } +} + + Route::RouteList Route::list(IPAddress::Family family) { std::time_t now; - PMIB_IPFORWARD_TABLE2 pIpForwardTable2 = NULL; + PMIB_IPFORWARD_TABLE2 pIpForwardTable2 = 0; if (GetIpForwardTable2(((family == IPAddress::IPv4) ? AF_INET : AF_INET6), &pIpForwardTable2) != NO_ERROR) - throw std::runtime_error("Couldn't fetch routing table"); + throw RuntimeException("Couldn't fetch routing table."); ::time(&now); @@ -59,8 +90,9 @@ Route::RouteList Route::list(IPAddress::Family family) IPAddress netmask(pIp2->DestinationPrefix.PrefixLength, family2); IPAddress nexthop(*(struct sockaddr *)&pIp2->NextHop); - Route route(dest, netmask, nexthop, pIp2->InterfaceIndex, nexthop.isWildcard() ? ROUTE_INDIRECT : ROUTE_INDIRECT); - route.setMetric(pIp2->Metric); + Route route(dest, netmask, nexthop, pIp2->InterfaceIndex, nexthop.isWildcard() ? ROUTE_DIRECT : ROUTE_INDIRECT); + + route.setMetric(getCompleteMetric(pIp2)); route.setAge(now - pIp2->Age); route.setProto((RouteProto) pIp2->Protocol); diff --git a/Net/testsuite/src/RouteTest.cpp b/Net/testsuite/src/RouteTest.cpp index 7bc17a4c6..e33f9ff78 100644 --- a/Net/testsuite/src/RouteTest.cpp +++ b/Net/testsuite/src/RouteTest.cpp @@ -36,6 +36,7 @@ #include "Poco/Net/IPAddress.h" #include "Poco/Net/Route.h" #include "Poco/Net/NetException.h" +#include using Poco::Net::IPAddress; @@ -66,14 +67,65 @@ RouteTest::~RouteTest() // with results we get back from NetworkInterface::list(). // -void RouteTest::testDefaultRoute() +void RouteTest::testAllRoutes() { Route::RouteList routes = Route::list(IPAddress::IPv4); assert(routes.size() >= 3); + + std::cout << "Active IPv4 Routes:" << std::endl; + std::cout << "=============================================================================" << std::endl; + std::cout << std::setw(17) << "Destinaton" + << std::setw(17) << "Netmask" + << std::setw(17) << "Gateway" + << std::setw(17) << "Interface" + << std::setw(8) << "Metric" << std::endl; + + Route::RouteList::const_iterator it = routes.begin(); + Route::RouteList::const_iterator end = routes.end(); + for (; it != end; ++it) + { + IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv4); + if (!ip.isLinkLocal()) + { + std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString(); + std::cout << std::setw(17) << it->getDest().toString() + << std::setw(17) << it->getNetmask().toString() + << std::setw(17) << gateway + << std::setw(17) << ip.toString() + << std::setw(8) << it->getMetric() << std::endl; + } + } + std::cout << "=============================================================================" << std::endl; + + routes = Route::list(IPAddress::IPv6); + assert(routes.size() >= 3); + + std::cout << std::endl << "Active IPv6 Routes:" << std::endl; + std::cout << "=============================================================" << std::endl; + std::cout << std::setw(4) << "If" + << std::setw(7) << "Metric" + << std::setw(41) << "Destinaton" + << std::setw(8) << "Gateway" + << std::endl; + + it = routes.begin(); + for (; it != end; ++it) + { + IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv6); + if (!ip.isLinkLocal()) + { + std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString(); + std::cout << std::setw(4) << it->getIfIndex() + << std::setw(7) << it->getMetric() + << std::setw(41) << it->getDest().toString() + << std::setw(8) << gateway << std::endl; + } + } + std::cout << "=============================================================" << std::endl; } -void RouteTest::testAllRoutes() +void RouteTest::testDefaultRoute() { Route::RouteList defaults = Route::defaults(IPAddress::IPv4); assert(defaults.size() >= 1); From 67a27ac2fa64fca56931326b56d49224a1d56839 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Wed, 7 Nov 2012 00:30:01 -0600 Subject: [PATCH 003/165] StringTokenizer trailing empty tokens consistency Modified StringTokenizer to eith include or exclude all empty tokens (including trailing ones based on TOK_IGNORE_EMPTY option. --- Foundation/include/Poco/StringTokenizer.h | 316 +++++++++--------- Foundation/src/StringTokenizer.cpp | 67 ++-- .../testsuite/src/StringTokenizerTest.cpp | 6 + JSON/JSON_vs100.sln | 120 +++---- 4 files changed, 266 insertions(+), 243 deletions(-) diff --git a/Foundation/include/Poco/StringTokenizer.h b/Foundation/include/Poco/StringTokenizer.h index 67cc1edaa..61f82202c 100644 --- a/Foundation/include/Poco/StringTokenizer.h +++ b/Foundation/include/Poco/StringTokenizer.h @@ -1,159 +1,157 @@ -// -// StringTokenizer.h -// -// $Id: //poco/1.4/Foundation/include/Poco/StringTokenizer.h#1 $ -// -// Library: Foundation -// Package: Core -// Module: StringTokenizer -// -// Definition of the StringTokenizer class. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef Foundation_StringTokenizer_INCLUDED -#define Foundation_StringTokenizer_INCLUDED - - -#include "Poco/Foundation.h" -#include "Poco/Exception.h" -#include -#include - - -namespace Poco { - - -class Foundation_API StringTokenizer - /// A simple tokenizer that splits a string into - /// tokens, which are separated by separator characters. - /// An iterator is used to iterate over all tokens. -{ -public: - enum Options - { - TOK_IGNORE_EMPTY = 1, /// ignore empty tokens - TOK_TRIM = 2 /// remove leading and trailing whitespace from tokens - }; - - typedef std::vector TokenVec; - typedef TokenVec::const_iterator Iterator; - - StringTokenizer(const std::string& str, const std::string& separators, int options = 0); - /// Splits the given string into tokens. The tokens are expected to be - /// separated by one of the separator characters given in separators. - /// Additionally, options can be specified: - /// * TOK_IGNORE_EMPTY: empty tokens are ignored - /// * TOK_TRIM: trailing and leading whitespace is removed from tokens. - /// An empty token at the end of str is always ignored. For example, - /// a StringTokenizer with the following arguments: - /// StringTokenizer(",ab,cd,", ","); - /// will produce three tokens, "", "ab" and "cd". - - ~StringTokenizer(); - /// Destroys the tokenizer. - - Iterator begin() const; - Iterator end() const; - - const std::string& operator [] (std::size_t index) const; - /// Returns const reference the index'th token. - /// Throws a RangeException if the index is out of range. - - std::string& operator [] (std::size_t index); - /// Returns reference to the index'th token. - /// Throws a RangeException if the index is out of range. - - bool has(const std::string& token) const; - /// Returns true if token exists, false otherwise. - - std::size_t find(const std::string& token, std::size_t pos = 0) const; - /// Returns the index of the first occurence of the token - /// starting at position pos. - /// Throws a NotFoundException if the token is not found. - - std::size_t replace(const std::string& oldToken, const std::string& newToken, std::size_t pos = 0); - /// Starting at position pos, replaces all subsequent tokens having value - /// equal to oldToken with newToken. - /// Returns the number of modified tokens. - - std::size_t count() const; - /// Returns the total number of tokens. - - std::size_t count(const std::string& token) const; - /// Returns the number of tokens equal to the specified token. - -private: - StringTokenizer(const StringTokenizer&); - StringTokenizer& operator = (const StringTokenizer&); - - TokenVec _tokens; -}; - - -// -// inlines -// - - -inline StringTokenizer::Iterator StringTokenizer::begin() const -{ - return _tokens.begin(); -} - - -inline StringTokenizer::Iterator StringTokenizer::end() const -{ - return _tokens.end(); -} - - -inline std::string& StringTokenizer::operator [] (std::size_t index) -{ - if (index >= _tokens.size()) throw RangeException(); - return _tokens[index]; -} - - -inline const std::string& StringTokenizer::operator [] (std::size_t index) const -{ - if (index >= _tokens.size()) throw RangeException(); - return _tokens[index]; -} - - -inline std::size_t StringTokenizer::count() const -{ - return _tokens.size(); -} - - -} // namespace Poco - - -#endif // Foundation_StringTokenizer_INCLUDED +// +// StringTokenizer.h +// +// $Id: //poco/1.4/Foundation/include/Poco/StringTokenizer.h#1 $ +// +// Library: Foundation +// Package: Core +// Module: StringTokenizer +// +// Definition of the StringTokenizer class. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Foundation_StringTokenizer_INCLUDED +#define Foundation_StringTokenizer_INCLUDED + + +#include "Poco/Foundation.h" +#include "Poco/Exception.h" +#include +#include + + +namespace Poco { + + +class Foundation_API StringTokenizer + /// A simple tokenizer that splits a string into + /// tokens, which are separated by separator characters. + /// An iterator is used to iterate over all tokens. +{ +public: + enum Options + { + TOK_IGNORE_EMPTY = 1, /// ignore empty tokens + TOK_TRIM = 2 /// remove leading and trailing whitespace from tokens + }; + + typedef std::vector TokenVec; + typedef TokenVec::const_iterator Iterator; + + StringTokenizer(const std::string& str, const std::string& separators, int options = 0); + /// Splits the given string into tokens. The tokens are expected to be + /// separated by one of the separator characters given in separators. + /// Additionally, options can be specified: + /// * TOK_IGNORE_EMPTY: empty tokens are ignored + /// * TOK_TRIM: trailing and leading whitespace is removed from tokens. + + ~StringTokenizer(); + /// Destroys the tokenizer. + + Iterator begin() const; + Iterator end() const; + + const std::string& operator [] (std::size_t index) const; + /// Returns const reference the index'th token. + /// Throws a RangeException if the index is out of range. + + std::string& operator [] (std::size_t index); + /// Returns reference to the index'th token. + /// Throws a RangeException if the index is out of range. + + bool has(const std::string& token) const; + /// Returns true if token exists, false otherwise. + + std::size_t find(const std::string& token, std::size_t pos = 0) const; + /// Returns the index of the first occurence of the token + /// starting at position pos. + /// Throws a NotFoundException if the token is not found. + + std::size_t replace(const std::string& oldToken, const std::string& newToken, std::size_t pos = 0); + /// Starting at position pos, replaces all subsequent tokens having value + /// equal to oldToken with newToken. + /// Returns the number of modified tokens. + + std::size_t count() const; + /// Returns the total number of tokens. + + std::size_t count(const std::string& token) const; + /// Returns the number of tokens equal to the specified token. + +private: + StringTokenizer(const StringTokenizer&); + StringTokenizer& operator = (const StringTokenizer&); + + void trim (std::string& token); + + TokenVec _tokens; +}; + + +// +// inlines +// + + +inline StringTokenizer::Iterator StringTokenizer::begin() const +{ + return _tokens.begin(); +} + + +inline StringTokenizer::Iterator StringTokenizer::end() const +{ + return _tokens.end(); +} + + +inline std::string& StringTokenizer::operator [] (std::size_t index) +{ + if (index >= _tokens.size()) throw RangeException(); + return _tokens[index]; +} + + +inline const std::string& StringTokenizer::operator [] (std::size_t index) const +{ + if (index >= _tokens.size()) throw RangeException(); + return _tokens[index]; +} + + +inline std::size_t StringTokenizer::count() const +{ + return _tokens.size(); +} + + +} // namespace Poco + + +#endif // Foundation_StringTokenizer_INCLUDED diff --git a/Foundation/src/StringTokenizer.cpp b/Foundation/src/StringTokenizer.cpp index a02eeb1e8..43dc8d875 100644 --- a/Foundation/src/StringTokenizer.cpp +++ b/Foundation/src/StringTokenizer.cpp @@ -44,38 +44,35 @@ namespace Poco { StringTokenizer::StringTokenizer(const std::string& str, const std::string& separators, int options) { - std::string::const_iterator it1 = str.begin(); - std::string::const_iterator it2; - std::string::const_iterator it3; + std::string::const_iterator it = str.begin(); std::string::const_iterator end = str.end(); - - while (it1 != end) + std::string token; + bool doTrim = ((options & TOK_TRIM) != 0); + bool ignoreEmpty = ((options & TOK_IGNORE_EMPTY) != 0); + bool lastToken = false; + + for (;it != end; ++it) { - if (options & TOK_TRIM) + if (separators.find(*it) != std::string::npos) { - while (it1 != end && Ascii::isSpace(*it1)) ++it1; - } - it2 = it1; - while (it2 != end && separators.find(*it2) == std::string::npos) ++it2; - it3 = it2; - if (it3 != it1 && (options & TOK_TRIM)) - { - --it3; - while (it3 != it1 && Ascii::isSpace(*it3)) --it3; - if (!Ascii::isSpace(*it3)) ++it3; - } - if (options & TOK_IGNORE_EMPTY) - { - if (it3 != it1) - _tokens.push_back(std::string(it1, it3)); + if (doTrim) trim(token); + if (!token.empty() || !ignoreEmpty)_tokens.push_back(token); + if (!ignoreEmpty) lastToken = true; + token = ""; } else { - _tokens.push_back(std::string(it1, it3)); + token += *it; + lastToken = false; } - it1 = it2; - if (it1 != end) ++it1; } + + if (!token.empty()) + { + if (doTrim) trim(token); + if (!token.empty()) _tokens.push_back(token); + } + else if (lastToken) _tokens.push_back(""); } @@ -84,6 +81,28 @@ StringTokenizer::~StringTokenizer() } +void StringTokenizer::trim (std::string& token) +{ + int front = 0, back = 0, length = token.length(); + std::string::const_iterator tIt = token.begin(); + std::string::const_iterator tEnd = token.end(); + for (; tIt != tEnd; ++tIt, ++front) + { + if (!Ascii::isSpace(*tIt)) break; + } + if (tIt != tEnd) + { + std::string::const_reverse_iterator tRit = token.rbegin(); + std::string::const_reverse_iterator tRend = token.rend(); + for (; tRit != tRend; ++tRit, ++back) + { + if (!Ascii::isSpace(*tRit)) break; + } + } + token = token.substr(front, length - back - front); +} + + std::size_t StringTokenizer::count(const std::string& token) const { std::size_t result = 0; diff --git a/Foundation/testsuite/src/StringTokenizerTest.cpp b/Foundation/testsuite/src/StringTokenizerTest.cpp index 47536a608..bfd091710 100644 --- a/Foundation/testsuite/src/StringTokenizerTest.cpp +++ b/Foundation/testsuite/src/StringTokenizerTest.cpp @@ -133,6 +133,8 @@ void StringTokenizerTest::testStringTokenizer() assert (*it++ == "a"); assert (it != st.end()); assert (*it++ == ""); + assert (it != st.end()); + assert (*it++ == ""); assert (it == st.end()); } { @@ -144,6 +146,8 @@ void StringTokenizerTest::testStringTokenizer() assert (*it++ == "a"); assert (it != st.end()); assert (*it++ == ""); + assert (it != st.end()); + assert (*it++ == ""); assert (it == st.end()); } { @@ -306,6 +310,8 @@ void StringTokenizerTest::testStringTokenizer() assert (*it++ == "ab"); assert (it != st.end()); assert (*it++ == "cd"); + assert (it != st.end()); + assert (*it++ == ""); assert (it == st.end()); } { diff --git a/JSON/JSON_vs100.sln b/JSON/JSON_vs100.sln index 201b5d292..a3f6c5d9f 100644 --- a/JSON/JSON_vs100.sln +++ b/JSON/JSON_vs100.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs100.vcxproj", "{A63135B8-0DFC-428C-AF90-BC020BE83D0C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}" - ProjectSection(ProjectDependencies) = postProject - {A63135B8-0DFC-428C-AF90-BC020BE83D0C} = {A63135B8-0DFC-428C-AF90-BC020BE83D0C} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.Build.0 = release_shared|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.Build.0 = release_shared|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs100.vcxproj", "{A63135B8-0DFC-428C-AF90-BC020BE83D0C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {A63135B8-0DFC-428C-AF90-BC020BE83D0C} = {A63135B8-0DFC-428C-AF90-BC020BE83D0C} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_shared|Win32 = release_shared|Win32 + release_static_md|Win32 = release_static_md|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.Build.0 = release_shared|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal From fefe3b5d7a8d170cce6c311841d4113e78b6df2b Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 8 Nov 2012 22:56:25 -0600 Subject: [PATCH 004/165] Route OSX compile and tests --- Net/Makefile | 2 +- Net/include/Poco/Net/Route.h | 245 ++++++++++++++++---------------- Net/src/Route.cpp | 72 +++++----- Net/src/Route_BSD.cpp | 142 ++++++++++-------- Net/testsuite/Makefile | 2 +- Net/testsuite/src/RouteTest.cpp | 133 +++++++++-------- 6 files changed, 325 insertions(+), 271 deletions(-) diff --git a/Net/Makefile b/Net/Makefile index 6d3a041ca..f27a22267 100644 --- a/Net/Makefile +++ b/Net/Makefile @@ -28,7 +28,7 @@ objects = \ FTPClientSession FTPStreamFactory PartHandler PartSource NullPartHandler \ SocketReactor SocketNotifier SocketNotification AbstractHTTPRequestHandler \ MailRecipient MailMessage MailStream SMTPClientSession POP3ClientSession \ - RawSocket RawSocketImpl ICMPClient ICMPEventArgs ICMPPacket ICMPPacketImpl \ + RawSocket RawSocketImpl Route ICMPClient ICMPEventArgs ICMPPacket ICMPPacketImpl \ ICMPSocket ICMPSocketImpl ICMPv4PacketImpl \ RemoteSyslogChannel RemoteSyslogListener SMTPChannel \ WebSocket WebSocketImpl diff --git a/Net/include/Poco/Net/Route.h b/Net/include/Poco/Net/Route.h index d05538b76..8043ba90c 100644 --- a/Net/include/Poco/Net/Route.h +++ b/Net/include/Poco/Net/Route.h @@ -82,166 +82,169 @@ class RouteHelper; class Net_API Route { public: - typedef std::list RouteList; + typedef std::list RouteList; - enum RouteType - { - ROUTE_NONE = 0, - ROUTE_OTHER = 1, - ROUTE_INVALID = 2, - ROUTE_DIRECT = 3, - ROUTE_INDIRECT = 4 - }; + static const unsigned int ROUTE_METRIC_UNKNOWN = ~0; + static const unsigned int ROUTE_MTU_UNKNOWN = 0; + static const unsigned int ROUTE_HOPS_UNKNOWN = ~0; + static const unsigned int ROUTE_USE_UNKNOWN = ~1; + static const unsigned int ROUTE_CREATED_UNKNOWN = 0; + + enum RouteType + { + ROUTE_NONE = 0, + ROUTE_OTHER = 1, + ROUTE_INVALID = 2, + ROUTE_DIRECT = 3, + ROUTE_INDIRECT = 4 + }; - enum RouteProto - { - ROUTE_PROTO_NONE = 0, - ROUTE_PROTO_OTHER = 1, - ROUTE_PROTO_LOCAL = 2, - ROUTE_PROTO_NET_MGMT = 3, - ROUTE_PROTO_ICMP = 4, - ROUTE_PROTO_EGP = 5, - ROUTE_PROTO_GGP = 6, - ROUTE_PROTO_HELLO = 7, - ROUTE_PROTO_RIP = 8, - ROUTE_PROTO_ISIS = 9, - ROUTE_PROTO_ESIS = 10, - ROUTE_PROTO_CISCO = 11, // EIGRP? - ROUTE_PROTO_BBN = 12, - ROUTE_PROTO_OSPF = 13, - ROUTE_PROTO_BGP = 14, - }; + enum RouteProto + { + ROUTE_PROTO_NONE = 0, + ROUTE_PROTO_OTHER = 1, + ROUTE_PROTO_LOCAL = 2, + ROUTE_PROTO_NET_MGMT = 3, + ROUTE_PROTO_ICMP = 4, + ROUTE_PROTO_EGP = 5, + ROUTE_PROTO_GGP = 6, + ROUTE_PROTO_HELLO = 7, + ROUTE_PROTO_RIP = 8, + ROUTE_PROTO_ISIS = 9, + ROUTE_PROTO_ESIS = 10, + ROUTE_PROTO_CISCO = 11, // EIGRP? + ROUTE_PROTO_BBN = 12, + ROUTE_PROTO_OSPF = 13, + ROUTE_PROTO_BGP = 14, + }; - ~Route(); - /// Destroys Route. + Route(const IPAddress& dst, const IPAddress& netmask, const IPAddress& nextHop, unsigned ifIndex, RouteType type); + /// Creates Route. + + Route(const IPAddress& dst, const IPAddress& netmask, unsigned ifIndex, RouteType type); + /// Creates Route. + + Route(const IPAddress& dst, unsigned prefix, const IPAddress& nextHop, unsigned ifIndex, RouteType type); + /// Creates Route. + + Route(const IPAddress& dst, unsigned prefix, unsigned ifIndex, RouteType type); + /// Creates Route. + + ~Route(); + /// Destroys Route. - const IPAddress getDest() const; - /// Returns destination. + const IPAddress getDest() const; + /// Returns destination. - unsigned getPrefix() const; - /// Returns prefix. + unsigned getPrefix() const; + /// Returns prefix. - const IPAddress getNetmask() const; - /// Returns net mask (IPv4 only). + const IPAddress getNetmask() const; + /// Returns net mask (IPv4 only). - const IPAddress getNextHop() const; - /// Returns next hop. + const IPAddress getNextHop() const; + /// Returns next hop. - unsigned getIfIndex() const; - /// Returns interface index. + unsigned getIfIndex() const; + /// Returns interface index. - const NetworkInterface getNetworkInterface() const; - /// Returns netwrok interface. + const NetworkInterface getNetworkInterface() const; + /// Returns netwrok interface. - RouteType getType() const; - /// Returns route type. + RouteType getType() const; + /// Returns route type. - unsigned getMetric() const; - /// Returns metric; not available on all platforms. + unsigned getMetric() const; + /// Returns metric; not available on all platforms. - unsigned getHops() const; - /// Returns hops count; not available on all platforms. + unsigned getHops() const; + /// Returns hops count; not available on all platforms. - unsigned getMTU() const; - /// Returns MTU; not available on all platforms. + unsigned getMTU() const; + /// Returns MTU; not available on all platforms. - unsigned getUsage() const; - /// Returns usage; not available on all platforms. + unsigned getUsage() const; + /// Returns usage; not available on all platforms. - RouteProto getProto() const; - /// Returns proto; not available on all platforms. + RouteProto getProto() const; + /// Returns proto; not available on all platforms. - std::time_t getAge() const; - /// Returns age; not available on all platforms. + std::time_t getAge() const; + /// Returns age; not available on all platforms. - bool validMetric() const; - /// Returns true if metric is valid; not available on all platforms. + bool validMetric() const; + /// Returns true if metric is valid; not available on all platforms. - bool validHops() const; - /// Returns true if hops are valid; not available on all platforms. + bool validHops() const; + /// Returns true if hops are valid; not available on all platforms. - bool validMTU() const; - /// Returns true if MTU is valid; not available on all platforms. + bool validMTU() const; + /// Returns true if MTU is valid; not available on all platforms. - bool validUsage() const; - /// Returns true if usage is valid; not available on all platforms. + bool validUsage() const; + /// Returns true if usage is valid; not available on all platforms. - bool validProto() const; - /// Returns true if proto is valid; not available on all platforms. + bool validProto() const; + /// Returns true if proto is valid; not available on all platforms. - bool validAge() const; - /// Returns true if age is valid; not available on all platforms. + bool validAge() const; + /// Returns true if age is valid; not available on all platforms. - bool operator == (const Route& other) const; - /// Return strue if this route is equal to other. + bool operator == (const Route& other) const; + /// Return strue if this route is equal to other. - bool operator != (const Route& other) const; - /// Return strue if this route is not equal to other. + bool operator != (const Route& other) const; + /// Return strue if this route is not equal to other. - static RouteList list(IPAddress::Family family); - /// Retruns the list of routes. + static RouteList list(IPAddress::Family family); + /// Retruns the list of routes. - static RouteList defaults(IPAddress::Family family); - /// Returns default routes. + static RouteList defaults(IPAddress::Family family); + /// Returns default routes. - static RouteList match(IPAddress target); - /// Retruns routes matching target. + static RouteList match(IPAddress target); + /// Retruns routes matching target. - static const IPAddress getDefaultAddress(IPAddress::Family family); - /// Returns default IP address for the family. + static const IPAddress getDefaultAddress(IPAddress::Family family); + /// Returns default IP address for the family. - static std::string protocolName(RouteProto proto); - /// Returns protocol as string. + static std::string protocolName(RouteProto proto); + /// Returns protocol as string. -protected: - void setMTU(unsigned mtu); - /// Sets the MTU to specified value. + void setMTU(unsigned mtu); + /// Sets the MTU to specified value. - void setAge(std::time_t created); - /// Sets MTU to specified value. + void setAge(std::time_t created); + /// Sets MTU to specified value. - void setProto(RouteProto proto); - /// Sets proto to specified value. + void setProto(RouteProto proto); + /// Sets proto to specified value. - void setMetric(unsigned metric); - /// Sets metric to specified value. + void setMetric(unsigned metric); + /// Sets metric to specified value. - void setHops(unsigned hops); - /// Sets hops to specified value. + void setHops(unsigned hops); + /// Sets hops to specified value. - void setUsage(unsigned use); - /// Sets usage to specified value. + void setUsage(unsigned use); + /// Sets usage to specified value. private: - Route(const IPAddress& dst, const IPAddress& netmask, const IPAddress& nextHop, unsigned ifIndex, RouteType type); - /// Creates Route. + // portable attributes + IPAddress _dst; + IPAddress _netmask; + IPAddress _nextHop; + unsigned _ifIndex; + RouteType _type; - Route(const IPAddress& dst, const IPAddress& netmask, unsigned ifIndex, RouteType type); - /// Creates Route. - - Route(const IPAddress& dst, unsigned prefix, const IPAddress& nextHop, unsigned ifIndex, RouteType type); - /// Creates Route. - - Route(const IPAddress& dst, unsigned prefix, unsigned ifIndex, RouteType type); - /// Creates Route. - - // portable attributes - IPAddress _dst; - IPAddress _netmask; - IPAddress _nextHop; - unsigned _ifIndex; - RouteType _type; - - // optional attributes supported on some platforms - unsigned _metric; - unsigned _mtu; - unsigned _hops; - unsigned _use; - RouteProto _proto; - Timestamp _created; - - friend class RouteHelper; + // optional attributes supported on some platforms + unsigned _metric; + unsigned _mtu; + unsigned _hops; + unsigned _use; + RouteProto _proto; + Timestamp _created; }; diff --git a/Net/src/Route.cpp b/Net/src/Route.cpp index 5f8be6c23..3bfbf8cca 100644 --- a/Net/src/Route.cpp +++ b/Net/src/Route.cpp @@ -42,10 +42,10 @@ #include "Poco/Net/IPAddress.h" #include "Poco/Net/NetException.h" -#include #if defined(POCO_OS_FAMILY_WINDOWS) + #include #include "Route_WIN32.cpp" #elif defined(POCO_OS_FAMILY_BSD) #include "Route_BSD.cpp" @@ -57,20 +57,19 @@ namespace Poco { namespace Net { - + Route::Route(const IPAddress& dst, const IPAddress& netmask, const IPAddress& nextHop, unsigned ifIndex, RouteType type) : _dst(dst), _netmask(netmask), _nextHop(nextHop), _ifIndex(ifIndex), _type(type), - // attributes that might not be available on all platforms are set to sentinel values. - _metric(~0), - _hops(~0), - _mtu(0), - _use(~1), + _metric(ROUTE_METRIC_UNKNOWN), + _mtu(ROUTE_MTU_UNKNOWN), + _hops(ROUTE_HOPS_UNKNOWN), + _use(~ROUTE_USE_UNKNOWN), _proto(ROUTE_PROTO_NONE), - _created(0) + _created(ROUTE_CREATED_UNKNOWN) { if (_dst.family() != _nextHop.family()) throw InvalidArgumentException("Destination and nextHop have different families"); @@ -83,13 +82,12 @@ Route::Route(const IPAddress& dst, const IPAddress& netmask, unsigned ifIndex, R _nextHop(IPAddress(dst.family())), _ifIndex(ifIndex), _type(type), - // attributes that might not be available on all platforms are set to sentinel values. - _metric(~0), - _hops(~0), - _mtu(0), - _use(~1), + _metric(ROUTE_METRIC_UNKNOWN), + _mtu(ROUTE_MTU_UNKNOWN), + _hops(ROUTE_HOPS_UNKNOWN), + _use(~ROUTE_USE_UNKNOWN), _proto(ROUTE_PROTO_NONE), - _created(0) + _created(ROUTE_CREATED_UNKNOWN) { if (_dst.family() != _nextHop.family()) throw InvalidArgumentException("Destination and nextHop have different families"); @@ -102,31 +100,30 @@ Route::Route(const IPAddress& dst, unsigned prefix, const IPAddress& nextHop, un _nextHop(nextHop), _ifIndex(ifIndex), _type(type), - // attributes that might not be available on all platforms are set to sentinel values. - _metric(~0), - _hops(~0), - _mtu(0), - _use(~1), + _metric(ROUTE_METRIC_UNKNOWN), + _mtu(ROUTE_MTU_UNKNOWN), + _hops(ROUTE_HOPS_UNKNOWN), + _use(~ROUTE_USE_UNKNOWN), _proto(ROUTE_PROTO_NONE), - _created(0) + _created(ROUTE_CREATED_UNKNOWN) { if (_dst.family() != _nextHop.family()) throw InvalidArgumentException("Destination and nextHop have different families"); } + Route::Route(const IPAddress& dst, unsigned prefix, unsigned ifIndex, RouteType type) : _dst(dst), _netmask(IPAddress(prefix, dst.family())), _nextHop(IPAddress(dst.family())), _ifIndex(ifIndex), _type(type), - // attributes that might not be available on all platforms are set to sentinel values. - _metric(~0), - _hops(~0), - _mtu(0), - _use(~1), + _metric(ROUTE_METRIC_UNKNOWN), + _mtu(ROUTE_MTU_UNKNOWN), + _hops(ROUTE_HOPS_UNKNOWN), + _use(~ROUTE_USE_UNKNOWN), _proto(ROUTE_PROTO_NONE), - _created(0) + _created(ROUTE_CREATED_UNKNOWN) { if (_dst.family() != _nextHop.family()) throw InvalidArgumentException("Destination and nextHop have different families"); @@ -167,16 +164,17 @@ void Route::setProto(RouteProto proto) Route::RouteList Route::defaults(IPAddress::Family family) { Route::RouteList defaults, routes = Route::list(family); - - for (Route::RouteList::const_iterator it = routes.begin(); - it != routes.end(); it++) { + RouteList::const_iterator it = routes.begin(); + RouteList::const_iterator end = routes.end(); + for (; it != end; ++it) + { if (it->getPrefix() != 0) continue; // look for insertion point Route::RouteList::iterator it2 = defaults.begin(); Route::RouteList::const_iterator end = defaults.end(); while (it2 != end && it2->getMetric() <= it->getMetric()) - it2++; + ++it2; defaults.insert(it2, *it); } @@ -187,17 +185,21 @@ Route::RouteList Route::defaults(IPAddress::Family family) Route::RouteList Route::match(IPAddress target) { Route::RouteList targets, routes = Route::list(target.family()); - - for (Route::RouteList::const_iterator it = routes.begin(); - it != routes.end(); it++) { + RouteList::const_iterator it = routes.begin(); + RouteList::const_iterator end = routes.end(); + for (; it != end; ++it) + { if ((target & it->getNetmask()) != it->getDest()) continue; // look for insertion point Route::RouteList::iterator it2 = targets.begin(); while (it2 != targets.end() && (it2->getPrefix() > it->getPrefix() - || (it2->getPrefix() == it->getPrefix() && it2->getMetric() <= it->getMetric()))) - it2++; + || (it2->getPrefix() == it->getPrefix() && + it2->getMetric() <= it->getMetric()))) + { + ++it2; + } targets.insert(it2, *it); } diff --git a/Net/src/Route_BSD.cpp b/Net/src/Route_BSD.cpp index 6093829e2..5c5ae4ff7 100644 --- a/Net/src/Route_BSD.cpp +++ b/Net/src/Route_BSD.cpp @@ -41,7 +41,6 @@ #include #include #include - #include @@ -53,14 +52,20 @@ } #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) -#define SIN_OFFSET (offsetof(sockaddr_in,sin_addr)) -#define SIN_LENGTH (sizeof(struct in_addr)) -#define SIN6_OFFSET (offsetof(sockaddr_in6,sin6_addr)) -#define SIN6_LENGTH (sizeof(struct in6_addr)) +#define SIN_OFFSET (offsetof(sockaddr_in,sin_addr)) +#define SIN_LENGTH (sizeof(struct in_addr)) +#define SIN6_OFFSET (offsetof(sockaddr_in6,sin6_addr)) +#define SIN6_LENGTH (sizeof(struct in6_addr)) + +namespace Poco { +namespace Net { + + static int seq = rand(); + static void get_rtaddrs(unsigned addrs, struct sockaddr *sa, struct sockaddr **rti_info) { for (unsigned i = 0; i < RTAX_MAX; i++) { @@ -73,6 +78,7 @@ static void get_rtaddrs(unsigned addrs, struct sockaddr *sa, struct sockaddr **r } } + static IPAddress unpack_sockaddr_inX(struct sockaddr *sa, bool ipv4) { const unsigned offset = (ipv4 ? SIN_OFFSET : SIN6_OFFSET); @@ -90,37 +96,34 @@ static IPAddress unpack_sockaddr_inX(struct sockaddr *sa, bool ipv4) return ip; } + -class RouteHelper { -public: - static Route* createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_info); - -private: - RouteHelper(); - ~RouteHelper(); -}; - -Route* RouteHelper::createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_info) +static Route createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_info) { IPAddress dest, netmask, nexthop; int ifIndex = rtm->rtm_index; bool adjacent = false; sa_family_t family = AF_MAX; - char macaddr[16]; // should be plenty, right? + char macaddr[16]; - for (unsigned i = 0; i < RTAX_MAX; i++) { + for (unsigned i = 0; i < RTAX_MAX; i++) + { sockaddr* sa = (struct sockaddr*)rti_info[i]; - if (sa == NULL) continue; + if (sa == 0) continue; - switch (i) { + switch (i) + { case RTAX_DST: poco_assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6); family = sa->sa_family; - if (family == AF_INET) { + if (family == AF_INET) + { struct sockaddr_in *sin = (struct sockaddr_in *)sa; dest = IPAddress(&sin->sin_addr, SIN_LENGTH); - } else { + } + else + { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; dest = IPAddress(&sin6->sin6_addr, SIN6_LENGTH, rtm->rtm_index); } @@ -128,27 +131,28 @@ Route* RouteHelper::createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_in case RTAX_GATEWAY: poco_assert((sa->sa_family == family || sa->sa_family == AF_LINK)); - switch (sa->sa_family) { + switch (sa->sa_family) + { case AF_INET: - { - struct sockaddr_in *sin = (struct sockaddr_in *)sa; - nexthop = IPAddress(&sin->sin_addr, SIN_LENGTH); - break; - } + { + struct sockaddr_in *sin = (struct sockaddr_in *)sa; + nexthop = IPAddress(&sin->sin_addr, SIN_LENGTH); + break; + } case AF_INET6: - { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; - nexthop = IPAddress(&sin6->sin6_addr, SIN6_LENGTH, rtm->rtm_index); - break; - } + { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; + nexthop = IPAddress(&sin6->sin6_addr, SIN6_LENGTH, rtm->rtm_index); + break; + } case AF_LINK: - { - struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa; - adjacent = true; - ifIndex = sdl->sdl_index; - memcpy(macaddr, sdl->sdl_data, sdl->sdl_alen); - break; - } + { + struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa; + adjacent = true; + ifIndex = sdl->sdl_index; + memcpy(macaddr, sdl->sdl_data, sdl->sdl_alen); + break; + } default: break; } @@ -168,28 +172,52 @@ Route* RouteHelper::createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_in } } - if (rtm->rtm_flags & RTF_HOST) { - poco_assert(! (rtm->rtm_addrs & RTA_NETMASK)); + if (rtm->rtm_flags & RTF_HOST) + { + poco_assert(!(rtm->rtm_addrs & RTA_NETMASK)); if (family == AF_INET) netmask = IPAddress(32, IPAddress::IPv4); else netmask = IPAddress(128, IPAddress::IPv6); } - Route *route; - if (adjacent) - route = new Route(dest, netmask, ifIndex, Route::ROUTE_DIRECT); + { + Route route(dest, netmask, ifIndex, Route::ROUTE_DIRECT); + route.setMTU(rtm->rtm_rmx.rmx_mtu); + route.setHops(rtm->rtm_rmx.rmx_hopcount); + route.setUsage(rtm->rtm_use); + // OSX uses expire, not metric; we reuse metric member here + if (rtm->rtm_rmx.rmx_expire) + { + time_t expTime; + if ((expTime = rtm->rtm_rmx.rmx_expire - ::time(0)) > 0) + route.setMetric(expTime); + else route.setMetric(Route::ROUTE_METRIC_UNKNOWN); + } + else route.setMetric(Route::ROUTE_METRIC_UNKNOWN); + return route; + } else - route = new Route(dest, netmask, nexthop, ifIndex, Route::ROUTE_INDIRECT); - - route->setMTU(rtm->rtm_rmx.rmx_mtu); - route->setHops(rtm->rtm_rmx.rmx_hopcount); - route->setUsage(rtm->rtm_use); - - return route; + { + Route route(dest, netmask, nexthop, ifIndex, Route::ROUTE_INDIRECT); + route.setMTU(rtm->rtm_rmx.rmx_mtu); + route.setHops(rtm->rtm_rmx.rmx_hopcount); + route.setUsage(rtm->rtm_use); + // OSX uses expire, not metric; we reuse metric member here + if (rtm->rtm_rmx.rmx_expire) + { + time_t expTime; + if ((expTime = rtm->rtm_rmx.rmx_expire - ::time(0)) > 0) + route.setMetric(expTime); + else route.setMetric(Route::ROUTE_METRIC_UNKNOWN); + } + else route.setMetric(Route::ROUTE_METRIC_UNKNOWN); + return route; + } } + Route::RouteList Route::list(IPAddress::Family family) { Route::RouteList routes; @@ -208,10 +236,11 @@ Route::RouteList Route::list(IPAddress::Family family) char *buf = new char[needed]; if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) - throw std::runtime_error("sysctl faield to populate routing table"); + throw std::runtime_error("sysctl failed to populate routing table"); struct rt_msghdr2 *rtm = NULL; - for (char *next = buf, *lim = &buf[needed]; next < lim; next += rtm->rtm_msglen) { + for (char *next = buf, *lim = &buf[needed]; next < lim; next += rtm->rtm_msglen) + { rtm = (struct rt_msghdr2 *)next; struct sockaddr_in *sin = (struct sockaddr_in*)(rtm + 1); @@ -224,14 +253,15 @@ Route::RouteList Route::list(IPAddress::Family family) struct sockaddr* rti_info[RTAX_MAX]; get_rtaddrs(rtm->rtm_addrs, (struct sockaddr *)sin, rti_info); - Route *route = RouteHelper::createRoute(rtm, rti_info); - // RTF_IFSCOPE? - routes.push_back(route); + routes.push_back(createRoute(rtm, rti_info)); } delete[] buf; return routes; } + + +}} // namespace Poco::Net diff --git a/Net/testsuite/Makefile b/Net/testsuite/Makefile index be3c6d90a..69fec0428 100644 --- a/Net/testsuite/Makefile +++ b/Net/testsuite/Makefile @@ -24,7 +24,7 @@ objects = \ SocketReactorTest ReactorTestSuite \ MailTestSuite MailMessageTest MailStreamTest \ SMTPClientSessionTest POP3ClientSessionTest \ - RawSocketTest ICMPClientTest ICMPSocketTest ICMPClientTestSuite \ + RawSocketTest RouteTest ICMPClientTest ICMPSocketTest ICMPClientTestSuite \ WebSocketTest WebSocketTestSuite \ SyslogTest diff --git a/Net/testsuite/src/RouteTest.cpp b/Net/testsuite/src/RouteTest.cpp index e33f9ff78..22e3f53d5 100644 --- a/Net/testsuite/src/RouteTest.cpp +++ b/Net/testsuite/src/RouteTest.cpp @@ -36,6 +36,7 @@ #include "Poco/Net/IPAddress.h" #include "Poco/Net/Route.h" #include "Poco/Net/NetException.h" +#include #include @@ -67,63 +68,6 @@ RouteTest::~RouteTest() // with results we get back from NetworkInterface::list(). // -void RouteTest::testAllRoutes() -{ - Route::RouteList routes = Route::list(IPAddress::IPv4); - assert(routes.size() >= 3); - - std::cout << "Active IPv4 Routes:" << std::endl; - std::cout << "=============================================================================" << std::endl; - std::cout << std::setw(17) << "Destinaton" - << std::setw(17) << "Netmask" - << std::setw(17) << "Gateway" - << std::setw(17) << "Interface" - << std::setw(8) << "Metric" << std::endl; - - Route::RouteList::const_iterator it = routes.begin(); - Route::RouteList::const_iterator end = routes.end(); - for (; it != end; ++it) - { - IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv4); - if (!ip.isLinkLocal()) - { - std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString(); - std::cout << std::setw(17) << it->getDest().toString() - << std::setw(17) << it->getNetmask().toString() - << std::setw(17) << gateway - << std::setw(17) << ip.toString() - << std::setw(8) << it->getMetric() << std::endl; - } - } - std::cout << "=============================================================================" << std::endl; - - routes = Route::list(IPAddress::IPv6); - assert(routes.size() >= 3); - - std::cout << std::endl << "Active IPv6 Routes:" << std::endl; - std::cout << "=============================================================" << std::endl; - std::cout << std::setw(4) << "If" - << std::setw(7) << "Metric" - << std::setw(41) << "Destinaton" - << std::setw(8) << "Gateway" - << std::endl; - - it = routes.begin(); - for (; it != end; ++it) - { - IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv6); - if (!ip.isLinkLocal()) - { - std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString(); - std::cout << std::setw(4) << it->getIfIndex() - << std::setw(7) << it->getMetric() - << std::setw(41) << it->getDest().toString() - << std::setw(8) << gateway << std::endl; - } - } - std::cout << "=============================================================" << std::endl; -} - void RouteTest::testDefaultRoute() { @@ -158,6 +102,81 @@ void RouteTest::tearDown() } +void RouteTest::testAllRoutes() +{ + std::string metric = "Metric"; +#if defined(POCO_OS_FAMILY_BSD) + metric = "Expire"; +#endif + Route::RouteList routes = Route::list(IPAddress::IPv4); + assert(routes.size() >= 3); + + std::cout << std::endl << "Active IPv4 Routes:" << std::endl; + std::cout << "=============================================================================" << std::endl; + std::cout << std::setw(17) << "Destinaton" + << std::setw(17) << "Netmask" + << std::setw(17) << "Gateway" + << std::setw(17) << "Interface" + << std::setw(8) << metric << std::endl; + + Route::RouteList::const_iterator it = routes.begin(); + Route::RouteList::const_iterator end = routes.end(); + for (; it != end; ++it) + { + IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv4); + if (!ip.isLinkLocal()) + { + std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString(); + std::cout << std::setw(17) << it->getDest().toString() + << std::setw(17) << it->getNetmask().toString() + << std::setw(17) << gateway +#if defined(POCO_OS_FAMILY_BSD) + << std::setw(17) << it->getNetworkInterface().name(); +#else + << std::setw(17) << ip.toString(); +#endif + if (it->getMetric() != Route::ROUTE_METRIC_UNKNOWN) + std::cout << std::setw(8) << it->getMetric(); + std::cout << std::endl; + } + } + std::cout << "=============================================================================" << std::endl; + + routes = Route::list(IPAddress::IPv6); + assert(routes.size() >= 3); + + std::cout << std::endl << "Active IPv6 Routes:" << std::endl; + std::cout << "=============================================================" << std::endl; + std::cout << std::setw(4) << "If" + << std::setw(7) << metric + << std::setw(41) << "Destinaton" + << std::setw(41) << "Gateway" + << std::endl; + + it = routes.begin(); + for (; it != end; ++it) + { + IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv6); + if (!ip.isLinkLocal()) + { + std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString(); +#if defined(POCO_OS_FAMILY_BSD) + std::cout << std::setw(4) << it->getNetworkInterface().name(); +#else + std::cout << std::setw(4) << it->getIfIndex(); +#endif + if (it->getMetric() != Route::ROUTE_METRIC_UNKNOWN) + std::cout << std::setw(7) << it->getMetric(); + else + std::cout << std::setw(7) << ""; + std::cout << std::setw(41) << it->getDest().toString() + << std::setw(41) << gateway << std::endl; + } + } + std::cout << "=============================================================" << std::endl; +} + + CppUnit::Test* RouteTest::suite() { CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("RouteTest"); From c07d57704862d3cc211aa052dffb63b50d44a3e3 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 11:35:46 +0100 Subject: [PATCH 005/165] ProGen now automatically excludes all .rc files from static builds --- ProGen/src/ProGen.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ProGen/src/ProGen.cpp b/ProGen/src/ProGen.cpp index 1b277f1c4..02aa8d2ee 100644 --- a/ProGen/src/ProGen.cpp +++ b/ProGen/src/ProGen.cpp @@ -1,7 +1,7 @@ // // ProGen.cpp // -// $Id: //poco/1.4/ProGen/src/ProGen.cpp#5 $ +// $Id: //poco/1.4/ProGen/src/ProGen.cpp#6 $ // // Visual Studio project file generator. // @@ -263,6 +263,7 @@ protected: { Poco::XML::Element* pFileElem = static_cast(pFileElems->item(fileIndex)); Poco::XML::Element* pFileConfigElem = pFileElem->getChildElement("FileConfiguration"); + Poco::Path relativePath = pFileElem->getAttribute("RelativePath"); if (pFileConfigElem) { Poco::AutoPtr pPrototypeFileConfigElem = static_cast(pFileConfigElem->cloneNode(true)); @@ -276,6 +277,10 @@ protected: { Poco::AutoPtr pNewFileConfigElem = static_cast(pPrototypeFileConfigElem->cloneNode(true)); pNewFileConfigElem->setAttribute("Name", *it + "|" + platform); + if (relativePath.getExtension() == "rc" && it->find("static") != std::string::npos) + { + pNewFileConfigElem->setAttribute("ExcludedFromBuild", "true"); + } pFileElem->appendChild(pNewFileConfigElem); } } From c0f725b888e07b34f8f39247a940db81af6962f2 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 11:43:27 +0100 Subject: [PATCH 006/165] - fixed SF# 588: Missing POCO_ARCH and POCO_ARCH_LITTLE_ENDIAN define for WinCE on SH4 --- Foundation/include/Poco/Platform.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h index 33060873c..55e515ce7 100644 --- a/Foundation/include/Poco/Platform.h +++ b/Foundation/include/Poco/Platform.h @@ -1,7 +1,7 @@ // // Platform.h // -// $Id: //poco/1.4/Foundation/include/Poco/Platform.h#4 $ +// $Id: //poco/1.4/Foundation/include/Poco/Platform.h#5 $ // // Library: Foundation // Package: Core @@ -123,6 +123,11 @@ #endif +#if !defined(POCO_OS) + #error "Unknown Platform." +#endif + + // // Hardware Architecture and Byte Order // @@ -188,9 +193,9 @@ #elif defined(__s390__) #define POCO_ARCH POCO_ARCH_S390 #define POCO_ARCH_BIG_ENDIAN 1 -#elif defined(__sh__) || defined(__sh) +#elif defined(__sh__) || defined(__sh) || defined(SHx) || defined(_SHX_) #define POCO_ARCH POCO_ARCH_SH - #if defined(__LITTLE_ENDIAN__) + #if defined(__LITTLE_ENDIAN__) || (POCO_OS == POCO_OS_WINDOWS_CE) #define POCO_ARCH_LITTLE_ENDIAN 1 #else #define POCO_ARCH_BIG_ENDIAN 1 @@ -206,4 +211,9 @@ #endif +#if !defined(POCO_ARCH) + #error "Unknown Hardware Architecture." +#endif + + #endif // Foundation_Platform_INCLUDED From 12b0255f58b4c34fbfa15f9dc8c23a8a9dd03c0b Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 11:44:44 +0100 Subject: [PATCH 007/165] - fixed SF# 581: Out-of-bound array access in Unicode::properties() function. --- Foundation/include/Poco/Unicode.h | 7 ++++++- Foundation/src/Unicode.cpp | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Foundation/include/Poco/Unicode.h b/Foundation/include/Poco/Unicode.h index f3f22faae..4490f1d11 100644 --- a/Foundation/include/Poco/Unicode.h +++ b/Foundation/include/Poco/Unicode.h @@ -1,7 +1,7 @@ // // Unicode.h // -// $Id: //poco/1.4/Foundation/include/Poco/Unicode.h#1 $ +// $Id: //poco/1.4/Foundation/include/Poco/Unicode.h#2 $ // // Library: Foundation // Package: Text @@ -188,6 +188,11 @@ public: UCP_VAI }; + enum + { + UCP_MAX_CODEPOINT = 0x10FFFF + }; + struct CharacterProperties /// This structure holds the character properties /// of an Unicode character. diff --git a/Foundation/src/Unicode.cpp b/Foundation/src/Unicode.cpp index 5b9e5ef3c..dd80e27c6 100644 --- a/Foundation/src/Unicode.cpp +++ b/Foundation/src/Unicode.cpp @@ -1,7 +1,7 @@ // // Unicode.cpp // -// $Id: //poco/1.4/Foundation/src/Unicode.cpp#1 $ +// $Id: //poco/1.4/Foundation/src/Unicode.cpp#2 $ // // Library: Foundation // Package: Text @@ -49,6 +49,7 @@ namespace Poco { void Unicode::properties(int ch, CharacterProperties& props) { + if (ch > UCP_MAX_CODEPOINT) ch = 0; const ucd_record* ucd = GET_UCD(ch); props.category = static_cast(_pcre_ucp_gentype[ucd->chartype]); props.type = static_cast(ucd->chartype); From 45fa903880e978598d035b9628b2ebe0b64ac68d Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 11:45:55 +0100 Subject: [PATCH 008/165] - fixed SF# 586: Poco::DateTimeParser and ISO8601 issues when seconds fraction has more than 6 digits --- Foundation/src/DateTimeParser.cpp | 9 ++++++++- Foundation/testsuite/src/DateTimeParserTest.cpp | 13 ++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Foundation/src/DateTimeParser.cpp b/Foundation/src/DateTimeParser.cpp index 64f0dd395..b7a553a1a 100644 --- a/Foundation/src/DateTimeParser.cpp +++ b/Foundation/src/DateTimeParser.cpp @@ -1,7 +1,7 @@ // // DateTimeParser.cpp // -// $Id: //poco/1.4/Foundation/src/DateTimeParser.cpp#3 $ +// $Id: //poco/1.4/Foundation/src/DateTimeParser.cpp#4 $ // // Library: Foundation // Package: DateTime @@ -48,6 +48,10 @@ namespace Poco { while (it != end && !Ascii::isDigit(*it)) ++it +#define SKIP_DIGITS() \ + while (it != end && Ascii::isDigit(*it)) ++it + + #define PARSE_NUMBER(var) \ while (it != end && Ascii::isDigit(*it)) var = var*10 + ((*it++) - '0') @@ -55,6 +59,7 @@ namespace Poco { #define PARSE_NUMBER_N(var, n) \ { int i = 0; while (i++ < n && it != end && Ascii::isDigit(*it)) var = var*10 + ((*it++) - '0'); } + #define PARSE_FRACTIONAL_N(var, n) \ { int i = 0; while (i < n && it != end && Ascii::isDigit(*it)) { var = var*10 + ((*it++) - '0'); i++; } while (i++ < n) var *= 10; } @@ -153,6 +158,7 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& str, DateT ++it; PARSE_FRACTIONAL_N(millis, 3); PARSE_FRACTIONAL_N(micros, 3); + SKIP_DIGITS(); } break; case 'i': @@ -168,6 +174,7 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& str, DateT SKIP_JUNK(); PARSE_FRACTIONAL_N(millis, 3); PARSE_FRACTIONAL_N(micros, 3); + SKIP_DIGITS(); break; case 'z': case 'Z': diff --git a/Foundation/testsuite/src/DateTimeParserTest.cpp b/Foundation/testsuite/src/DateTimeParserTest.cpp index 5d740ea9d..6bb706165 100644 --- a/Foundation/testsuite/src/DateTimeParserTest.cpp +++ b/Foundation/testsuite/src/DateTimeParserTest.cpp @@ -1,7 +1,7 @@ // // DateTimeParserTest.cpp // -// $Id: //poco/1.4/Foundation/testsuite/src/DateTimeParserTest.cpp#3 $ +// $Id: //poco/1.4/Foundation/testsuite/src/DateTimeParserTest.cpp#4 $ // // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. // and Contributors. @@ -198,6 +198,17 @@ void DateTimeParserTest::testISO8601Frac() assert (dt.microsecond() == 450); assert (tzd == -3600); + dt = DateTimeParser::parse(DateTimeFormat::ISO8601_FRAC_FORMAT, "2010-09-23T16:17:01.2817002+02:00", tzd); + assert (dt.year() == 2010); + assert (dt.month() == 9); + assert (dt.day() == 23); + assert (dt.hour() == 16); + assert (dt.minute() == 17); + assert (dt.second() == 1); + assert (dt.millisecond() == 281); + assert (dt.microsecond() == 700); + assert (tzd == 7200); + dt = DateTimeParser::parse(DateTimeFormat::ISO8601_FRAC_FORMAT, "2005-01-08T12:30:00", tzd); assert (dt.year() == 2005); assert (dt.month() == 1); From e36800c76d24aa8ef1a836924aba214893c82eb4 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 11:47:26 +0100 Subject: [PATCH 009/165] - fixed SF# 594: Websocket fails with small masked payloads --- Net/include/Poco/Net/WebSocketImpl.h | 3 +- Net/src/WebSocketImpl.cpp | 157 ++++++++++++++------------- Net/testsuite/src/WebSocketTest.cpp | 52 +++++++-- 3 files changed, 122 insertions(+), 90 deletions(-) diff --git a/Net/include/Poco/Net/WebSocketImpl.h b/Net/include/Poco/Net/WebSocketImpl.h index fed918bdb..439c3008c 100644 --- a/Net/include/Poco/Net/WebSocketImpl.h +++ b/Net/include/Poco/Net/WebSocketImpl.h @@ -1,7 +1,7 @@ // // WebSocketImpl.h // -// $Id: //poco/1.4/Net/include/Poco/Net/WebSocketImpl.h#1 $ +// $Id: //poco/1.4/Net/include/Poco/Net/WebSocketImpl.h#5 $ // // Library: Net // Package: WebSocket @@ -93,6 +93,7 @@ protected: MAX_HEADER_LENGTH = 14 }; + int receiveNBytes(void* buffer, int bytes); virtual ~WebSocketImpl(); private: diff --git a/Net/src/WebSocketImpl.cpp b/Net/src/WebSocketImpl.cpp index 262f3b291..1caf31074 100644 --- a/Net/src/WebSocketImpl.cpp +++ b/Net/src/WebSocketImpl.cpp @@ -1,7 +1,7 @@ // // WebSocketImpl.cpp // -// $Id: //poco/1.4/Net/src/WebSocketImpl.cpp#2 $ +// $Id: //poco/1.4/Net/src/WebSocketImpl.cpp#6 $ // // Library: Net // Package: WebSocket @@ -118,89 +118,92 @@ int WebSocketImpl::sendBytes(const void* buffer, int length, int flags) int WebSocketImpl::receiveBytes(void* buffer, int length, int) { char header[MAX_HEADER_LENGTH]; - int n = _pStreamSocketImpl->receiveBytes(header, 2); - if (n == 1) + int n = receiveNBytes(header, 2); + poco_assert (n == 2); + Poco::UInt8 lengthByte = static_cast(header[1]); + int maskOffset = 0; + if (lengthByte & FRAME_FLAG_MASK) maskOffset += 4; + lengthByte &= 0x7f; + if (lengthByte + 2 + maskOffset < MAX_HEADER_LENGTH) { - n += _pStreamSocketImpl->receiveBytes(header + 1, 1); + n = receiveNBytes(header + 2, lengthByte + maskOffset); } - if (n == 2) + else { - Poco::UInt8 lengthByte = static_cast(header[1]) & 0x7f; - if (lengthByte + 2 < MAX_HEADER_LENGTH) - { - n = _pStreamSocketImpl->receiveBytes(header + 2, lengthByte); - } - else - { - n = _pStreamSocketImpl->receiveBytes(header + 2, MAX_HEADER_LENGTH - 2); - } + n = receiveNBytes(header + 2, MAX_HEADER_LENGTH - 2); } - else throw WebSocketException("Incomplete frame received", WebSocket::WS_ERR_INCOMPLETE_FRAME); - if (n > 0) + poco_assert (n > 0); + n += 2; + Poco::MemoryInputStream istr(header, n); + Poco::BinaryReader reader(istr, Poco::BinaryReader::NETWORK_BYTE_ORDER); + Poco::UInt8 flags; + char mask[4]; + reader >> flags >> lengthByte; + _frameFlags = flags; + int payloadLength = 0; + int payloadOffset = 2; + if ((lengthByte & 0x7f) == 127) { - n += 2; - Poco::MemoryInputStream istr(header, n); - Poco::BinaryReader reader(istr, Poco::BinaryReader::NETWORK_BYTE_ORDER); - Poco::UInt8 flags; - Poco::UInt8 lengthByte; - char mask[4]; - reader >> flags >> lengthByte; - _frameFlags = flags; - int payloadLength = 0; - int payloadOffset = 2; - if ((lengthByte & 0x7f) == 127) - { - Poco::UInt64 l; - reader >> l; - if (l > length) throw WebSocketException(Poco::format("Insufficient buffer for payload size %Lu", l), WebSocket::WS_ERR_PAYLOAD_TOO_BIG); - payloadLength = static_cast(l); - payloadOffset += 8; - } - else if ((lengthByte & 0x7f) == 126) - { - Poco::UInt16 l; - reader >> l; - if (l > length) throw WebSocketException(Poco::format("Insufficient buffer for payload size %hu", l), WebSocket::WS_ERR_PAYLOAD_TOO_BIG); - payloadLength = static_cast(l); - payloadOffset += 2; - } - else - { - Poco::UInt8 l = lengthByte & 0x7f; - if (l > length) throw WebSocketException(Poco::format("Insufficient buffer for payload size %u", unsigned(l)), WebSocket::WS_ERR_PAYLOAD_TOO_BIG); - payloadLength = static_cast(l); - } - if (lengthByte & FRAME_FLAG_MASK) - { - reader.readRaw(mask, 4); - payloadOffset += 4; - } - int received = 0; - if (payloadOffset < n) - { - std::memcpy(buffer, header + payloadOffset, n - payloadOffset); - received = n - payloadOffset; - } - while (received < payloadLength) - { - n = _pStreamSocketImpl->receiveBytes(reinterpret_cast(buffer) + received, payloadLength - received); - if (n > 0) - received += n; - else - throw WebSocketException("Incomplete frame received", WebSocket::WS_ERR_INCOMPLETE_FRAME); - } - if (lengthByte & FRAME_FLAG_MASK) - { - char* p = reinterpret_cast(buffer); - for (int i = 0; i < received; i++) - { - p[i] ^= mask[i % 4]; - } - } - return received; + Poco::UInt64 l; + reader >> l; + if (l > length) throw WebSocketException(Poco::format("Insufficient buffer for payload size %Lu", l), WebSocket::WS_ERR_PAYLOAD_TOO_BIG); + payloadLength = static_cast(l); + payloadOffset += 8; } - return n; + else if ((lengthByte & 0x7f) == 126) + { + Poco::UInt16 l; + reader >> l; + if (l > length) throw WebSocketException(Poco::format("Insufficient buffer for payload size %hu", l), WebSocket::WS_ERR_PAYLOAD_TOO_BIG); + payloadLength = static_cast(l); + payloadOffset += 2; + } + else + { + Poco::UInt8 l = lengthByte & 0x7f; + if (l > length) throw WebSocketException(Poco::format("Insufficient buffer for payload size %u", unsigned(l)), WebSocket::WS_ERR_PAYLOAD_TOO_BIG); + payloadLength = static_cast(l); + } + if (lengthByte & FRAME_FLAG_MASK) + { + reader.readRaw(mask, 4); + payloadOffset += 4; + } + int received = 0; + if (payloadOffset < n) + { + std::memcpy(buffer, header + payloadOffset, n - payloadOffset); + received = n - payloadOffset; + } + if (received < payloadLength) + { + received += receiveNBytes(reinterpret_cast(buffer) + received, payloadLength - received); + } + if (lengthByte & FRAME_FLAG_MASK) + { + char* p = reinterpret_cast(buffer); + for (int i = 0; i < received; i++) + { + p[i] ^= mask[i % 4]; + } + } + return received; +} + + +int WebSocketImpl::receiveNBytes(void* buffer, int bytes) +{ + int received = _pStreamSocketImpl->receiveBytes(reinterpret_cast(buffer), bytes); + while (received < bytes) + { + int n = _pStreamSocketImpl->receiveBytes(reinterpret_cast(buffer) + received, bytes - received); + if (n > 0) + received += n; + else + throw WebSocketException("Incomplete frame received", WebSocket::WS_ERR_INCOMPLETE_FRAME); + } + return received; } diff --git a/Net/testsuite/src/WebSocketTest.cpp b/Net/testsuite/src/WebSocketTest.cpp index 289faa997..568dbfa5b 100644 --- a/Net/testsuite/src/WebSocketTest.cpp +++ b/Net/testsuite/src/WebSocketTest.cpp @@ -1,7 +1,7 @@ // // WebSocketTest.cpp // -// $Id: //poco/1.4/Net/testsuite/src/WebSocketTest.cpp#2 $ +// $Id: //poco/1.4/Net/testsuite/src/WebSocketTest.cpp#3 $ // // Copyright (c) 2012, Applied Informatics Software Engineering GmbH. // and Contributors. @@ -106,6 +106,16 @@ namespace WebSocketTest::WebSocketTest(const std::string& name): CppUnit::TestCase(name) +{ +} + + +WebSocketTest::~WebSocketTest() +{ +} + + +void WebSocketTest::testWebSocket() { Poco::Net::ServerSocket ss(0); Poco::Net::HTTPServer server(new WebSocketRequestHandlerFactory, ss, new Poco::Net::HTTPServerParams); @@ -117,7 +127,8 @@ WebSocketTest::WebSocketTest(const std::string& name): CppUnit::TestCase(name) HTTPRequest request(HTTPRequest::HTTP_GET, "/ws"); HTTPResponse response; WebSocket ws(cs, request, response); - std::string payload("Hello, world!"); + + std::string payload("x"); ws.sendFrame(payload.data(), payload.size()); char buffer[1024]; int flags; @@ -125,6 +136,33 @@ WebSocketTest::WebSocketTest(const std::string& name): CppUnit::TestCase(name) assert (n == payload.size()); assert (payload.compare(0, payload.size(), buffer, 0, n) == 0); assert (flags == WebSocket::FRAME_TEXT); + + for (int i = 2; i < 20; i++) + { + payload.assign(i, 'x'); + ws.sendFrame(payload.data(), payload.size()); + n = ws.receiveFrame(buffer, sizeof(buffer), flags); + assert (n == payload.size()); + assert (payload.compare(0, payload.size(), buffer, 0, n) == 0); + assert (flags == WebSocket::FRAME_TEXT); + } + + for (int i = 125; i < 129; i++) + { + payload.assign(i, 'x'); + ws.sendFrame(payload.data(), payload.size()); + n = ws.receiveFrame(buffer, sizeof(buffer), flags); + assert (n == payload.size()); + assert (payload.compare(0, payload.size(), buffer, 0, n) == 0); + assert (flags == WebSocket::FRAME_TEXT); + } + + payload = "Hello, world!"; + ws.sendFrame(payload.data(), payload.size()); + n = ws.receiveFrame(buffer, sizeof(buffer), flags); + assert (n == payload.size()); + assert (payload.compare(0, payload.size(), buffer, 0, n) == 0); + assert (flags == WebSocket::FRAME_TEXT); payload = "Hello, universe!"; ws.sendFrame(payload.data(), payload.size(), WebSocket::FRAME_BINARY); @@ -142,16 +180,6 @@ WebSocketTest::WebSocketTest(const std::string& name): CppUnit::TestCase(name) } -WebSocketTest::~WebSocketTest() -{ -} - - -void WebSocketTest::testWebSocket() -{ -} - - void WebSocketTest::setUp() { } From a628c56a01c91871bc6952dbcbe4209b1c61ba49 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 11:48:35 +0100 Subject: [PATCH 010/165] - Poco::Net::HTTPSSessionInstantiator::registerInstantiator() now optionally accepts a Poco::Net::Context object. --- .../include/Poco/Net/HTTPSSessionInstantiator.h | 12 +++++++++++- NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp | 16 ++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h b/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h index 67069adb4..858eb4268 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h +++ b/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h @@ -1,7 +1,7 @@ // // HTTPSSessionInstantiator.h // -// $Id: //poco/1.4/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h#1 $ +// $Id: //poco/1.4/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h#2 $ // // Library: NetSSL_OpenSSL // Package: HTTPSClient @@ -41,6 +41,7 @@ #include "Poco/Net/NetSSL.h" +#include "Poco/Net/Context.h" #include "Poco/Net/Utility.h" #include "Poco/Net/HTTPSessionInstantiator.h" #include "Poco/URI.h" @@ -57,6 +58,9 @@ public: HTTPSSessionInstantiator(); /// Creates the HTTPSSessionInstantiator. + HTTPSSessionInstantiator(Context::Ptr pContext); + /// Creates the HTTPSSessionInstantiator using the given SSL context. + ~HTTPSSessionInstantiator(); /// Destroys the HTTPSSessionInstantiator. @@ -66,8 +70,14 @@ public: static void registerInstantiator(); /// Registers the instantiator with the global HTTPSessionFactory. + static void registerInstantiator(Context::Ptr pContext); + /// Registers the instantiator with the global HTTPSessionFactory using the given SSL context. + static void unregisterInstantiator(); /// Unregisters the factory with the global HTTPSessionFactory. + +private: + Context::Ptr _pContext; }; diff --git a/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp b/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp index d19370703..7eef65202 100644 --- a/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp +++ b/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp @@ -1,7 +1,7 @@ // // HTTPSSessionInstantiator.cpp // -// $Id: //poco/1.4/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp#1 $ +// $Id: //poco/1.4/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp#2 $ // // Library: NetSSL_OpenSSL // Package: HTTPSClient @@ -48,6 +48,12 @@ HTTPSSessionInstantiator::HTTPSSessionInstantiator() } +HTTPSSessionInstantiator::HTTPSSessionInstantiator(Context::Ptr pContext) : + _pContext(pContext) +{ +} + + HTTPSSessionInstantiator::~HTTPSSessionInstantiator() { } @@ -56,7 +62,7 @@ HTTPSSessionInstantiator::~HTTPSSessionInstantiator() HTTPClientSession* HTTPSSessionInstantiator::createClientSession(const Poco::URI& uri) { poco_assert (uri.getScheme() == "https"); - HTTPSClientSession* pSession = new HTTPSClientSession(uri.getHost(), uri.getPort()); + HTTPSClientSession* pSession = _pContext.isNull() ? new HTTPSClientSession(uri.getHost(), uri.getPort()) : new HTTPSClientSession(uri.getHost(), uri.getPort(), _pContext); pSession->setProxy(proxyHost(), proxyPort()); pSession->setProxyCredentials(proxyUsername(), proxyPassword()); return pSession; @@ -69,6 +75,12 @@ void HTTPSSessionInstantiator::registerInstantiator() } +void HTTPSSessionInstantiator::registerInstantiator(Context::Ptr context) +{ + HTTPSessionFactory::defaultFactory().registerProtocol("https", new HTTPSSessionInstantiator(context)); +} + + void HTTPSSessionInstantiator::unregisterInstantiator() { HTTPSessionFactory::defaultFactory().unregisterProtocol("https"); From 80c45c859d2c73c548f890b3a4f01df6d70897d8 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 11:49:39 +0100 Subject: [PATCH 011/165] - added Poco::XML::XMLWriter::depth() member function. - added Poco::XML::XMLWriter::uniquePrefix() and Poco::XML::XMLWriter::isNamespaceMapped(). - Poco::FileChannel now supports a new rotateOnOpen property (true/false) which can be used to force rotation of the log file when it's opened. - fixed a bug in Poco::XML::XMLWriter::emptyElement(): need to pop namespace context --- XML/include/Poco/XML/XMLWriter.h | 30 ++++++++++++++++++++++++++++-- XML/src/XMLWriter.cpp | 15 +++++++++++---- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/XML/include/Poco/XML/XMLWriter.h b/XML/include/Poco/XML/XMLWriter.h index acd2d7310..7873a85df 100644 --- a/XML/include/Poco/XML/XMLWriter.h +++ b/XML/include/Poco/XML/XMLWriter.h @@ -1,7 +1,7 @@ // // XMLWriter.h // -// $Id: //poco/1.4/XML/include/Poco/XML/XMLWriter.h#1 $ +// $Id: //poco/1.4/XML/include/Poco/XML/XMLWriter.h#3 $ // // Library: XML // Package: XML @@ -279,6 +279,24 @@ public: static const std::string NEWLINE_CRLF; static const std::string NEWLINE_LF; + // Namespace support. + XMLString uniquePrefix(); + /// Creates and returns a unique namespace prefix that + /// can be used with startPrefixMapping(). + + bool isNamespaceMapped(const std::string& namespc) const; + /// Returns true if the given namespace has been mapped + /// to a prefix in the current element or its ancestors. + + // Misc. + int depth() const; + /// Return the number of nested XML elements. + /// + /// Will be -1 if no document or fragment has been started, + /// 0 if the document or fragment has been started, + /// 1 if the document element has been written and + /// > 1 for every element nested within the document element. + protected: typedef std::map AttributeMap; @@ -298,7 +316,6 @@ protected: void addAttributes(AttributeMap& attributeMap, const Attributes& attributes, const XMLString& elementNamespaceURI); void writeAttributes(const AttributeMap& attributeMap); void prettyPrint() const; - XMLString newPrefix(); static std::string nameToString(const XMLString& localName, const XMLString& qname); private: @@ -357,6 +374,15 @@ private: }; +// +// inlines +// +inline int XMLWriter::depth() const +{ + return _depth; +} + + } } // namespace Poco::XML diff --git a/XML/src/XMLWriter.cpp b/XML/src/XMLWriter.cpp index ecf5c3dab..8eefe606d 100644 --- a/XML/src/XMLWriter.cpp +++ b/XML/src/XMLWriter.cpp @@ -1,7 +1,7 @@ // // XMLWriter.cpp // -// $Id: //poco/1.4/XML/src/XMLWriter.cpp#3 $ +// $Id: //poco/1.4/XML/src/XMLWriter.cpp#5 $ // // Library: XML // Package: XML @@ -321,6 +321,7 @@ void XMLWriter::emptyElement(const XMLString& namespaceURI, const XMLString& loc _contentWritten = false; writeMarkup("/"); closeStartTag(); + _namespaces.popContext(); } @@ -617,7 +618,7 @@ void XMLWriter::writeStartElement(const XMLString& namespaceURI, const XMLString XMLString prefix; if (!namespaceURI.empty() && !_namespaces.isMapped(namespaceURI)) { - prefix = newPrefix(); + prefix = uniquePrefix(); _namespaces.declarePrefix(prefix, namespaceURI); } else prefix = _namespaces.getPrefix(namespaceURI); @@ -702,7 +703,7 @@ void XMLWriter::declareAttributeNamespaces(const Attributes& attributes) if (prefix.empty()) prefix = _namespaces.getPrefix(namespaceURI); if (prefix.empty() && !namespaceURI.empty() && !_namespaces.isMapped(namespaceURI)) { - prefix = newPrefix(); + prefix = uniquePrefix(); _namespaces.declarePrefix(prefix, namespaceURI); } @@ -882,7 +883,7 @@ std::string XMLWriter::nameToString(const XMLString& localName, const XMLString& } -XMLString XMLWriter::newPrefix() +XMLString XMLWriter::uniquePrefix() { std::ostringstream str; str << "ns" << ++_prefix; @@ -890,4 +891,10 @@ XMLString XMLWriter::newPrefix() } +bool XMLWriter::isNamespaceMapped(const std::string& namespc) const +{ + return _namespaces.isMapped(namespc); +} + + } } // namespace Poco::XML From 4f66c0e1d8d42f9fe50306f79221bd63f6d95e25 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 11:51:20 +0100 Subject: [PATCH 012/165] - added Poco::Optional class template --- Foundation/include/Poco/Optional.h | 183 +++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) create mode 100644 Foundation/include/Poco/Optional.h diff --git a/Foundation/include/Poco/Optional.h b/Foundation/include/Poco/Optional.h new file mode 100644 index 000000000..d13af20a1 --- /dev/null +++ b/Foundation/include/Poco/Optional.h @@ -0,0 +1,183 @@ +// +// Optional.h +// +// $Id: //poco/1.4/Foundation/include/Poco/Optional.h#1 $ +// +// Library: Foundation +// Package: Core +// Module: Optional +// +// Definition of the Optional class template. +// +// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Foundation_Optional_INCLUDED +#define Foundation_Optional_INCLUDED + + +#include "Poco/Foundation.h" +#include "Poco/Exception.h" +#include + + +namespace Poco { + + +template +class Optional + /// Optional is a simple wrapper class for value types + /// that allows to introduce a specified/unspecified state + /// to value objects. + /// + /// An Optional can be default constructed. In this case, + /// the Optional will have a Null value and isSpecified() will + /// return false. Calling value()(without default value) on + /// a Null object will throw a NullValueException. + /// + /// An Optional can also be constructed from a value. + /// It is possible to assign a value to an Optional, and + /// to reset an Optional to contain a Null value by calling + /// clear(). + /// + /// For use with Optional, the value type should support + /// default construction. + /// + /// Note that the Optional class is basically the same as + /// Nullable. However, serializers may treat Nullable + /// and Optional differently. An example is XML serialization based + /// on XML Schema, where Optional would be used for an element with + /// minOccurs == 0, whereas Nullable would be used on an element with + /// nillable == true. +{ +public: + Optional(): + /// Creates an empty Optional. + _value(), + _isSpecified(false) + { + } + + Optional(const C& value): + /// Creates a Optional with the given value. + _value(value), + _isSpecified(true) + { + } + + Optional(const Optional& other): + /// Creates a Optional by copying another one. + _value(other._value), + _isSpecified(other._isSpecified) + { + } + + ~Optional() + /// Destroys the Optional. + { + } + + Optional& assign(const C& value) + /// Assigns a value to the Optional. + { + _value = value; + _isSpecified = true; + return *this; + } + + Optional& assign(const Optional& other) + /// Assigns another Optional. + { + Optional tmp(other); + swap(tmp); + return *this; + } + + Optional& operator = (const C& value) + { + return assign(value); + } + + Optional& operator = (const Optional& other) + { + return assign(other); + } + + void swap(Optional& other) + { + std::swap(_value, other._value); + std::swap(_isSpecified, other._isSpecified); + } + + const C& value() const + /// Returns the Optional's value. + /// + /// Throws a Poco::NullValueException if the value has not been specified. + { + if (_isSpecified) + return _value; + else + throw Poco::NullValueException(); + } + + const C& value(const C& deflt) const + /// Returns the Optional's value, or the + /// given default value if the Optional's + /// value has not been specified. + { + return _isSpecified ? _value : deflt; + } + + bool isSpecified() const + /// Returns true iff the Optional's value has been specified. + { + return _isSpecified; + } + + void clear() + /// Clears the Optional. + { + _isSpecified = false; + } + +private: + C _value; + bool _isSpecified; +}; + + +template +inline void swap(Optional& n1, Optional& n2) +{ + n1.swap(n2); +} + + +} // namespace Poco + + +#endif // Foundation_Optional_INCLUDED From b402881343a2bc0ef62c6233ceb4ecb215023e7e Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 11:55:54 +0100 Subject: [PATCH 013/165] - Poco::FileChannel now supports a new rotateOnOpen property (true/false) which can be used to force rotation of the log file when it's opened. --- Foundation/include/Poco/FileChannel.h | 70 ++++++++------- Foundation/src/FileChannel.cpp | 118 +++++++++++++------------- 2 files changed, 98 insertions(+), 90 deletions(-) diff --git a/Foundation/include/Poco/FileChannel.h b/Foundation/include/Poco/FileChannel.h index 45c09cf88..37a2e6de4 100644 --- a/Foundation/include/Poco/FileChannel.h +++ b/Foundation/include/Poco/FileChannel.h @@ -1,7 +1,7 @@ // // FileChannel.h // -// $Id: //poco/1.4/Foundation/include/Poco/FileChannel.h#2 $ +// $Id: //poco/1.4/Foundation/include/Poco/FileChannel.h#5 $ // // Library: Foundation // Package: Logging @@ -140,7 +140,7 @@ class Foundation_API FileChannel: public Channel /// * local: Rotation strategy is based on local time. /// /// Archived log files can be compressed using the gzip compression - /// method. Compressing can be controlled with the "compression" + /// method. Compressing can be controlled with the "compress" /// property. The following values for the "compress" property /// are supported: /// @@ -154,7 +154,6 @@ class Foundation_API FileChannel: public Channel /// /// The purgeAge property can have the following values: /// - /// * "none" or "" no purging /// * [seconds]: the maximum age is seconds. /// * minutes: the maximum age is minutes. /// * hours: the maximum age is hours. @@ -162,19 +161,27 @@ class Foundation_API FileChannel: public Channel /// * weeks: the maximum age is weeks. /// * months: the maximum age is months, where a month has 30 days. /// - /// The purgeCount property has an integer value that specifies the maximum number - /// of archived log files. If the number is exceeded, archived log files are - /// deleted, starting with the oldest. When "none" or empty string are - /// supplied, they reset purgeCount to none (no purging). + /// The purgeCount property has an integer value that + /// specifies the maximum number of archived log files. + /// If the number is exceeded, archived log files are + /// deleted, starting with the oldest. /// /// The flush property specifies whether each log message is flushed /// immediately to the log file (which may hurt application performance, /// but ensures that everything is in the log in case of a system crash), - // or whether it's allowed to stay in the system's file buffer for some time. + // or whether it's allowed to stay in the system's file buffer for some time. /// Valid values are: /// - /// * true: Every essages is immediately flushed to the log file (default). - /// * false: Messages are not immediately flushed to the log file. + /// * true: Every essages is immediately flushed to the log file (default). + /// * false: Messages are not immediately flushed to the log file. + /// + /// The rotateOnOpen property specifies whether an existing log file should be + /// rotated (and archived) when the channel is opened. Valid values are: + /// + /// * true: The log file is rotated (and archived) when the channel is opened. + /// * false: Log messages will be appended to an existing log file, + /// if it exists (unless other conditions for a rotation are met). + /// This is the default. /// /// For a more lightweight file channel class, see SimpleFileChannel. { @@ -198,25 +205,27 @@ public: /// Sets the property with the given name. /// /// The following properties are supported: - /// * path: The log file's path. - /// * rotation: The log file's rotation mode. See the - /// FileChannel class for details. - /// * archive: The log file's archive mode. See the - /// FileChannel class for details. - /// * times: The log file's time mode. See the - /// FileChannel class for details. - /// * compress: Enable or disable compression of - /// archived files. See the FileChannel class - /// for details. - /// * purgeAge: Maximum age of an archived log file before - /// it is purged. See the FileChannel class for - /// details. - /// * purgeCount: Maximum number of archived log files before - /// files are purged. See the FileChannel class - /// for details. - /// * flush: Specifies whether messages are immediately - /// flushed to the log file. See the FileChannel class - /// for details. + /// * path: The log file's path. + /// * rotation: The log file's rotation mode. See the + /// FileChannel class for details. + /// * archive: The log file's archive mode. See the + /// FileChannel class for details. + /// * times: The log file's time mode. See the + /// FileChannel class for details. + /// * compress: Enable or disable compression of + /// archived files. See the FileChannel class + /// for details. + /// * purgeAge: Maximum age of an archived log file before + /// it is purged. See the FileChannel class for + /// details. + /// * purgeCount: Maximum number of archived log files before + /// files are purged. See the FileChannel class + /// for details. + /// * flush: Specifies whether messages are immediately + /// flushed to the log file. See the FileChannel class + /// for details. + /// * rotateOnOpen: Specifies whether an existing log file should be + /// rotated and archived when the channel is opened. std::string getProperty(const std::string& name) const; /// Returns the value of the property with the given name. @@ -240,6 +249,7 @@ public: static const std::string PROP_PURGEAGE; static const std::string PROP_PURGECOUNT; static const std::string PROP_FLUSH; + static const std::string PROP_ROTATEONOPEN; protected: ~FileChannel(); @@ -249,6 +259,7 @@ protected: void setPurgeAge(const std::string& age); void setPurgeCount(const std::string& count); void setFlush(const std::string& flush); + void setRotateOnOpen(const std::string& rotateOnOpen); void purge(); private: @@ -260,6 +271,7 @@ private: std::string _purgeAge; std::string _purgeCount; bool _flush; + bool _rotateOnOpen; LogFile* _pFile; RotateStrategy* _pRotateStrategy; ArchiveStrategy* _pArchiveStrategy; diff --git a/Foundation/src/FileChannel.cpp b/Foundation/src/FileChannel.cpp index de921551b..b5a37c347 100644 --- a/Foundation/src/FileChannel.cpp +++ b/Foundation/src/FileChannel.cpp @@ -1,7 +1,7 @@ // // FileChannel.cpp // -// $Id: //poco/1.4/Foundation/src/FileChannel.cpp#1 $ +// $Id: //poco/1.4/Foundation/src/FileChannel.cpp#3 $ // // Library: Foundation // Package: Logging @@ -39,6 +39,7 @@ #include "Poco/RotateStrategy.h" #include "Poco/PurgeStrategy.h" #include "Poco/Message.h" +#include "Poco/NumberParser.h" #include "Poco/DateTimeFormatter.h" #include "Poco/DateTime.h" #include "Poco/LocalDateTime.h" @@ -47,23 +48,25 @@ #include "Poco/Exception.h" #include "Poco/Ascii.h" + namespace Poco { -const std::string FileChannel::PROP_PATH = "path"; -const std::string FileChannel::PROP_ROTATION = "rotation"; -const std::string FileChannel::PROP_ARCHIVE = "archive"; -const std::string FileChannel::PROP_TIMES = "times"; -const std::string FileChannel::PROP_COMPRESS = "compress"; -const std::string FileChannel::PROP_PURGEAGE = "purgeAge"; -const std::string FileChannel::PROP_PURGECOUNT = "purgeCount"; -const std::string FileChannel::PROP_FLUSH = "flush "; - +const std::string FileChannel::PROP_PATH = "path"; +const std::string FileChannel::PROP_ROTATION = "rotation"; +const std::string FileChannel::PROP_ARCHIVE = "archive"; +const std::string FileChannel::PROP_TIMES = "times"; +const std::string FileChannel::PROP_COMPRESS = "compress"; +const std::string FileChannel::PROP_PURGEAGE = "purgeAge"; +const std::string FileChannel::PROP_PURGECOUNT = "purgeCount"; +const std::string FileChannel::PROP_FLUSH = "flush "; +const std::string FileChannel::PROP_ROTATEONOPEN = "rotateOnOpen"; FileChannel::FileChannel(): _times("utc"), _compress(false), _flush(true), + _rotateOnOpen(false), _pFile(0), _pRotateStrategy(0), _pArchiveStrategy(new ArchiveByNumberStrategy), @@ -77,6 +80,7 @@ FileChannel::FileChannel(const std::string& path): _times("utc"), _compress(false), _flush(true), + _rotateOnOpen(false), _pFile(0), _pRotateStrategy(0), _pArchiveStrategy(new ArchiveByNumberStrategy), @@ -101,6 +105,18 @@ void FileChannel::open() if (!_pFile) { _pFile = new LogFile(_path); + if (_rotateOnOpen && _pFile->size() > 0) + { + try + { + _pFile = _pArchiveStrategy->archive(_pFile); + purge(); + } + catch (...) + { + _pFile = new LogFile(_path); + } + } } } @@ -168,6 +184,8 @@ void FileChannel::setProperty(const std::string& name, const std::string& value) setPurgeCount(value); else if (name == PROP_FLUSH) setFlush(value); + else if (name == PROP_ROTATEONOPEN) + setRotateOnOpen(value); else Channel::setProperty(name, value); } @@ -191,6 +209,8 @@ std::string FileChannel::getProperty(const std::string& name) const return _purgeCount; else if (name == PROP_FLUSH) return std::string(_flush ? "true" : "false"); + else if (name == PROP_ROTATEONOPEN) + return std::string(_rotateOnOpen ? "true" : "false"); else return Channel::getProperty(name); } @@ -230,6 +250,7 @@ void FileChannel::setRotation(const std::string& rotation) while (it != end && Ascii::isSpace(*it)) ++it; std::string unit; while (it != end && Ascii::isAlpha(*it)) unit += *it++; + RotateStrategy* pStrategy = 0; if ((rotation.find(',') != std::string::npos) || (rotation.find(':') != std::string::npos)) { @@ -306,28 +327,14 @@ void FileChannel::setCompress(const std::string& compress) void FileChannel::setPurgeAge(const std::string& age) { - delete _pPurgeStrategy; - _pPurgeStrategy = 0; - _purgeAge = "none"; - if (age.empty() || 0 == icompare(age, "none")) - return; - - std::string::const_iterator it = age.begin(); + std::string::const_iterator it = age.begin(); std::string::const_iterator end = age.end(); - int n = 0; - while (it != end && Ascii::isSpace(*it)) - ++it; - while (it != end && Ascii::isDigit(*it)) - { - n *= 10; - n += *it++ - '0'; - } - while (it != end && Ascii::isSpace(*it)) - ++it; + while (it != end && Ascii::isSpace(*it)) ++it; + while (it != end && Ascii::isDigit(*it)) { n *= 10; n += *it++ - '0'; } + while (it != end && Ascii::isSpace(*it)) ++it; std::string unit; - while (it != end && Ascii::isAlpha(*it)) - unit += *it++; + while (it != end && Ascii::isAlpha(*it)) unit += *it++; Timespan::TimeDiff factor = Timespan::SECONDS; if (unit == "minutes") @@ -339,51 +346,40 @@ void FileChannel::setPurgeAge(const std::string& age) else if (unit == "weeks") factor = 7*Timespan::DAYS; else if (unit == "months") - factor = 30 * Timespan::DAYS; + factor = 30*Timespan::DAYS; else if (unit != "seconds") throw InvalidArgumentException("purgeAge", age); - - if (0 == n) - throw InvalidArgumentException("Zero is not valid purge age."); - - _pPurgeStrategy = new PurgeByAgeStrategy(Timespan(factor * n)); + + delete _pPurgeStrategy; + _pPurgeStrategy = new PurgeByAgeStrategy(Timespan(factor*n)); _purgeAge = age; } +void FileChannel::setPurgeCount(const std::string& count) +{ + std::string::const_iterator it = count.begin(); + std::string::const_iterator end = count.end(); + int n = 0; + while (it != end && Ascii::isSpace(*it)) ++it; + while (it != end && Ascii::isDigit(*it)) { n *= 10; n += *it++ - '0'; } + while (it != end && Ascii::isSpace(*it)) ++it; + + delete _pPurgeStrategy; + _pPurgeStrategy = new PurgeByCountStrategy(n); + _purgeCount = count; +} + + void FileChannel::setFlush(const std::string& flush) { _flush = icompare(flush, "true") == 0; } -void FileChannel::setPurgeCount(const std::string& count) +void FileChannel::setRotateOnOpen(const std::string& rotateOnOpen) { - delete _pPurgeStrategy; - _pPurgeStrategy = 0; - _purgeAge = "none"; - if (count.empty() || 0 == icompare(count, "none")) - return; - - int n = 0; - std::string::const_iterator it = count.begin(); - std::string::const_iterator end = count.end(); - - while (it != end && Ascii::isSpace(*it)) - ++it; - while (it != end && Ascii::isDigit(*it)) - { - n *= 10; - n += *it++ - '0'; - } - while (it != end && Ascii::isSpace(*it)) - ++it; - - if (0 == n) - throw InvalidArgumentException("Zero is not valid purge count."); - - _pPurgeStrategy = new PurgeByCountStrategy(n); - _purgeCount = count; + _rotateOnOpen = icompare(rotateOnOpen, "true") == 0; } From 3d0eec828b5d7a8a57b64d68c8af58a612c80f06 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 12:01:18 +0100 Subject: [PATCH 014/165] - fixed a CppParser issue when parsing templates with default template args (such as Poco::SharedPtr) --- CppParser/src/Symbol.cpp | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/CppParser/src/Symbol.cpp b/CppParser/src/Symbol.cpp index 778bb1071..cbcc74f9d 100644 --- a/CppParser/src/Symbol.cpp +++ b/CppParser/src/Symbol.cpp @@ -1,7 +1,7 @@ // // Symbol.cpp // -// $Id: //poco/1.4/CppParser/src/Symbol.cpp#1 $ +// $Id: //poco/1.4/CppParser/src/Symbol.cpp#2 $ // // Library: CppParser // Package: SymbolTable @@ -160,8 +160,27 @@ std::string Symbol::extractName(const std::string& decl) if (pos == std::string::npos || (pos > 0 && decl[pos - 1] == '(')) pos = decl.size(); --pos; - // check for constant - std::string::size_type eqPos = decl.find('='); + // check for constant; start searching after template + std::string::size_type eqStart = 0; + if (decl.compare(0, 8, "template") == 0) + { + eqStart = 8; + while (std::isspace(decl[eqStart]) && eqStart < decl.size()) ++eqStart; + if (eqStart < decl.size() && decl[eqStart] == '<') + { + ++eqStart; + int tc = 1; + while (tc > 0 && eqStart < decl.size()) + { + if (decl[eqStart] == '<') + ++tc; + else if (decl[eqStart] == '>') + --tc; + ++eqStart; + } + } + } + std::string::size_type eqPos = decl.find('=', eqStart); if (eqPos != std::string::npos) { // special case: default template parameter From 76cb79981931990479e44cdb5e6e748d85f68a2b Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 12:46:34 +0100 Subject: [PATCH 015/165] added msbuild support for vs2010 and 2012 to buildwin.cmd --- build_vs110.cmd | 2 + buildwin.cmd | 124 +++++++++++++++++++++++++++++------------------- 2 files changed, 76 insertions(+), 50 deletions(-) create mode 100644 build_vs110.cmd diff --git a/build_vs110.cmd b/build_vs110.cmd new file mode 100644 index 000000000..08fb22b25 --- /dev/null +++ b/build_vs110.cmd @@ -0,0 +1,2 @@ +@echo off +buildwin devenv 110 build shared both Win32 samples tests diff --git a/buildwin.cmd b/buildwin.cmd index acec62ba5..2b477e7c5 100644 --- a/buildwin.cmd +++ b/buildwin.cmd @@ -9,7 +9,7 @@ rem for MS Visual Studio 2003 to 2010 rem rem $Id: //poco/1.4/dist/buildwin.cmd#2 $ rem -rem Copyright (c) 2006-2010 by Applied Informatics Software Engineering GmbH +rem Copyright (c) 2006-2012 by Applied Informatics Software Engineering GmbH rem and Contributors. rem rem Original version by Aleksandar Fabijanic. @@ -17,16 +17,17 @@ rem Modified by Guenter Obiltschnig. rem rem Usage: rem ------ -rem buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIG] [PLATFORM] [SAMPLES] [TESTS] -rem VS_VERSION: 71 | 80 | 90 | 100 | 110 -rem ACTION: build | rebuild | clean -rem LINKMODE: static_mt | static_md | shared | all -rem CONFIG: release | debug | both -rem PLATFORM: Win32 | x64 | WinCE -rem SAMPLES: samples | nosamples -rem TESTS: tests | notests +rem buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL] +rem VS_VERSION: 71|80|90|100|110 +rem ACTION: build|rebuild|clean +rem LINKMODE: static_mt|static_md|shared|all +rem CONFIGURATION: release|debug|both +rem PLATFORM: Win32|x64|WinCE +rem SAMPLES: samples|nosamples +rem TESTS: tests|notests +rem TOOL: devenv|vcexpress|msbuild rem -rem VS_VERSION is required arguments. Default is build all. +rem VS_VERSION is required argument. Default is build all. rem Change OPENSSL_DIR to match your setup set OPENSSL_DIR=C:\OpenSSL @@ -44,10 +45,8 @@ set LIB=%LIB%;%MYSQL_LIB% set POCO_BASE=%CD% set PATH=%POCO_BASE%\bin;%PATH% -rem TODO: VCExpress, MSBuild -set BUILD_TOOL=devenv -rem VS version {71 | 80 | 90 | 100 | 110} +rem VS_VERSION {71 | 80 | 90 | 100 | 110} if "%1"=="" goto usage set VS_VERSION=vs%1 @@ -71,7 +70,31 @@ set VCPROJ_EXT=vcproj if %VS_VERSION%==vs100 (set VCPROJ_EXT=vcxproj) if %VS_VERSION%==vs110 (set VCPROJ_EXT=vcxproj) -rem Action [build|rebuild|clean] +if "%8"=="" goto use_devenv +set BUILD_TOOL="%8" +goto use_custom +:use_devenv +set BUILD_TOOL=devenv +if "%VS_VERSION%"=="vs100" (set BUILD_TOOL=msbuild) +if "%VS_VERSION%"=="vs110" (set BUILD_TOOL=msbuild) +:use_custom +if not "%BUILD_TOOL%"=="msbuild" (set USEENV=/useenv) +if "%BUILD_TOOL%"=="msbuild" ( +set ACTIONSW=/t: +set CONFIGSW=/p:Configuration= +set EXTRASW=/m +set USEENV=/p:UseEnv=true +) +if not "%BUILD_TOOL%"=="msbuild" (set ACTIONSW=/) +if "%VS_VERSION%"=="vs100" (goto msbuildok) +if "%VS_VERSION%"=="vs110" (goto msbuildok) +if "%BUILD_TOOL%"=="msbuild" ( +echo "Cannot use msbuild with Visual Studio 2008 or earlier." +exit +) +:msbuildok + +rem ACTION [build|rebuild|clean] set ACTION=%2 if not "%ACTION%"=="build" ( if not "%ACTION%"=="rebuild" ( @@ -80,7 +103,7 @@ if not "%ACTION%"=="clean" goto usage))) if "%ACTION%"=="" (set ACTION="build") -rem Link mode [static|shared|both] +rem LINKMODE [static|shared|both] set LINK_MODE=%3 if not "%LINK_MODE%"=="static_mt" ( if not "%LINK_MODE%"=="static_md" ( @@ -88,14 +111,14 @@ if not "%LINK_MODE%"=="shared" ( if not "%LINK_MODE%"=="" ( if not "%LINK_MODE%"=="all" goto usage)))) -rem Configuration [release|debug|both] +rem CONFIGURATION [release|debug|both] set CONFIGURATION=%4 if not "%CONFIGURATION%"=="release" ( if not "%CONFIGURATION%"=="debug" ( if not "%CONFIGURATION%"=="" ( if not "%CONFIGURATION%"=="both" goto usage))) -rem Platform [Win32|x64|WinCE] +rem PLATFORM [Win32|x64|WinCE] set PLATFORM=%5 if not "%PLATFORM%"=="" ( @@ -108,14 +131,15 @@ if "%PLATFORM%"=="Win32" (set PLATFORM_SUFFIX=) else ( if "%PLATFORM%"=="x64" (set PLATFORM_SUFFIX=_x64) else ( if "%PLATFORM%"=="WinCE" (set PLATFORM_SUFFIX=_CE)))) -rem Samples [samples|nosamples] +rem SAMPLES [samples|nosamples] set SAMPLES=%6 if "%SAMPLES%"=="" (set SAMPLES=samples) -rem Tests [tests|notests] +rem TESTS [tests|notests] set TESTS=%7 if "%TESTS%"=="" (set TESTS=notests) + set DEBUG_SHARED=0 set RELEASE_SHARED=0 set DEBUG_STATIC_MT=0 @@ -254,41 +278,41 @@ rem //////////////////// echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo. - if %DEBUG_SHARED%==1 (!BUILD_TOOL! /useenv /%ACTION% debug_shared !PROJECT_NAME! && echo. && echo. && echo. + if %DEBUG_SHARED%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% /%ACTION% debug_shared !PROJECT_NAME! && echo. && echo. && echo. if %TESTS%==tests ( - if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! /useenv /%ACTION% debug_shared !TEST_PROJECT_NAME! && echo. && echo. && echo.) + if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared !TEST_PROJECT_NAME! && echo. && echo. && echo.) ) ) - if %RELEASE_SHARED%==1 (!BUILD_TOOL! /useenv /%ACTION% release_shared !PROJECT_NAME! && echo. && echo. && echo. + if %RELEASE_SHARED%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared !PROJECT_NAME! && echo. && echo. && echo. if %TESTS%==tests ( - if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! /useenv /%ACTION% release_shared !TEST_PROJECT_NAME! && echo. && echo. && echo.) + if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared !TEST_PROJECT_NAME! && echo. && echo. && echo.) ) ) - if %DEBUG_STATIC_MT%==1 (!BUILD_TOOL! /useenv /%ACTION% debug_static_mt !PROJECT_NAME! && echo. && echo. && echo. + if %DEBUG_STATIC_MT%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt !PROJECT_NAME! && echo. && echo. && echo. if %TESTS%==tests ( - if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! /useenv /%ACTION% debug_static_mt !TEST_PROJECT_NAME! && echo. && echo. && echo.) + if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt !TEST_PROJECT_NAME! && echo. && echo. && echo.) ) ) - if %RELEASE_STATIC_MT%==1 (!BUILD_TOOL! /useenv /%ACTION% release_static_mt !PROJECT_NAME! && echo. && echo. && echo. + if %RELEASE_STATIC_MT%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt !PROJECT_NAME! && echo. && echo. && echo. if %TESTS%==tests ( - if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! /useenv /%ACTION% release_static_mt !TEST_PROJECT_NAME! && echo. && echo. && echo.) + if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt !TEST_PROJECT_NAME! && echo. && echo. && echo.) ) ) - if %DEBUG_STATIC_MD%==1 (!BUILD_TOOL! /useenv /%ACTION% debug_static_md !PROJECT_NAME! && echo. && echo. && echo. + if %DEBUG_STATIC_MD%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md !PROJECT_NAME! && echo. && echo. && echo. if %TESTS%==tests ( - if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! /useenv /%ACTION% debug_static_md !TEST_PROJECT_NAME! && echo. && echo. && echo.) + if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md !TEST_PROJECT_NAME! && echo. && echo. && echo.) ) ) - if %RELEASE_STATIC_MD%==1 (!BUILD_TOOL! /useenv /%ACTION% release_static_md !PROJECT_NAME! && echo. && echo. && echo. + if %RELEASE_STATIC_MD%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md !PROJECT_NAME! && echo. && echo. && echo. if %TESTS%==tests ( - if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! /useenv /%ACTION% release_static_md !TEST_PROJECT_NAME! && echo. && echo. && echo.) + if exist !TEST_PROJECT_NAME! (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md !TEST_PROJECT_NAME! && echo. && echo. && echo.) ) ) echo. echo ------------------------------------------------------------------------ echo ------------------------------------------------------------------------ -echo ---- Done building !PROJECT_NAME! +echo ---- Done building [!PROJECT_NAME!] echo ------------------------------------------------------------------------ echo ------------------------------------------------------------------------ echo. @@ -311,25 +335,25 @@ if exist %%G\samples\samples%PLATFORM_SUFFIX%_%VS_VERSION%.sln ( echo. echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - echo ++++ Building %%G/samples + echo ++++ Building [%%G/samples] echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo. set PROJECT_NAME=samples%PLATFORM_SUFFIX%_%VS_VERSION% - if %DEBUG_SHARED%==1 (!BUILD_TOOL! /useenv /%ACTION% debug_shared !PROJECT_NAME!.sln && echo. && echo. && echo.) - if %RELEASE_SHARED%==1 (!BUILD_TOOL! /useenv /%ACTION% release_shared !PROJECT_NAME!.sln && echo. && echo. && echo.) - if %DEBUG_STATIC_MT%==1 (!BUILD_TOOL! /useenv /%ACTION% debug_static_mt !PROJECT_NAME!.sln && echo. && echo. && echo.) - if %RELEASE_STATIC_MT%==1 (!BUILD_TOOL! /useenv /%ACTION% release_static_mt !PROJECT_NAME!.sln && echo. && echo. && echo.) - if %DEBUG_STATIC_MD%==1 (!BUILD_TOOL! /useenv /%ACTION% debug_static_md !PROJECT_NAME!.sln && echo. && echo. && echo.) - if %RELEASE_STATIC_MD%==1 (!BUILD_TOOL! /useenv /%ACTION% release_static_md !PROJECT_NAME!.sln && echo. && echo. && echo.) + if %DEBUG_SHARED%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared !PROJECT_NAME!.sln && echo. && echo. && echo.) + if %RELEASE_SHARED%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared !PROJECT_NAME!.sln && echo. && echo. && echo.) + if %DEBUG_STATIC_MT%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt !PROJECT_NAME!.sln && echo. && echo. && echo.) + if %RELEASE_STATIC_MT%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt !PROJECT_NAME!.sln && echo. && echo. && echo.) + if %DEBUG_STATIC_MD%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md !PROJECT_NAME!.sln && echo. && echo. && echo.) + if %RELEASE_STATIC_MD%==1 (!BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md !PROJECT_NAME!.sln && echo. && echo. && echo.) cd %POCO_BASE% echo. echo ------------------------------------------------------------------------ echo ------------------------------------------------------------------------ - echo ---- Done building %%G/samples + echo ---- Done building [%%G/samples] echo ------------------------------------------------------------------------ echo ------------------------------------------------------------------------ echo. @@ -349,15 +373,15 @@ goto :EOF :usage echo Usage: echo ------ -echo buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] -echo VS_VERSION: "71 | 80 | 90 | 100 | 110" -echo ACTION: "build | rebuild | clean" -echo LINKMODE: "static_mt | static_md | shared | all" -echo CONFIG: "release | debug | both" -echo PLATFORM: "Win32 | x64 | WinCE" -echo SAMPLES: "samples | nosamples" -echo TESTS: "tests | notests" - +echo buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL] +echo VS_VERSION: "71|80|90|100|110" +echo ACTION: "build|rebuild|clean" +echo LINKMODE: "static_mt|static_md|shared|all" +echo CONFIGURATION: "release|debug|both" +echo PLATFORM: "Win32|x64|WinCE" +echo SAMPLES: "samples|nosamples" +echo TESTS: "tests|notests" +echo TOOL: "devenv|vcexpress|msbuild" echo. echo Default is build all. -endlocal \ No newline at end of file +endlocal From 2a0dcd17855d9377b0a0efee1fdbc1bd0a78208e Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 10 Nov 2012 17:41:52 +0100 Subject: [PATCH 016/165] changed Darwin build configs to use Clang as default --- build/config/Darwin | 71 ++---------------------------------- build/config/Darwin-gcc | 77 +++++++++++++++++++++++++++++++++++++++ build/config/Darwin32 | 4 +- build/config/Darwin32-gcc | 14 +++++++ build/config/Darwin64 | 4 +- build/config/Darwin64-gcc | 14 +++++++ 6 files changed, 112 insertions(+), 72 deletions(-) create mode 100644 build/config/Darwin-gcc create mode 100644 build/config/Darwin32-gcc create mode 100644 build/config/Darwin64-gcc diff --git a/build/config/Darwin b/build/config/Darwin index 3b664b3f5..d611ed60e 100644 --- a/build/config/Darwin +++ b/build/config/Darwin @@ -1,77 +1,12 @@ # -# $Id: //poco/1.4/build/config/Darwin#5 $ +# $Id: //poco/1.4/build/config/Darwin#6 $ # # Darwin # -# Build settings for Mac OS X 10.6 (GCC 4.2) -# The build settings defined in this file are compatible -# with XCode 3.2.5 C++ projects. +# Build settings for Mac OS X 10.6 or newer, using Clang. # # NOTE: This build configuration will build 64-bit binaries. # Use the Darwin32 build configuration to build 32-bit binaries. # -# -# General Settings -# -LINKMODE ?= SHARED - -POCO_TARGET_OSARCH ?= x86_64 -POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH) -ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH) - - -# -# Tools -# -CC = gcc -CXX = g++ -LINK = $(CXX) -bind_at_load -LIB = libtool -static -o -RANLIB = ranlib -SHLIB = $(CXX) -dynamiclib -o $@ -DYLIB = $(CXX) -dynamic -bundle -bind_at_load -o $@ -SHLIBLN = $(POCO_BASE)/build/script/shlibln -STRIP = -DEP = $(POCO_BASE)/build/script/makedepend.gcc -SHELL = sh -RM = rm -rf -CP = cp -MKDIR = mkdir -p - -# -# Extension for Shared Libraries -# -SHAREDLIBEXT = .$(target_version).dylib -SHAREDLIBLINKEXT = .dylib - -# -# Compiler and Linker Flags -# -CFLAGS = $(ARCHFLAGS) -CXXFLAGS = $(ARCHFLAGS) -Wall -Wno-sign-compare -LINKFLAGS = $(ARCHFLAGS) -SHLIBFLAGS = $(ARCHFLAGS) -DYLIBFLAGS = $(ARCHFLAGS) -STATICOPT_CC = -STATICOPT_CXX = -STATICOPT_LINK = -SHAREDOPT_CC = -fPIC -SHAREDOPT_CXX = -fPIC -SHAREDOPT_LINK = -DEBUGOPT_CC = -O0 -g -gdwarf-2 -D_DEBUG=$(DEBUGLEVEL) -DEBUGOPT_CXX = -O0 -g -gdwarf-2 -D_DEBUG=$(DEBUGLEVEL) -mfix-and-continue -fvisibility-inlines-hidden -fasm-blocks -DEBUGOPT_LINK = -RELEASEOPT_CC = -DNDEBUG -Os -RELEASEOPT_CXX = -DNDEBUG -Os -fvisibility-inlines-hidden -fasm-blocks -RELEASEOPT_LINK = - -# -# System Specific Flags -# -SYSFLAGS = -DPOCO_HAVE_IPv6 - -# -# System Specific Libraries -# -SYSLIBS = -ldl +include $(POCO_BASE)/build/config/Darwin-clang diff --git a/build/config/Darwin-gcc b/build/config/Darwin-gcc new file mode 100644 index 000000000..f273ee8ae --- /dev/null +++ b/build/config/Darwin-gcc @@ -0,0 +1,77 @@ +# +# $Id: //poco/1.4/build/config/Darwin-gcc#1 $ +# +# Darwin +# +# Build settings for Mac OS X 10.6 (GCC 4.2) +# The build settings defined in this file are compatible +# with XCode 3.2.5 C++ projects. +# +# NOTE: This build configuration will build 64-bit binaries. +# Use the Darwin32 build configuration to build 32-bit binaries. +# + +# +# General Settings +# +LINKMODE ?= SHARED + +POCO_TARGET_OSARCH ?= x86_64 +POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH) +ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH) + + +# +# Tools +# +CC = gcc +CXX = g++ +LINK = $(CXX) -bind_at_load +LIB = libtool -static -o +RANLIB = ranlib +SHLIB = $(CXX) -dynamiclib -o $@ +DYLIB = $(CXX) -dynamic -bundle -bind_at_load -o $@ +SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = +DEP = $(POCO_BASE)/build/script/makedepend.gcc +SHELL = sh +RM = rm -rf +CP = cp +MKDIR = mkdir -p + +# +# Extension for Shared Libraries +# +SHAREDLIBEXT = .$(target_version).dylib +SHAREDLIBLINKEXT = .dylib + +# +# Compiler and Linker Flags +# +CFLAGS = $(ARCHFLAGS) +CXXFLAGS = $(ARCHFLAGS) -Wall -Wno-sign-compare +LINKFLAGS = $(ARCHFLAGS) +SHLIBFLAGS = $(ARCHFLAGS) +DYLIBFLAGS = $(ARCHFLAGS) +STATICOPT_CC = +STATICOPT_CXX = +STATICOPT_LINK = +SHAREDOPT_CC = -fPIC +SHAREDOPT_CXX = -fPIC +SHAREDOPT_LINK = +DEBUGOPT_CC = -O0 -g -gdwarf-2 -D_DEBUG=$(DEBUGLEVEL) +DEBUGOPT_CXX = -O0 -g -gdwarf-2 -D_DEBUG=$(DEBUGLEVEL) -mfix-and-continue -fvisibility-inlines-hidden -fasm-blocks +DEBUGOPT_LINK = +RELEASEOPT_CC = -DNDEBUG -Os +RELEASEOPT_CXX = -DNDEBUG -Os -fvisibility-inlines-hidden -fasm-blocks +RELEASEOPT_LINK = + +# +# System Specific Flags +# +SYSFLAGS = -DPOCO_HAVE_IPv6 + +# +# System Specific Libraries +# +SYSLIBS = -ldl diff --git a/build/config/Darwin32 b/build/config/Darwin32 index d3dbdfd16..84f594158 100644 --- a/build/config/Darwin32 +++ b/build/config/Darwin32 @@ -1,5 +1,5 @@ # -# $Id: //poco/1.4/build/config/Darwin32#1 $ +# $Id: //poco/1.4/build/config/Darwin32#2 $ # # Darwin32 # @@ -11,4 +11,4 @@ ARCHFLAGS = -arch i386 POCO_TARGET_OSARCH = i386 -include $(POCO_BASE)/build/config/Darwin +include $(POCO_BASE)/build/config/Darwin-clang diff --git a/build/config/Darwin32-gcc b/build/config/Darwin32-gcc new file mode 100644 index 000000000..f426de604 --- /dev/null +++ b/build/config/Darwin32-gcc @@ -0,0 +1,14 @@ +# +# $Id: //poco/1.4/build/config/Darwin32-gcc#1 $ +# +# Darwin32 +# +# Build settings for Mac OS X 10.5/10.6 (GCC 4.0.1), 32-bits +# The build settings defined in this file are compatible +# with XCode 3.1 C++ projects. +# + +ARCHFLAGS = -arch i386 +POCO_TARGET_OSARCH = i386 + +include $(POCO_BASE)/build/config/Darwin diff --git a/build/config/Darwin64 b/build/config/Darwin64 index 218d0a52b..985a083ab 100644 --- a/build/config/Darwin64 +++ b/build/config/Darwin64 @@ -1,5 +1,5 @@ # -# $Id: //poco/1.4/build/config/Darwin64#1 $ +# $Id: //poco/1.4/build/config/Darwin64#2 $ # # Darwin64 # @@ -11,4 +11,4 @@ ARCHFLAGS = -arch x86_64 POCO_TARGET_OSARCH = x86_64 -include $(POCO_BASE)/build/config/Darwin +include $(POCO_BASE)/build/config/Darwin-clang diff --git a/build/config/Darwin64-gcc b/build/config/Darwin64-gcc new file mode 100644 index 000000000..b914eacef --- /dev/null +++ b/build/config/Darwin64-gcc @@ -0,0 +1,14 @@ +# +# $Id: //poco/1.4/build/config/Darwin64-gcc#1 $ +# +# Darwin64 +# +# Build settings for Mac OS X 10.5/10.6 (GCC 4.0.1), 64-bits +# The build settings defined in this file are compatible +# with XCode 3.1 C++ projects. +# + +ARCHFLAGS = -arch x86_64 +POCO_TARGET_OSARCH = x86_64 + +include $(POCO_BASE)/build/config/Darwin From 79eab2637776276eb0116116b907b2c178f18727 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 11 Nov 2012 09:57:01 +0100 Subject: [PATCH 017/165] the great line endings cleanup --- ApacheConnector/ApacheConnector_vs110.sln | 42 +- ApacheConnector/ApacheConnector_vs110.vcxproj | 270 +- .../ApacheConnector_vs110.vcxproj.filters | 112 +- ApacheConnector/ApacheConnector_x64_vs110.sln | 42 +- .../ApacheConnector_x64_vs110.vcxproj | 270 +- .../ApacheConnector_x64_vs110.vcxproj.filters | 112 +- .../FormServer/FormServer_vs110.vcxproj | 234 +- .../FormServer_vs110.vcxproj.filters | 32 +- .../FormServer/FormServer_x64_vs110.vcxproj | 234 +- .../FormServer_x64_vs110.vcxproj.filters | 32 +- .../TimeServer/TimeServer_vs110.vcxproj | 234 +- .../TimeServer_vs110.vcxproj.filters | 32 +- .../TimeServer/TimeServer_x64_vs110.vcxproj | 234 +- .../TimeServer_x64_vs110.vcxproj.filters | 32 +- ApacheConnector/samples/samples_vs110.sln | 58 +- ApacheConnector/samples/samples_x64_vs110.sln | 58 +- CppParser/CppParser_CE_vs90.sln | 120 +- CppParser/CppParser_CE_vs90.vcproj | 1060 ++-- CppParser/CppParser_vs110.sln | 120 +- CppParser/CppParser_vs110.vcxproj | 632 +-- CppParser/CppParser_vs110.vcxproj.filters | 280 +- CppParser/CppParser_x64_vs110.sln | 120 +- CppParser/CppParser_x64_vs110.vcxproj | 628 +- CppParser/CppParser_x64_vs110.vcxproj.filters | 280 +- CppParser/testsuite/TestSuite_vs110.vcxproj | 646 +-- .../testsuite/TestSuite_vs110.vcxproj.filters | 136 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 646 +-- .../TestSuite_x64_vs110.vcxproj.filters | 136 +- CppUnit/CppUnit_vs110.sln | 92 +- CppUnit/CppUnit_vs110.vcxproj | 828 +-- CppUnit/CppUnit_vs110.vcxproj.filters | 176 +- CppUnit/CppUnit_x64_vs110.sln | 98 +- CppUnit/CppUnit_x64_vs110.vcxproj | 828 +-- CppUnit/CppUnit_x64_vs110.vcxproj.filters | 176 +- .../WinTestRunner/WinTestRunner_vs110.vcxproj | 876 +-- .../WinTestRunner_vs110.vcxproj.filters | 120 +- .../WinTestRunner_x64_vs110.vcxproj | 876 +-- .../WinTestRunner_x64_vs110.vcxproj.filters | 120 +- Crypto/Crypto_vs110.vcxproj | 626 +- Crypto/Crypto_vs110.vcxproj.filters | 286 +- Crypto/Crypto_x64_vs110.vcxproj | 622 +- Crypto/Crypto_x64_vs110.vcxproj.filters | 286 +- .../samples/genrsakey/genrsakey_vs110.vcxproj | 610 +- .../genrsakey/genrsakey_vs110.vcxproj.filters | 30 +- .../genrsakey/genrsakey_x64_vs110.vcxproj | 610 +- .../genrsakey_x64_vs110.vcxproj.filters | 30 +- Crypto/samples/samples_vs110.sln | 74 +- Crypto/samples/samples_x64_vs110.sln | 74 +- Crypto/testsuite/TestSuite_vs110.vcxproj | 646 +-- .../testsuite/TestSuite_vs110.vcxproj.filters | 118 +- Crypto/testsuite/TestSuite_x64_vs110.vcxproj | 646 +-- .../TestSuite_x64_vs110.vcxproj.filters | 118 +- Data/Data_CE_vs90.sln | 120 +- Data/Data_CE_vs90.vcproj | 1256 ++-- Data/Data_vs110.sln | 120 +- Data/Data_vs110.vcxproj | 730 +-- Data/Data_vs110.vcxproj.filters | 574 +- Data/Data_x64_vs100.sln | 120 +- Data/Data_x64_vs100.vcxproj | 714 +-- Data/Data_x64_vs100.vcxproj.filters | 574 +- Data/Data_x64_vs110.sln | 120 +- Data/Data_x64_vs110.vcxproj | 726 +-- Data/Data_x64_vs110.vcxproj.filters | 574 +- Data/Data_x64_vs90.sln | 120 +- Data/Data_x64_vs90.vcproj | 1170 ++-- Data/MySQL/MySQL_vs110.sln | 120 +- Data/MySQL/MySQL_vs110.vcxproj | 600 +- Data/MySQL/MySQL_vs110.vcxproj.filters | 154 +- Data/MySQL/MySQL_vs71.sln | 100 +- Data/MySQL/MySQL_vs71.vcproj | 834 +-- Data/MySQL/MySQL_x64_vs110.sln | 120 +- Data/MySQL/MySQL_x64_vs110.vcxproj | 596 +- Data/MySQL/MySQL_x64_vs110.vcxproj.filters | 154 +- .../MySQL/include/Poco/Data/MySQL/Connector.h | 163 +- Data/MySQL/src/Connector.cpp | 186 +- Data/MySQL/testsuite/TestSuite_vs110.vcxproj | 642 +-- .../testsuite/TestSuite_vs110.vcxproj.filters | 106 +- Data/MySQL/testsuite/TestSuite_vs71.vcproj | 868 +-- .../testsuite/TestSuite_x64_vs100.vcxproj | 630 +-- .../TestSuite_x64_vs100.vcxproj.filters | 106 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 642 +-- .../TestSuite_x64_vs110.vcxproj.filters | 106 +- .../MySQL/testsuite/TestSuite_x64_vs90.vcproj | 948 ++-- Data/MySQL/testsuite/src/SQLExecutor.h | 251 +- Data/ODBC/ODBC_vs110.sln | 120 +- Data/ODBC/ODBC_vs110.vcxproj | 662 +-- Data/ODBC/ODBC_vs110.vcxproj.filters | 250 +- Data/ODBC/ODBC_x64_vs110.sln | 120 +- Data/ODBC/ODBC_x64_vs110.vcxproj | 658 +-- Data/ODBC/ODBC_x64_vs110.vcxproj.filters | 250 +- Data/ODBC/src/Utility.cpp | 314 +- Data/ODBC/testsuite/TestSuite_vs110.vcxproj | 670 +-- .../testsuite/TestSuite_vs110.vcxproj.filters | 190 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 658 +-- .../TestSuite_x64_vs100.vcxproj.filters | 190 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 670 +-- .../TestSuite_x64_vs110.vcxproj.filters | 190 +- Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj | 1004 ++-- Data/SQLite/SQLite_CE_vs90.sln | 120 +- Data/SQLite/SQLite_CE_vs90.vcproj | 1044 ++-- Data/SQLite/SQLite_vs110.sln | 120 +- Data/SQLite/SQLite_vs110.vcxproj | 596 +- Data/SQLite/SQLite_vs110.vcxproj.filters | 154 +- Data/SQLite/SQLite_x64_vs110.sln | 120 +- Data/SQLite/SQLite_x64_vs110.vcxproj | 592 +- Data/SQLite/SQLite_x64_vs110.vcxproj.filters | 154 +- Data/SQLite/src/Connector.cpp | 192 +- Data/SQLite/src/Extractor.cpp | 520 +- Data/SQLite/src/SQLiteStatementImpl.cpp | 622 +- .../SQLite/testsuite/TestSuite_CE_vs90.vcproj | 990 ++-- Data/SQLite/testsuite/TestSuite_vs110.vcxproj | 638 +-- .../testsuite/TestSuite_vs110.vcxproj.filters | 94 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 626 +- .../TestSuite_x64_vs100.vcxproj.filters | 94 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 638 +-- .../TestSuite_x64_vs110.vcxproj.filters | 94 +- .../testsuite/TestSuite_x64_vs90.vcproj | 940 +-- Data/SQLite/testsuite/src/WinCEDriver.cpp | 104 +- Data/samples/Binding/Binding_CE_vs90.vcproj | 936 +-- Data/samples/Binding/Binding_vs110.vcxproj | 610 +- .../Binding/Binding_vs110.vcxproj.filters | 30 +- .../samples/Binding/Binding_x64_vs100.vcxproj | 598 +- .../Binding/Binding_x64_vs100.vcxproj.filters | 30 +- .../samples/Binding/Binding_x64_vs110.vcxproj | 610 +- .../Binding/Binding_x64_vs110.vcxproj.filters | 30 +- Data/samples/Binding/Binding_x64_vs90.vcproj | 870 +-- .../RecordSet/RecordSet_CE_vs90.vcproj | 936 +-- .../samples/RecordSet/RecordSet_vs110.vcxproj | 610 +- .../RecordSet/RecordSet_vs110.vcxproj.filters | 30 +- .../RecordSet/RecordSet_x64_vs100.vcxproj | 598 +- .../RecordSet_x64_vs100.vcxproj.filters | 30 +- .../RecordSet/RecordSet_x64_vs110.vcxproj | 610 +- .../RecordSet_x64_vs110.vcxproj.filters | 30 +- .../RecordSet/RecordSet_x64_vs90.vcproj | 870 +-- .../RowFormatter/RowFormatter_CE_vs90.vcproj | 936 +-- .../RowFormatter/RowFormatter_vs100.vcxproj | 598 +- .../RowFormatter_vs100.vcxproj.filters | 30 +- .../RowFormatter/RowFormatter_vs110.vcxproj | 610 +- .../RowFormatter_vs110.vcxproj.filters | 30 +- .../RowFormatter_x64_vs100.vcxproj | 598 +- .../RowFormatter_x64_vs100.vcxproj.filters | 30 +- .../RowFormatter_x64_vs110.vcxproj | 610 +- .../RowFormatter_x64_vs110.vcxproj.filters | 30 +- .../RowFormatter/RowFormatter_x64_vs90.vcproj | 870 +-- Data/samples/Tuple/Tuple_CE_vs90.vcproj | 936 +-- Data/samples/Tuple/Tuple_vs110.vcxproj | 610 +- .../samples/Tuple/Tuple_vs110.vcxproj.filters | 30 +- Data/samples/Tuple/Tuple_x64_vs100.vcxproj | 598 +- .../Tuple/Tuple_x64_vs100.vcxproj.filters | 30 +- Data/samples/Tuple/Tuple_x64_vs110.vcxproj | 610 +- .../Tuple/Tuple_x64_vs110.vcxproj.filters | 30 +- Data/samples/Tuple/Tuple_x64_vs90.vcproj | 870 +-- .../TypeHandler/TypeHandler_CE_vs90.vcproj | 936 +-- .../TypeHandler/TypeHandler_vs110.vcxproj | 610 +- .../TypeHandler_vs110.vcxproj.filters | 30 +- .../TypeHandler/TypeHandler_x64_vs100.vcxproj | 598 +- .../TypeHandler_x64_vs100.vcxproj.filters | 30 +- .../TypeHandler/TypeHandler_x64_vs110.vcxproj | 610 +- .../TypeHandler_x64_vs110.vcxproj.filters | 30 +- .../TypeHandler/TypeHandler_x64_vs90.vcproj | 870 +-- Data/samples/samples_CE_vs90.sln | 234 +- Data/samples/samples_vs110.sln | 234 +- Data/samples/samples_x64_vs100.sln | 234 +- Data/samples/samples_x64_vs110.sln | 234 +- Data/samples/samples_x64_vs90.sln | 234 +- Data/testsuite/TestSuite_CE_vs90.vcproj | 1082 ++-- Data/testsuite/TestSuite_vs110.vcxproj | 666 +-- .../testsuite/TestSuite_vs110.vcxproj.filters | 214 +- Data/testsuite/TestSuite_x64_vs100.vcxproj | 654 +-- .../TestSuite_x64_vs100.vcxproj.filters | 214 +- Data/testsuite/TestSuite_x64_vs110.vcxproj | 666 +-- .../TestSuite_x64_vs110.vcxproj.filters | 214 +- Data/testsuite/TestSuite_x64_vs90.vcproj | 1032 ++-- Data/testsuite/src/WinCEDriver.cpp | 104 +- Foundation/Foundation_vs110.sln | 166 +- Foundation/Foundation_vs110.vcxproj | 2644 ++++----- Foundation/Foundation_vs110.vcxproj.filters | 3686 ++++++------ Foundation/Foundation_x64_vs110.sln | 170 +- Foundation/Foundation_x64_vs110.vcxproj | 2662 ++++----- .../Foundation_x64_vs110.vcxproj.filters | 3668 ++++++------ Foundation/include/Poco/DirectoryWatcher.h | 490 +- Foundation/include/Poco/Dynamic/Pair.h | 15 +- Foundation/include/Poco/FIFOBufferStream.h | 352 +- Foundation/include/Poco/NumericString.h | 726 +-- Foundation/include/Poco/UTFString.h | 187 +- .../ActiveMethod/ActiveMethod_vs110.vcxproj | 610 +- .../ActiveMethod_vs110.vcxproj.filters | 30 +- .../ActiveMethod_x64_vs110.vcxproj | 610 +- .../ActiveMethod_x64_vs110.vcxproj.filters | 30 +- .../samples/Activity/Activity_vs110.vcxproj | 610 +- .../Activity/Activity_vs110.vcxproj.filters | 30 +- .../Activity/Activity_x64_vs110.vcxproj | 610 +- .../Activity_x64_vs110.vcxproj.filters | 30 +- .../BinaryReaderWriter_vs110.vcxproj | 610 +- .../BinaryReaderWriter_vs110.vcxproj.filters | 30 +- .../BinaryReaderWriter_x64_vs110.vcxproj | 610 +- ...naryReaderWriter_x64_vs110.vcxproj.filters | 30 +- .../samples/DateTime/DateTime_vs110.vcxproj | 610 +- .../DateTime/DateTime_vs110.vcxproj.filters | 30 +- .../DateTime/DateTime_x64_vs110.vcxproj | 610 +- .../DateTime_x64_vs110.vcxproj.filters | 30 +- .../LogRotation/LogRotation_vs110.vcxproj | 610 +- .../LogRotation_vs110.vcxproj.filters | 30 +- .../LogRotation/LogRotation_x64_vs110.vcxproj | 610 +- .../LogRotation_x64_vs110.vcxproj.filters | 30 +- .../samples/Logger/Logger_vs110.vcxproj | 610 +- .../Logger/Logger_vs110.vcxproj.filters | 30 +- .../samples/Logger/Logger_x64_vs110.vcxproj | 610 +- .../Logger/Logger_x64_vs110.vcxproj.filters | 30 +- .../NotificationQueue_vs110.vcxproj | 610 +- .../NotificationQueue_vs110.vcxproj.filters | 30 +- .../NotificationQueue_x64_vs110.vcxproj | 610 +- ...otificationQueue_x64_vs110.vcxproj.filters | 30 +- .../StringTokenizer_vs110.vcxproj | 610 +- .../StringTokenizer_vs110.vcxproj.filters | 30 +- .../StringTokenizer_x64_vs110.vcxproj | 610 +- .../StringTokenizer_x64_vs110.vcxproj.filters | 30 +- Foundation/samples/Timer/Timer_vs110.vcxproj | 610 +- .../samples/Timer/Timer_vs110.vcxproj.filters | 30 +- .../samples/Timer/Timer_x64_vs110.vcxproj | 610 +- .../Timer/Timer_x64_vs110.vcxproj.filters | 30 +- Foundation/samples/URI/URI_vs110.vcxproj | 610 +- .../samples/URI/URI_vs110.vcxproj.filters | 30 +- Foundation/samples/URI/URI_x64_vs110.vcxproj | 610 +- .../samples/URI/URI_x64_vs110.vcxproj.filters | 30 +- .../base64decode/base64decode_vs110.vcxproj | 610 +- .../base64decode_vs110.vcxproj.filters | 30 +- .../base64decode_x64_vs110.vcxproj | 610 +- .../base64decode_x64_vs110.vcxproj.filters | 30 +- .../base64encode/base64encode_vs110.vcxproj | 610 +- .../base64encode_vs110.vcxproj.filters | 30 +- .../base64encode_x64_vs110.vcxproj | 610 +- .../base64encode_x64_vs110.vcxproj.filters | 30 +- .../samples/deflate/deflate_vs110.vcxproj | 610 +- .../deflate/deflate_vs110.vcxproj.filters | 30 +- .../samples/deflate/deflate_x64_vs110.vcxproj | 610 +- .../deflate/deflate_x64_vs110.vcxproj.filters | 30 +- Foundation/samples/dir/dir_vs110.vcxproj | 610 +- .../samples/dir/dir_vs110.vcxproj.filters | 30 +- Foundation/samples/dir/dir_x64_vs110.vcxproj | 610 +- .../samples/dir/dir_x64_vs110.vcxproj.filters | 30 +- Foundation/samples/grep/grep_vs110.vcxproj | 610 +- .../samples/grep/grep_vs110.vcxproj.filters | 30 +- .../samples/grep/grep_x64_vs110.vcxproj | 610 +- .../grep/grep_x64_vs110.vcxproj.filters | 30 +- .../samples/hmacmd5/hmacmd5_vs110.vcxproj | 610 +- .../hmacmd5/hmacmd5_vs110.vcxproj.filters | 30 +- .../samples/hmacmd5/hmacmd5_x64_vs110.vcxproj | 610 +- .../hmacmd5/hmacmd5_x64_vs110.vcxproj.filters | 30 +- .../samples/inflate/inflate_vs110.vcxproj | 610 +- .../inflate/inflate_vs110.vcxproj.filters | 30 +- .../samples/inflate/inflate_x64_vs110.vcxproj | 610 +- .../inflate/inflate_x64_vs110.vcxproj.filters | 30 +- Foundation/samples/md5/md5_vs110.vcxproj | 610 +- .../samples/md5/md5_vs110.vcxproj.filters | 30 +- Foundation/samples/md5/md5_x64_vs110.vcxproj | 610 +- .../samples/md5/md5_x64_vs110.vcxproj.filters | 30 +- Foundation/samples/samples_vs110.sln | 794 +-- Foundation/samples/samples_x64_vs110.sln | 794 +-- .../samples/uuidgen/uuidgen_vs110.vcxproj | 610 +- .../uuidgen/uuidgen_vs110.vcxproj.filters | 30 +- .../samples/uuidgen/uuidgen_x64_vs110.vcxproj | 610 +- .../uuidgen/uuidgen_x64_vs110.vcxproj.filters | 30 +- Foundation/src/FIFOBufferStream.cpp | 416 +- Foundation/testsuite/TestApp_vs110.vcxproj | 618 +- .../testsuite/TestApp_vs110.vcxproj.filters | 24 +- .../testsuite/TestApp_x64_vs110.vcxproj | 618 +- .../TestApp_x64_vs110.vcxproj.filters | 24 +- .../testsuite/TestLibrary_vs110.vcxproj | 254 +- .../TestLibrary_vs110.vcxproj.filters | 48 +- .../testsuite/TestLibrary_x64_vs110.vcxproj | 254 +- .../TestLibrary_x64_vs110.vcxproj.filters | 48 +- Foundation/testsuite/TestSuite_vs110.vcxproj | 1150 ++-- .../testsuite/TestSuite_vs110.vcxproj.filters | 1936 +++---- .../testsuite/TestSuite_x64_vs110.vcxproj | 1152 ++-- .../TestSuite_x64_vs110.vcxproj.filters | 1942 +++---- Foundation/testsuite/src/DigestStreamTest.cpp | 23 +- .../testsuite/src/FIFOBufferStreamTest.cpp | 448 +- .../testsuite/src/FIFOBufferStreamTest.h | 140 +- Foundation/testsuite/src/VarTest.cpp | 5027 +++++++++-------- JSON/JSON_CE_vs90.sln | 120 +- JSON/JSON_CE_vs90.vcproj | 962 ++-- JSON/JSON_vs100.vcxproj | 590 +- JSON/JSON_vs100.vcxproj.filters | 154 +- JSON/JSON_vs110.sln | 120 +- JSON/JSON_vs110.vcxproj | 604 +- JSON/JSON_vs110.vcxproj.filters | 154 +- JSON/JSON_vs71.sln | 100 +- JSON/JSON_vs71.vcproj | 826 +-- JSON/JSON_vs80.sln | 120 +- JSON/JSON_vs80.vcproj | 868 +-- JSON/JSON_vs90.sln | 120 +- JSON/JSON_vs90.vcproj | 866 +-- JSON/JSON_x64_vs100.sln | 120 +- JSON/JSON_x64_vs110.sln | 120 +- JSON/JSON_x64_vs110.vcxproj | 600 +- JSON/JSON_x64_vs110.vcxproj.filters | 154 +- JSON/JSON_x64_vs90.sln | 120 +- JSON/JSON_x64_vs90.vcproj | 876 +-- .../Benchmark/Benchmark_CE_vs90.vcproj | 936 +-- .../samples/Benchmark/Benchmark_vs100.vcxproj | 598 +- .../Benchmark/Benchmark_vs100.vcxproj.filters | 30 +- .../samples/Benchmark/Benchmark_vs110.vcxproj | 610 +- .../Benchmark/Benchmark_vs110.vcxproj.filters | 30 +- JSON/samples/Benchmark/Benchmark_vs71.vcproj | 790 +-- JSON/samples/Benchmark/Benchmark_vs80.vcproj | 870 +-- JSON/samples/Benchmark/Benchmark_vs90.vcproj | 870 +-- .../Benchmark/Benchmark_x64_vs100.vcxproj | 598 +- .../Benchmark_x64_vs100.vcxproj.filters | 30 +- .../Benchmark/Benchmark_x64_vs110.vcxproj | 610 +- .../Benchmark_x64_vs110.vcxproj.filters | 30 +- .../Benchmark/Benchmark_x64_vs90.vcproj | 870 +-- JSON/samples/Benchmark/src/Benchmark.cpp | 226 +- JSON/samples/samples_CE_vs90.sln | 74 +- JSON/samples/samples_vs100.sln | 74 +- JSON/samples/samples_vs110.sln | 74 +- JSON/samples/samples_vs71.sln | 66 +- JSON/samples/samples_vs80.sln | 74 +- JSON/samples/samples_vs90.sln | 74 +- JSON/samples/samples_x64_vs100.sln | 74 +- JSON/samples/samples_x64_vs110.sln | 74 +- JSON/samples/samples_x64_vs90.sln | 74 +- JSON/src/Parser.cpp | 1401 ++--- JSON/testsuite/TestSuite_CE_vs90.vcproj | 954 ++-- JSON/testsuite/TestSuite_vs100.vcxproj | 626 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 58 +- JSON/testsuite/TestSuite_vs110.vcxproj | 638 +-- .../testsuite/TestSuite_vs110.vcxproj.filters | 58 +- JSON/testsuite/TestSuite_vs71.vcproj | 824 +-- JSON/testsuite/TestSuite_vs80.vcproj | 904 +-- JSON/testsuite/TestSuite_vs90.vcproj | 904 +-- JSON/testsuite/TestSuite_x64_vs100.vcxproj | 626 +- .../TestSuite_x64_vs100.vcxproj.filters | 58 +- JSON/testsuite/TestSuite_x64_vs110.vcxproj | 638 +-- .../TestSuite_x64_vs110.vcxproj.filters | 58 +- JSON/testsuite/TestSuite_x64_vs90.vcproj | 904 +-- JSON/testsuite/src/Driver.cpp | 78 +- JSON/testsuite/src/JSONTest.cpp | 1672 +++--- JSON/testsuite/src/JSONTest.h | 170 +- JSON/testsuite/src/JSONTestSuite.cpp | 88 +- JSON/testsuite/src/JSONTestSuite.h | 98 +- JSON/testsuite/src/WinCEDriver.cpp | 104 +- JSON/testsuite/src/WinDriver.cpp | 100 +- Net/Net_vs110.sln | 120 +- Net/Net_vs110.vcxproj | 952 ++-- Net/Net_vs110.vcxproj.filters | 1384 ++--- Net/Net_x64_vs110.sln | 120 +- Net/Net_x64_vs110.vcxproj | 948 ++-- Net/Net_x64_vs110.vcxproj.filters | 1384 ++--- .../EchoServer/EchoServer_vs110.vcxproj | 616 +- .../EchoServer_vs110.vcxproj.filters | 40 +- .../EchoServer/EchoServer_x64_vs110.vcxproj | 616 +- .../EchoServer_x64_vs110.vcxproj.filters | 40 +- .../HTTPFormServer_vs110.vcxproj | 616 +- .../HTTPFormServer_vs110.vcxproj.filters | 40 +- .../HTTPFormServer_x64_vs110.vcxproj | 616 +- .../HTTPFormServer_x64_vs110.vcxproj.filters | 40 +- .../HTTPLoadTest/HTTPLoadTest_vs110.vcxproj | 610 +- .../HTTPLoadTest_vs110.vcxproj.filters | 24 +- .../HTTPLoadTest_x64_vs110.vcxproj | 610 +- .../HTTPLoadTest_x64_vs110.vcxproj.filters | 24 +- .../HTTPTimeServer_vs110.vcxproj | 616 +- .../HTTPTimeServer_vs110.vcxproj.filters | 40 +- .../HTTPTimeServer_x64_vs110.vcxproj | 616 +- .../HTTPTimeServer_x64_vs110.vcxproj.filters | 40 +- Net/samples/Mail/Mail_vs110.vcxproj | 616 +- Net/samples/Mail/Mail_vs110.vcxproj.filters | 34 +- Net/samples/Mail/Mail_x64_vs110.vcxproj | 616 +- .../Mail/Mail_x64_vs110.vcxproj.filters | 34 +- Net/samples/Ping/Ping_vs110.vcxproj | 616 +- Net/samples/Ping/Ping_vs110.vcxproj.filters | 40 +- Net/samples/Ping/Ping_x64_vs110.vcxproj | 616 +- .../Ping/Ping_x64_vs110.vcxproj.filters | 40 +- Net/samples/SMTPLogger/Makefile | 34 +- .../SMTPLogger/SMTPLogger_CE_vs90.vcproj | 932 +-- .../SMTPLogger/SMTPLogger_vs100.vcxproj | 598 +- .../SMTPLogger_vs100.vcxproj.filters | 24 +- .../SMTPLogger/SMTPLogger_vs110.vcxproj | 610 +- .../SMTPLogger_vs110.vcxproj.filters | 24 +- Net/samples/SMTPLogger/SMTPLogger_vs71.vcproj | 786 +-- Net/samples/SMTPLogger/SMTPLogger_vs80.vcproj | 866 +-- Net/samples/SMTPLogger/SMTPLogger_vs90.vcproj | 866 +-- .../SMTPLogger/SMTPLogger_x64_vs100.vcxproj | 598 +- .../SMTPLogger_x64_vs100.vcxproj.filters | 24 +- .../SMTPLogger/SMTPLogger_x64_vs110.vcxproj | 610 +- .../SMTPLogger_x64_vs110.vcxproj.filters | 24 +- .../SMTPLogger/SMTPLogger_x64_vs90.vcproj | 866 +-- Net/samples/SMTPLogger/src/SMTPLogger.cpp | 184 +- .../TimeServer/TimeServer_vs110.vcxproj | 616 +- .../TimeServer_vs110.vcxproj.filters | 40 +- .../TimeServer/TimeServer_x64_vs110.vcxproj | 616 +- .../TimeServer_x64_vs110.vcxproj.filters | 40 +- .../TwitterClient/TwitterClient_vs110.vcxproj | 618 +- .../TwitterClient_vs110.vcxproj.filters | 46 +- .../TwitterClient_x64_vs110.vcxproj | 618 +- .../TwitterClient_x64_vs110.vcxproj.filters | 46 +- .../WebSocketServer_vs110.vcxproj | 610 +- .../WebSocketServer_vs110.vcxproj.filters | 24 +- .../WebSocketServer_x64_vs110.vcxproj | 610 +- .../WebSocketServer_x64_vs110.vcxproj.filters | 24 +- Net/samples/dict/dict_vs110.vcxproj | 610 +- Net/samples/dict/dict_vs110.vcxproj.filters | 24 +- Net/samples/dict/dict_x64_vs110.vcxproj | 610 +- .../dict/dict_x64_vs110.vcxproj.filters | 24 +- Net/samples/download/download_vs110.vcxproj | 610 +- .../download/download_vs110.vcxproj.filters | 24 +- .../download/download_x64_vs110.vcxproj | 610 +- .../download_x64_vs110.vcxproj.filters | 24 +- Net/samples/httpget/httpget_vs110.vcxproj | 610 +- .../httpget/httpget_vs110.vcxproj.filters | 24 +- Net/samples/httpget/httpget_x64_vs110.vcxproj | 610 +- .../httpget/httpget_x64_vs110.vcxproj.filters | 24 +- Net/samples/samples_vs110.sln | 554 +- Net/samples/samples_x64_vs110.sln | 554 +- Net/testsuite/TestSuite_vs110.vcxproj | 850 +-- Net/testsuite/TestSuite_vs110.vcxproj.filters | 964 ++-- Net/testsuite/TestSuite_x64_vs110.vcxproj | 850 +-- .../TestSuite_x64_vs110.vcxproj.filters | 964 ++-- NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.sln | 120 +- NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj | 678 +-- .../NetSSL_OpenSSL_vs110.vcxproj.filters | 424 +- NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.sln | 120 +- .../NetSSL_OpenSSL_x64_vs110.vcxproj | 674 +-- .../NetSSL_OpenSSL_x64_vs110.vcxproj.filters | 424 +- .../HTTPSTimeServer_vs110.vcxproj | 616 +- .../HTTPSTimeServer_vs110.vcxproj.filters | 40 +- .../HTTPSTimeServer_x64_vs110.vcxproj | 616 +- .../HTTPSTimeServer_x64_vs110.vcxproj.filters | 40 +- .../samples/Mail/Mail_vs110.vcxproj | 616 +- .../samples/Mail/Mail_vs110.vcxproj.filters | 34 +- .../samples/Mail/Mail_x64_vs110.vcxproj | 616 +- .../Mail/Mail_x64_vs110.vcxproj.filters | 34 +- .../samples/download/download_vs110.vcxproj | 610 +- .../download/download_vs110.vcxproj.filters | 24 +- .../download/download_x64_vs110.vcxproj | 610 +- .../download_x64_vs110.vcxproj.filters | 24 +- NetSSL_OpenSSL/samples/samples_vs110.sln | 154 +- NetSSL_OpenSSL/samples/samples_x64_vs110.sln | 154 +- .../testsuite/TestSuite_vs110.vcxproj | 666 +-- .../testsuite/TestSuite_vs110.vcxproj.filters | 232 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 666 +-- .../TestSuite_x64_vs110.vcxproj.filters | 232 +- PDF/PDF_vs100.sln | 120 +- PDF/PDF_vs100.vcxproj | 828 +-- PDF/PDF_vs100.vcxproj.filters | 922 +-- PDF/PDF_vs110.sln | 120 +- PDF/PDF_vs110.vcxproj | 840 +-- PDF/PDF_vs110.vcxproj.filters | 922 +-- PDF/PDF_vs71.sln | 100 +- PDF/PDF_vs71.vcproj | 1358 ++--- PDF/PDF_vs90.sln | 120 +- PDF/PDF_vs90.vcproj | 1398 ++--- PDF/PDF_x64_vs100.sln | 120 +- PDF/PDF_x64_vs100.vcxproj | 824 +-- PDF/PDF_x64_vs100.vcxproj.filters | 922 +-- PDF/PDF_x64_vs110.sln | 120 +- PDF/PDF_x64_vs110.vcxproj | 836 +-- PDF/PDF_x64_vs110.vcxproj.filters | 922 +-- PDF/PDF_x64_vs90.sln | 120 +- PDF/PDF_x64_vs90.vcproj | 1408 ++--- PDF/samples/Image/Image_vs100.vcxproj | 596 +- PDF/samples/Image/Image_vs100.vcxproj.filters | 30 +- PDF/samples/Image/Image_vs110.vcxproj | 610 +- PDF/samples/Image/Image_vs110.vcxproj.filters | 30 +- PDF/samples/Image/Image_vs71.vcproj | 790 +-- PDF/samples/Image/Image_vs90.vcproj | 1108 ++-- PDF/samples/Image/Image_x64_vs100.vcxproj | 598 +- .../Image/Image_x64_vs100.vcxproj.filters | 30 +- PDF/samples/Image/Image_x64_vs110.vcxproj | 610 +- .../Image/Image_x64_vs110.vcxproj.filters | 30 +- PDF/samples/Image/Image_x64_vs90.vcproj | 870 +-- PDF/samples/Text/Text_vs100.vcxproj | 596 +- PDF/samples/Text/Text_vs100.vcxproj.filters | 30 +- PDF/samples/Text/Text_vs110.vcxproj | 610 +- PDF/samples/Text/Text_vs110.vcxproj.filters | 30 +- PDF/samples/Text/Text_vs71.vcproj | 790 +-- PDF/samples/Text/Text_vs90.vcproj | 1108 ++-- PDF/samples/Text/Text_x64_vs100.vcxproj | 598 +- .../Text/Text_x64_vs100.vcxproj.filters | 30 +- PDF/samples/Text/Text_x64_vs110.vcxproj | 610 +- .../Text/Text_x64_vs110.vcxproj.filters | 30 +- PDF/samples/Text/Text_x64_vs90.vcproj | 870 +-- PDF/samples/samples_vs100.sln | 114 +- PDF/samples/samples_vs110.sln | 114 +- PDF/samples/samples_vs71.sln | 98 +- PDF/samples/samples_vs90.sln | 114 +- PDF/samples/samples_x64_vs100.sln | 114 +- PDF/samples/samples_x64_vs110.sln | 114 +- PDF/samples/samples_x64_vs90.sln | 114 +- PDF/testsuite/TestSuite_vs100.vcxproj | 626 +- PDF/testsuite/TestSuite_vs100.vcxproj.filters | 94 +- PDF/testsuite/TestSuite_vs110.vcxproj | 638 +-- PDF/testsuite/TestSuite_vs110.vcxproj.filters | 94 +- PDF/testsuite/TestSuite_vs71.vcproj | 860 +-- PDF/testsuite/TestSuite_vs90.vcproj | 940 +-- PDF/testsuite/TestSuite_x64_vs100.vcxproj | 626 +- .../TestSuite_x64_vs100.vcxproj.filters | 94 +- PDF/testsuite/TestSuite_x64_vs110.vcxproj | 638 +-- .../TestSuite_x64_vs110.vcxproj.filters | 94 +- PDF/testsuite/TestSuite_x64_vs90.vcproj | 940 +-- PageCompiler/File2Page/File2Page_vs110.sln | 74 +- .../File2Page/File2Page_vs110.vcxproj | 610 +- .../File2Page/File2Page_vs110.vcxproj.filters | 30 +- .../File2Page/File2Page_x64_vs110.sln | 74 +- .../File2Page/File2Page_x64_vs110.vcxproj | 610 +- .../File2Page_x64_vs110.vcxproj.filters | 30 +- PageCompiler/PageCompiler_vs110.sln | 74 +- PageCompiler/PageCompiler_vs110.vcxproj | 640 +-- .../PageCompiler_vs110.vcxproj.filters | 110 +- PageCompiler/PageCompiler_x64_vs110.sln | 74 +- PageCompiler/PageCompiler_x64_vs110.vcxproj | 640 +-- .../PageCompiler_x64_vs110.vcxproj.filters | 110 +- .../HTTPTimeServer_vs110.vcxproj | 624 +- .../HTTPTimeServer_vs110.vcxproj.filters | 62 +- .../HTTPTimeServer_x64_vs110.vcxproj | 624 +- .../HTTPTimeServer_x64_vs110.vcxproj.filters | 62 +- PageCompiler/samples/samples_vs110.sln | 74 +- PageCompiler/samples/samples_x64_vs110.sln | 74 +- PocoDoc/PocoDoc_vs110.sln | 74 +- PocoDoc/PocoDoc_vs110.vcxproj | 618 +- PocoDoc/PocoDoc_vs110.vcxproj.filters | 70 +- PocoDoc/PocoDoc_x64_vs110.sln | 74 +- PocoDoc/PocoDoc_x64_vs110.vcxproj | 618 +- PocoDoc/PocoDoc_x64_vs110.vcxproj.filters | 70 +- ProGen/ProGen_vs110.sln | 74 +- ProGen/ProGen_vs110.vcxproj | 624 +- ProGen/ProGen_vs110.vcxproj.filters | 62 +- ProGen/ProGen_x64_vs110.sln | 74 +- ProGen/ProGen_x64_vs110.vcxproj | 624 +- ProGen/ProGen_x64_vs110.vcxproj.filters | 62 +- Util/Util_vs110.sln | 120 +- Util/Util_vs110.vcxproj | 706 +-- Util/Util_vs110.vcxproj.filters | 502 +- Util/Util_x64_vs110.sln | 120 +- Util/Util_x64_vs110.vcxproj | 702 +-- Util/Util_x64_vs110.vcxproj.filters | 502 +- Util/include/Poco/Util/JSONConfiguration.h | 314 +- .../samples/SampleApp/SampleApp_vs110.vcxproj | 616 +- .../SampleApp/SampleApp_vs110.vcxproj.filters | 40 +- .../SampleApp/SampleApp_x64_vs110.vcxproj | 616 +- .../SampleApp_x64_vs110.vcxproj.filters | 40 +- .../SampleServer/SampleServer_vs110.vcxproj | 610 +- .../SampleServer_vs110.vcxproj.filters | 30 +- .../SampleServer_x64_vs110.vcxproj | 610 +- .../SampleServer_x64_vs110.vcxproj.filters | 30 +- Util/samples/Units/Units_CE_vs90.vcproj | 936 +-- Util/samples/Units/Units_vs100.vcxproj | 598 +- .../samples/Units/Units_vs100.vcxproj.filters | 30 +- Util/samples/Units/Units_vs110.vcxproj | 610 +- .../samples/Units/Units_vs110.vcxproj.filters | 30 +- Util/samples/Units/Units_vs71.vcproj | 790 +-- Util/samples/Units/Units_vs80.vcproj | 870 +-- Util/samples/Units/Units_vs90.vcproj | 870 +-- Util/samples/Units/Units_x64_vs100.vcxproj | 598 +- .../Units/Units_x64_vs100.vcxproj.filters | 30 +- Util/samples/Units/Units_x64_vs110.vcxproj | 610 +- .../Units/Units_x64_vs110.vcxproj.filters | 30 +- Util/samples/Units/Units_x64_vs90.vcproj | 870 +-- Util/samples/Units/src/Units.cpp | 231 +- Util/samples/pkill/pkill_vs110.vcxproj | 610 +- .../samples/pkill/pkill_vs110.vcxproj.filters | 24 +- Util/samples/pkill/pkill_x64_vs110.vcxproj | 610 +- .../pkill/pkill_x64_vs110.vcxproj.filters | 24 +- Util/samples/samples_vs110.sln | 194 +- Util/samples/samples_x64_vs110.sln | 194 +- Util/src/JSONConfiguration.cpp | 764 +-- Util/testsuite/TestSuite_vs110.vcxproj | 730 +-- .../testsuite/TestSuite_vs110.vcxproj.filters | 442 +- Util/testsuite/TestSuite_x64_vs110.vcxproj | 730 +-- .../TestSuite_x64_vs110.vcxproj.filters | 442 +- Util/testsuite/src/JSONConfigurationTest.cpp | 258 +- XML/XML_vs110.sln | 120 +- XML/XML_vs110.vcxproj | 906 +-- XML/XML_vs110.vcxproj.filters | 1024 ++-- XML/XML_x64_vs110.sln | 120 +- XML/XML_x64_vs110.vcxproj | 902 +-- XML/XML_x64_vs110.vcxproj.filters | 1024 ++-- XML/samples/DOMParser/DOMParser_vs110.vcxproj | 610 +- .../DOMParser/DOMParser_vs110.vcxproj.filters | 30 +- .../DOMParser/DOMParser_x64_vs110.vcxproj | 610 +- .../DOMParser_x64_vs110.vcxproj.filters | 30 +- XML/samples/DOMWriter/DOMWriter_vs110.vcxproj | 610 +- .../DOMWriter/DOMWriter_vs110.vcxproj.filters | 30 +- .../DOMWriter/DOMWriter_x64_vs110.vcxproj | 610 +- .../DOMWriter_x64_vs110.vcxproj.filters | 30 +- .../PrettyPrint/PrettyPrint_vs110.vcxproj | 610 +- .../PrettyPrint_vs110.vcxproj.filters | 30 +- .../PrettyPrint/PrettyPrint_x64_vs110.vcxproj | 610 +- .../PrettyPrint_x64_vs110.vcxproj.filters | 30 +- XML/samples/SAXParser/SAXParser_vs110.vcxproj | 610 +- .../SAXParser/SAXParser_vs110.vcxproj.filters | 30 +- .../SAXParser/SAXParser_x64_vs110.vcxproj | 610 +- .../SAXParser_x64_vs110.vcxproj.filters | 30 +- XML/samples/samples_vs110.sln | 194 +- XML/samples/samples_x64_vs110.sln | 194 +- XML/testsuite/TestSuite_vs110.vcxproj | 710 +-- XML/testsuite/TestSuite_vs110.vcxproj.filters | 346 +- XML/testsuite/TestSuite_x64_vs110.vcxproj | 710 +-- .../TestSuite_x64_vs110.vcxproj.filters | 346 +- Zip/Zip_vs110.sln | 120 +- Zip/Zip_vs110.vcxproj | 658 +-- Zip/Zip_vs110.vcxproj.filters | 328 +- Zip/Zip_x64_vs110.sln | 120 +- Zip/Zip_x64_vs110.vcxproj | 654 +-- Zip/Zip_x64_vs110.vcxproj.filters | 328 +- Zip/samples/samples_vs110.sln | 114 +- Zip/samples/samples_x64_vs110.sln | 114 +- Zip/samples/unzip/unzip_vs110.vcxproj | 610 +- Zip/samples/unzip/unzip_vs110.vcxproj.filters | 30 +- Zip/samples/unzip/unzip_x64_vs110.vcxproj | 610 +- .../unzip/unzip_x64_vs110.vcxproj.filters | 30 +- Zip/samples/zip/zip_vs110.vcxproj | 610 +- Zip/samples/zip/zip_vs110.vcxproj.filters | 24 +- Zip/samples/zip/zip_x64_vs110.vcxproj | 610 +- Zip/samples/zip/zip_x64_vs110.vcxproj.filters | 24 +- Zip/testsuite/TestSuite_vs110.vcxproj | 646 +-- Zip/testsuite/TestSuite_vs110.vcxproj.filters | 118 +- Zip/testsuite/TestSuite_x64_vs110.vcxproj | 646 +-- .../TestSuite_x64_vs110.vcxproj.filters | 118 +- build_cmake.cmd | 38 +- 620 files changed, 132030 insertions(+), 131992 deletions(-) diff --git a/ApacheConnector/ApacheConnector_vs110.sln b/ApacheConnector/ApacheConnector_vs110.sln index 33a6d2aeb..154d50ab5 100644 --- a/ApacheConnector/ApacheConnector_vs110.sln +++ b/ApacheConnector/ApacheConnector_vs110.sln @@ -1,21 +1,21 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheConnector_vs110.vcxproj", "{9866EE28-0612-4746-BD35-3B15B0AF7267}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.Build.0 = release_shared|Win32 - {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.Deploy.0 = release_shared|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheConnector_vs110.vcxproj", "{9866EE28-0612-4746-BD35-3B15B0AF7267}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.Build.0 = release_shared|Win32 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.Deploy.0 = release_shared|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ApacheConnector/ApacheConnector_vs110.vcxproj b/ApacheConnector/ApacheConnector_vs110.vcxproj index 7c8a1abf2..daf278cd4 100644 --- a/ApacheConnector/ApacheConnector_vs110.vcxproj +++ b/ApacheConnector/ApacheConnector_vs110.vcxproj @@ -1,135 +1,135 @@ - - - - - debug_shared - Win32 - - - release_shared - Win32 - - - - ApacheConnector - {9866EE28-0612-4746-BD35-3B15B0AF7267} - ApacheConnector - Win32Proj - - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - mod_pocod - mod_poco - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - ..\bin\mod_pocod.dll - true - true - ..\bin\mod_pocod.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\mod_pocod.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - ..\bin\mod_poco.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\mod_poco.lib - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + release_shared + Win32 + + + + ApacheConnector + {9866EE28-0612-4746-BD35-3B15B0AF7267} + ApacheConnector + Win32Proj + + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + mod_pocod + mod_poco + + + + Disabled + .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + ..\bin\mod_pocod.dll + true + true + ..\bin\mod_pocod.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\mod_pocod.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + ..\bin\mod_poco.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\mod_poco.lib + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ApacheConnector/ApacheConnector_vs110.vcxproj.filters b/ApacheConnector/ApacheConnector_vs110.vcxproj.filters index 50f8c7efa..28f1e219d 100644 --- a/ApacheConnector/ApacheConnector_vs110.vcxproj.filters +++ b/ApacheConnector/ApacheConnector_vs110.vcxproj.filters @@ -1,57 +1,57 @@ - - - - - {bcfcc66b-9862-4e2e-a0b5-8fd70d179069} - - - {8a381554-1ddd-46c8-b39c-998aff696f9e} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {bcfcc66b-9862-4e2e-a0b5-8fd70d179069} + + + {8a381554-1ddd-46c8-b39c-998aff696f9e} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/ApacheConnector/ApacheConnector_x64_vs110.sln b/ApacheConnector/ApacheConnector_x64_vs110.sln index 64cc9d3fc..445374ca0 100644 --- a/ApacheConnector/ApacheConnector_x64_vs110.sln +++ b/ApacheConnector/ApacheConnector_x64_vs110.sln @@ -1,21 +1,21 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheConnector_x64_vs110.vcxproj", "{9866EE28-0612-4746-BD35-3B15B0AF7267}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.Build.0 = debug_shared|x64 - {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.ActiveCfg = release_shared|x64 - {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.Build.0 = release_shared|x64 - {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.Deploy.0 = release_shared|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheConnector_x64_vs110.vcxproj", "{9866EE28-0612-4746-BD35-3B15B0AF7267}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.Build.0 = debug_shared|x64 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.ActiveCfg = release_shared|x64 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.Build.0 = release_shared|x64 + {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.Deploy.0 = release_shared|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ApacheConnector/ApacheConnector_x64_vs110.vcxproj b/ApacheConnector/ApacheConnector_x64_vs110.vcxproj index 65c427261..6601aa7e3 100644 --- a/ApacheConnector/ApacheConnector_x64_vs110.vcxproj +++ b/ApacheConnector/ApacheConnector_x64_vs110.vcxproj @@ -1,135 +1,135 @@ - - - - - debug_shared - x64 - - - release_shared - x64 - - - - ApacheConnector - {9866EE28-0612-4746-BD35-3B15B0AF7267} - ApacheConnector - Win32Proj - - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - mod_poco64d - mod_poco64 - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - ..\bin64\mod_poco64d.dll - true - true - ..\bin64\mod_poco64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\mod_pocod.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - ..\bin64\mod_poco64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\mod_poco.lib - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + release_shared + x64 + + + + ApacheConnector + {9866EE28-0612-4746-BD35-3B15B0AF7267} + ApacheConnector + Win32Proj + + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + mod_poco64d + mod_poco64 + + + + Disabled + .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + ..\bin64\mod_poco64d.dll + true + true + ..\bin64\mod_poco64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\mod_pocod.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + ..\bin64\mod_poco64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\mod_poco.lib + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.filters b/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.filters index 179bdaac0..1297e7b77 100644 --- a/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.filters +++ b/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.filters @@ -1,57 +1,57 @@ - - - - - {57457cff-8b1a-4dbc-9f41-a4e0cbb23577} - - - {4c3f92e0-ae8b-4e62-a48a-e1555236766c} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {57457cff-8b1a-4dbc-9f41-a4e0cbb23577} + + + {4c3f92e0-ae8b-4e62-a48a-e1555236766c} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj b/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj index c0fa1cfd5..a1dd22da6 100644 --- a/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj +++ b/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj @@ -1,117 +1,117 @@ - - - - - debug_shared - Win32 - - - release_shared - Win32 - - - - FormServer - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106} - FormServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - FormServerd - FormServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - bin\FormServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\FormServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - bin\FormServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + release_shared + Win32 + + + + FormServer + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106} + FormServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + FormServerd + FormServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin\FormServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\FormServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin\FormServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.filters b/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.filters index ed566d46a..3831b4543 100644 --- a/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.filters +++ b/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.filters @@ -1,17 +1,17 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {f04495ba-92b9-4f76-9a8b-320a860f09f6} - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {f04495ba-92b9-4f76-9a8b-320a860f09f6} + + + + + Source Files + + \ No newline at end of file diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj b/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj index c10fd20d6..aa3ad0c98 100644 --- a/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj +++ b/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj @@ -1,117 +1,117 @@ - - - - - debug_shared - x64 - - - release_shared - x64 - - - - FormServer - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106} - FormServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - FormServerd - FormServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - bin64\FormServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\FormServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - bin64\FormServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + release_shared + x64 + + + + FormServer + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106} + FormServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + FormServerd + FormServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin64\FormServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\FormServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin64\FormServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.filters b/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.filters index 204b3f096..26866cd09 100644 --- a/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.filters +++ b/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.filters @@ -1,17 +1,17 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {cf61aa07-a25d-472f-8e40-4dfb7177eee9} - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {cf61aa07-a25d-472f-8e40-4dfb7177eee9} + + + + + Source Files + + \ No newline at end of file diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj b/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj index 54f1538a4..159fa5f81 100644 --- a/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj +++ b/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj @@ -1,117 +1,117 @@ - - - - - debug_shared - Win32 - - - release_shared - Win32 - - - - TimeServer - {59EDFD20-9968-30F7-9532-44C08DA58C6E} - TimeServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - TimeServerd - TimeServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - bin\TimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - bin\TimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + release_shared + Win32 + + + + TimeServer + {59EDFD20-9968-30F7-9532-44C08DA58C6E} + TimeServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + TimeServerd + TimeServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin\TimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin\TimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.filters b/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.filters index d3d6cc291..bc1ba1391 100644 --- a/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.filters +++ b/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.filters @@ -1,17 +1,17 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {6b63f475-55cd-49a0-bcea-bcf2786135f0} - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {6b63f475-55cd-49a0-bcea-bcf2786135f0} + + + + + Source Files + + \ No newline at end of file diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj index 6f342647b..d0cf80303 100644 --- a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj +++ b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj @@ -1,117 +1,117 @@ - - - - - debug_shared - x64 - - - release_shared - x64 - - - - TimeServer - {59EDFD20-9968-30F7-9532-44C08DA58C6E} - TimeServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - TimeServerd - TimeServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - bin64\TimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) - bin64\TimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + release_shared + x64 + + + + TimeServer + {59EDFD20-9968-30F7-9532-44C08DA58C6E} + TimeServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + TimeServerd + TimeServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin64\TimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies) + bin64\TimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters index 21b2a1d88..55f11c915 100644 --- a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters +++ b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters @@ -1,17 +1,17 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {48644633-75a0-496d-a852-1916511051e0} - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {48644633-75a0-496d-a852-1916511051e0} + + + + + Source Files + + \ No newline at end of file diff --git a/ApacheConnector/samples/samples_vs110.sln b/ApacheConnector/samples/samples_vs110.sln index c46fd393d..9b37709bf 100644 --- a/ApacheConnector/samples/samples_vs110.sln +++ b/ApacheConnector/samples/samples_vs110.sln @@ -1,29 +1,29 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormServer", "FormServer\FormServer_vs110.vcxproj", "{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_vs110.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.Build.0 = release_shared|Win32 - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Build.0 = release_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Deploy.0 = release_shared|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormServer", "FormServer\FormServer_vs110.vcxproj", "{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_vs110.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.Build.0 = release_shared|Win32 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Build.0 = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Deploy.0 = release_shared|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ApacheConnector/samples/samples_x64_vs110.sln b/ApacheConnector/samples/samples_x64_vs110.sln index b4b8d8d79..218154d33 100644 --- a/ApacheConnector/samples/samples_x64_vs110.sln +++ b/ApacheConnector/samples/samples_x64_vs110.sln @@ -1,29 +1,29 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormServer", "FormServer\FormServer_x64_vs110.vcxproj", "{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_x64_vs110.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.Build.0 = debug_shared|x64 - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.ActiveCfg = release_shared|x64 - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.Build.0 = release_shared|x64 - {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.Deploy.0 = release_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Build.0 = debug_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.ActiveCfg = release_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Build.0 = release_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Deploy.0 = release_shared|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormServer", "FormServer\FormServer_x64_vs110.vcxproj", "{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_x64_vs110.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.Build.0 = debug_shared|x64 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.ActiveCfg = release_shared|x64 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.Build.0 = release_shared|x64 + {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.Deploy.0 = release_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Build.0 = debug_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.ActiveCfg = release_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Build.0 = release_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Deploy.0 = release_shared|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/CppParser/CppParser_CE_vs90.sln b/CppParser/CppParser_CE_vs90.sln index b7d813149..dd3da033e 100644 --- a/CppParser/CppParser_CE_vs90.sln +++ b/CppParser/CppParser_CE_vs90.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_CE_vs90.vcproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_CE_vs90.vcproj", "{C79112BD-EC91-11DA-A4CE-005056C00008}" - ProjectSection(ProjectDependencies) = postProject - {C77B9D92-EC91-11DA-A4CE-005056C00008} = {C77B9D92-EC91-11DA-A4CE-005056C00008} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) - release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) - debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) - release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) - debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) - release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_CE_vs90.vcproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_CE_vs90.vcproj", "{C79112BD-EC91-11DA-A4CE-005056C00008}" + ProjectSection(ProjectDependencies) = postProject + {C77B9D92-EC91-11DA-A4CE-005056C00008} = {C77B9D92-EC91-11DA-A4CE-005056C00008} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) + release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) + debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) + release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) + debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) + release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/CppParser/CppParser_CE_vs90.vcproj b/CppParser/CppParser_CE_vs90.vcproj index 432c02c3e..27bed8550 100644 --- a/CppParser/CppParser_CE_vs90.vcproj +++ b/CppParser/CppParser_CE_vs90.vcproj @@ -1,530 +1,530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CppParser/CppParser_vs110.sln b/CppParser/CppParser_vs110.sln index ef458f0ca..e09fcdca9 100644 --- a/CppParser/CppParser_vs110.sln +++ b/CppParser/CppParser_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_vs110.vcxproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{C79112BD-EC91-11DA-A4CE-005056C00008}" - ProjectSection(ProjectDependencies) = postProject - {C77B9D92-EC91-11DA-A4CE-005056C00008} = {C77B9D92-EC91-11DA-A4CE-005056C00008} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Build.0 = release_shared|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Build.0 = release_shared|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_vs110.vcxproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{C79112BD-EC91-11DA-A4CE-005056C00008}" + ProjectSection(ProjectDependencies) = postProject + {C77B9D92-EC91-11DA-A4CE-005056C00008} = {C77B9D92-EC91-11DA-A4CE-005056C00008} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Build.0 = release_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Build.0 = release_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/CppParser/CppParser_vs110.vcxproj b/CppParser/CppParser_vs110.vcxproj index 3bdebac15..b49e01a4f 100644 --- a/CppParser/CppParser_vs110.vcxproj +++ b/CppParser/CppParser_vs110.vcxproj @@ -1,316 +1,316 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - CppParser - {C77B9D92-EC91-11DA-A4CE-005056C00008} - CppParser - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoCppParserd - PocoCppParsermdd - PocoCppParsermtd - PocoCppParser - PocoCppParsermd - PocoCppParsermt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoCppParserd.dll - true - true - ..\bin\PocoCppParserd.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoCppParserd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoCppParser.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoCppParser.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoCppParsermtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoCppParsermtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoCppParsermt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoCppParsermdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoCppParsermdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoCppParsermd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\lib\PocoCppParsermd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + CppParser + {C77B9D92-EC91-11DA-A4CE-005056C00008} + CppParser + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoCppParserd + PocoCppParsermdd + PocoCppParsermtd + PocoCppParser + PocoCppParsermd + PocoCppParsermt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoCppParserd.dll + true + true + ..\bin\PocoCppParserd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCppParserd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoCppParser.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCppParser.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoCppParsermtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoCppParsermtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoCppParsermt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoCppParsermdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoCppParsermdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoCppParsermd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\lib\PocoCppParsermd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CppParser/CppParser_vs110.vcxproj.filters b/CppParser/CppParser_vs110.vcxproj.filters index 00e98c6c7..43db4928e 100644 --- a/CppParser/CppParser_vs110.vcxproj.filters +++ b/CppParser/CppParser_vs110.vcxproj.filters @@ -1,141 +1,141 @@ - - - - - {cbc61880-2fcb-4c75-80cc-e49543522474} - - - {5c023da7-8192-46c0-afd0-befffaa493b7} - - - {ad5d25e9-fad4-432f-b697-36e1a3314b40} - - - {636ad43b-5fe3-4edf-9b7b-2581ef8c87fa} - - - {3b40acd4-2766-4dd5-840e-273c3d5936a8} - - - {8e2c1098-1177-4d3b-9bf5-0e8f37aa9c6e} - - - {288a9d31-0b85-431a-86d0-8e1c74271041} - - - {c529b477-caa5-4703-abfe-4f36171bad69} - - - {13164377-cd24-4ea0-af3f-8f6c8ae5f456} - - - - - CppParser\Header Files - - - CppParser\Header Files - - - CppParser\Header Files - - - CppParser\Header Files - - - CppParser\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Attributes\Header Files - - - Attributes\Header Files - - - - - CppParser\Source Files - - - CppParser\Source Files - - - CppParser\Source Files - - - CppParser\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Attributes\Source Files - - - Attributes\Source Files - - + + + + + {cbc61880-2fcb-4c75-80cc-e49543522474} + + + {5c023da7-8192-46c0-afd0-befffaa493b7} + + + {ad5d25e9-fad4-432f-b697-36e1a3314b40} + + + {636ad43b-5fe3-4edf-9b7b-2581ef8c87fa} + + + {3b40acd4-2766-4dd5-840e-273c3d5936a8} + + + {8e2c1098-1177-4d3b-9bf5-0e8f37aa9c6e} + + + {288a9d31-0b85-431a-86d0-8e1c74271041} + + + {c529b477-caa5-4703-abfe-4f36171bad69} + + + {13164377-cd24-4ea0-af3f-8f6c8ae5f456} + + + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Attributes\Header Files + + + Attributes\Header Files + + + + + CppParser\Source Files + + + CppParser\Source Files + + + CppParser\Source Files + + + CppParser\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Attributes\Source Files + + + Attributes\Source Files + + \ No newline at end of file diff --git a/CppParser/CppParser_x64_vs110.sln b/CppParser/CppParser_x64_vs110.sln index d8d6a95c8..7ce4d4958 100644 --- a/CppParser/CppParser_x64_vs110.sln +++ b/CppParser/CppParser_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_x64_vs110.vcxproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{C79112BD-EC91-11DA-A4CE-005056C00008}" - ProjectSection(ProjectDependencies) = postProject - {C77B9D92-EC91-11DA-A4CE-005056C00008} = {C77B9D92-EC91-11DA-A4CE-005056C00008} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Build.0 = debug_shared|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.ActiveCfg = release_shared|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Build.0 = release_shared|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Deploy.0 = release_shared|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64 - {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Build.0 = debug_shared|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.ActiveCfg = release_shared|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Build.0 = release_shared|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Deploy.0 = release_shared|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64 - {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_x64_vs110.vcxproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{C79112BD-EC91-11DA-A4CE-005056C00008}" + ProjectSection(ProjectDependencies) = postProject + {C77B9D92-EC91-11DA-A4CE-005056C00008} = {C77B9D92-EC91-11DA-A4CE-005056C00008} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Build.0 = debug_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.ActiveCfg = release_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Build.0 = release_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Deploy.0 = release_shared|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64 + {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Build.0 = debug_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.ActiveCfg = release_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Build.0 = release_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Deploy.0 = release_shared|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64 + {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/CppParser/CppParser_x64_vs110.vcxproj b/CppParser/CppParser_x64_vs110.vcxproj index e389aa452..2ba868a4f 100644 --- a/CppParser/CppParser_x64_vs110.vcxproj +++ b/CppParser/CppParser_x64_vs110.vcxproj @@ -1,314 +1,314 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - CppParser - {C77B9D92-EC91-11DA-A4CE-005056C00008} - CppParser - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoCppParser64d - PocoCppParsermdd - PocoCppParsermtd - PocoCppParser64 - PocoCppParsermd - PocoCppParsermt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoCppParser64d.dll - true - true - ..\bin64\PocoCppParser64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoCppParserd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoCppParser64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoCppParser.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoCppParsermtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoCppParsermtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoCppParsermt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoCppParsermdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoCppParsermdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoCppParsermd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + CppParser + {C77B9D92-EC91-11DA-A4CE-005056C00008} + CppParser + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoCppParser64d + PocoCppParsermdd + PocoCppParsermtd + PocoCppParser64 + PocoCppParsermd + PocoCppParsermt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoCppParser64d.dll + true + true + ..\bin64\PocoCppParser64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCppParserd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CppParser_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoCppParser64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCppParser.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoCppParsermtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoCppParsermtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoCppParsermt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoCppParsermdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoCppParsermdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoCppParsermd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CppParser/CppParser_x64_vs110.vcxproj.filters b/CppParser/CppParser_x64_vs110.vcxproj.filters index d24046603..e206f04ae 100644 --- a/CppParser/CppParser_x64_vs110.vcxproj.filters +++ b/CppParser/CppParser_x64_vs110.vcxproj.filters @@ -1,141 +1,141 @@ - - - - - {e8760673-d3b5-471c-bc85-70cf7f616fb2} - - - {af3f9c0e-e8f0-479b-8cad-7a047e43c766} - - - {89a1f718-71d9-45a4-aa0d-311566519b5e} - - - {9c1279a9-0da5-4d1b-9c0a-9b46495e3e1f} - - - {b668a5a4-b633-4bb5-92dc-06300d8d2751} - - - {1323e338-edb5-44a6-98d9-a89a8134014e} - - - {f8209c51-044b-4146-88ff-5d794f593de5} - - - {2b99f023-a1d6-4eeb-a240-2a15ee2df0e0} - - - {bfc33f86-8333-42da-9d6b-278944f30ed5} - - - - - CppParser\Header Files - - - CppParser\Header Files - - - CppParser\Header Files - - - CppParser\Header Files - - - CppParser\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Symbol Table\Header Files - - - Attributes\Header Files - - - Attributes\Header Files - - - - - CppParser\Source Files - - - CppParser\Source Files - - - CppParser\Source Files - - - CppParser\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Symbol Table\Source Files - - - Attributes\Source Files - - - Attributes\Source Files - - + + + + + {e8760673-d3b5-471c-bc85-70cf7f616fb2} + + + {af3f9c0e-e8f0-479b-8cad-7a047e43c766} + + + {89a1f718-71d9-45a4-aa0d-311566519b5e} + + + {9c1279a9-0da5-4d1b-9c0a-9b46495e3e1f} + + + {b668a5a4-b633-4bb5-92dc-06300d8d2751} + + + {1323e338-edb5-44a6-98d9-a89a8134014e} + + + {f8209c51-044b-4146-88ff-5d794f593de5} + + + {2b99f023-a1d6-4eeb-a240-2a15ee2df0e0} + + + {bfc33f86-8333-42da-9d6b-278944f30ed5} + + + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + CppParser\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Symbol Table\Header Files + + + Attributes\Header Files + + + Attributes\Header Files + + + + + CppParser\Source Files + + + CppParser\Source Files + + + CppParser\Source Files + + + CppParser\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Symbol Table\Source Files + + + Attributes\Source Files + + + Attributes\Source Files + + \ No newline at end of file diff --git a/CppParser/testsuite/TestSuite_vs110.vcxproj b/CppParser/testsuite/TestSuite_vs110.vcxproj index 56d9ef95d..7370f4755 100644 --- a/CppParser/testsuite/TestSuite_vs110.vcxproj +++ b/CppParser/testsuite/TestSuite_vs110.vcxproj @@ -1,323 +1,323 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {C79112BD-EC91-11DA-A4CE-005056C00008} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {C79112BD-EC91-11DA-A4CE-005056C00008} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + diff --git a/CppParser/testsuite/TestSuite_vs110.vcxproj.filters b/CppParser/testsuite/TestSuite_vs110.vcxproj.filters index acab12dfc..df376710e 100644 --- a/CppParser/testsuite/TestSuite_vs110.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,69 +1,69 @@ - - - - - {c2d8a893-61d3-4132-b317-ff36a7e20535} - - - {95cc765b-6dad-470c-8c7c-8c202a6323ae} - - - {0384dc65-40de-4790-8731-6ddf3839a925} - - - {0b753288-c05c-46bf-9153-f9448e4f8d00} - - - {8fd1136e-749d-456c-879e-ffef21863e5b} - - - {fc188f36-e257-4ef5-a14d-0ec12af48184} - - - {93c0f9c4-1ac9-4a8b-9f25-8808afbd5dd6} - - - {7b14afa7-908f-4934-a1ad-8e5c0605288d} - - - {da7c4f50-826b-46a4-a3d4-d7777b1ce2d2} - - - {04a55c6d-7896-42b3-8b5f-3804087bba01} - - - {347a4842-0d74-484e-bee0-19c8b2875eab} - - - - - CppParser\Header Files - - - _Suite\Header Files - - - Attributes\Header Files - - - Attributes\Header Files - - - - - CppParser\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - Attributes\Source Files - - - Attributes\Source Files - - + + + + + {c2d8a893-61d3-4132-b317-ff36a7e20535} + + + {95cc765b-6dad-470c-8c7c-8c202a6323ae} + + + {0384dc65-40de-4790-8731-6ddf3839a925} + + + {0b753288-c05c-46bf-9153-f9448e4f8d00} + + + {8fd1136e-749d-456c-879e-ffef21863e5b} + + + {fc188f36-e257-4ef5-a14d-0ec12af48184} + + + {93c0f9c4-1ac9-4a8b-9f25-8808afbd5dd6} + + + {7b14afa7-908f-4934-a1ad-8e5c0605288d} + + + {da7c4f50-826b-46a4-a3d4-d7777b1ce2d2} + + + {04a55c6d-7896-42b3-8b5f-3804087bba01} + + + {347a4842-0d74-484e-bee0-19c8b2875eab} + + + + + CppParser\Header Files + + + _Suite\Header Files + + + Attributes\Header Files + + + Attributes\Header Files + + + + + CppParser\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + Attributes\Source Files + + + Attributes\Source Files + + \ No newline at end of file diff --git a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj index b01b7070c..09d256ada 100644 --- a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,323 +1,323 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {C79112BD-EC91-11DA-A4CE-005056C00008} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {C79112BD-EC91-11DA-A4CE-005056C00008} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + diff --git a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters index 25e27cbd6..9341c8e03 100644 --- a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,69 +1,69 @@ - - - - - {82f5027e-61f8-4e6d-a470-c5e91d140f81} - - - {b93eaa5d-c641-4928-873a-f6cbc02621f6} - - - {0061af94-0f93-4cd1-b824-e5c1db64868e} - - - {bd6b7d7e-37d2-4ba0-a787-a7092c6f824d} - - - {1ca511c5-0146-42d3-9b0b-11021b879fda} - - - {7baa2435-8866-46b7-a884-8d301377714f} - - - {80ddb1c9-11f7-4171-95e3-235031bb0a9b} - - - {f5372bb6-7624-4554-86bf-26fcd8439e9f} - - - {296fab82-e5e1-4269-858a-f60bffb23a74} - - - {6473d1d6-398a-4ba8-ab8c-c1e3918939d1} - - - {e0cc863a-dea0-41c5-bd81-761a1123ad2d} - - - - - CppParser\Header Files - - - _Suite\Header Files - - - Attributes\Header Files - - - Attributes\Header Files - - - - - CppParser\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - Attributes\Source Files - - - Attributes\Source Files - - + + + + + {82f5027e-61f8-4e6d-a470-c5e91d140f81} + + + {b93eaa5d-c641-4928-873a-f6cbc02621f6} + + + {0061af94-0f93-4cd1-b824-e5c1db64868e} + + + {bd6b7d7e-37d2-4ba0-a787-a7092c6f824d} + + + {1ca511c5-0146-42d3-9b0b-11021b879fda} + + + {7baa2435-8866-46b7-a884-8d301377714f} + + + {80ddb1c9-11f7-4171-95e3-235031bb0a9b} + + + {f5372bb6-7624-4554-86bf-26fcd8439e9f} + + + {296fab82-e5e1-4269-858a-f60bffb23a74} + + + {6473d1d6-398a-4ba8-ab8c-c1e3918939d1} + + + {e0cc863a-dea0-41c5-bd81-761a1123ad2d} + + + + + CppParser\Header Files + + + _Suite\Header Files + + + Attributes\Header Files + + + Attributes\Header Files + + + + + CppParser\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + Attributes\Source Files + + + Attributes\Source Files + + \ No newline at end of file diff --git a/CppUnit/CppUnit_vs110.sln b/CppUnit/CppUnit_vs110.sln index 303045118..299cae3b9 100644 --- a/CppUnit/CppUnit_vs110.sln +++ b/CppUnit/CppUnit_vs110.sln @@ -1,46 +1,46 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs110.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Build.0 = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs110.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_shared|Win32 = release_shared|Win32 + release_static_md|Win32 = release_static_md|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Build.0 = release_shared|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/CppUnit/CppUnit_vs110.vcxproj b/CppUnit/CppUnit_vs110.vcxproj index c3f2219bf..7faac0b47 100644 --- a/CppUnit/CppUnit_vs110.vcxproj +++ b/CppUnit/CppUnit_vs110.vcxproj @@ -1,415 +1,415 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - CppUnit - {138BB448-808A-4FE5-A66D-78D1F8770F59} - MFCProj - - - - StaticLibrary - false - MultiByte - v110 - - - StaticLibrary - false - MultiByte - v110 - - - StaticLibrary - false - MultiByte - v110 - - - StaticLibrary - false - MultiByte - v110 - - - DynamicLibrary - false - MultiByte - v110 - - - DynamicLibrary - false - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - CppUnitd - CppUnit - CppUnitmdd - CppUnitmtd - CppUnitmd - CppUnitmt - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - $(IntDir)vc80.pdb - Level3 - true - EditAndContinue - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - NotSet - ..\bin\CppUnitd.dll - true - %(AdditionalLibraryDirectories) - true - ..\bin\CppUnitd.pdb - ..\lib\CppUnitd.lib - MachineX86 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\bin\CppUnit.dll - true - %(AdditionalLibraryDirectories) - - - ..\lib\CppUnit.lib - MachineX86 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib\CppUnitmdd.pdb - Level3 - true - EditAndContinue - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\CppUnitmdd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\CppUnitmd.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\lib\CppUnitmtd.pdb - Level3 - true - EditAndContinue - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\CppUnitmtd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\CppUnit.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib\CppUnitmt.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + CppUnit + {138BB448-808A-4FE5-A66D-78D1F8770F59} + MFCProj + + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + DynamicLibrary + false + MultiByte + v110 + + + DynamicLibrary + false + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + CppUnitd + CppUnit + CppUnitmdd + CppUnitmtd + CppUnitmd + CppUnitmt + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\CppUnit.tlb + + + + + Disabled + Default + false + include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + + + $(IntDir) + $(IntDir)vc80.pdb + Level3 + true + EditAndContinue + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + NotSet + ..\bin\CppUnitd.dll + true + %(AdditionalLibraryDirectories) + true + ..\bin\CppUnitd.pdb + ..\lib\CppUnitd.lib + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\CppUnit.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + ..\bin\CppUnit.dll + true + %(AdditionalLibraryDirectories) + + + ..\lib\CppUnit.lib + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\CppUnit.tlb + + + + + Disabled + Default + false + include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + + + $(IntDir) + ..\lib\CppUnitmdd.pdb + Level3 + true + EditAndContinue + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + ..\lib\CppUnitmdd.lib + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\CppUnit.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + ..\lib\CppUnitmd.lib + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\CppUnit.tlb + + + + + Disabled + Default + false + include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + + + $(IntDir) + ..\lib\CppUnitmtd.pdb + Level3 + true + EditAndContinue + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + ..\lib\CppUnitmtd.lib + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\CppUnit.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + ..\lib\CppUnitmt.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CppUnit/CppUnit_vs110.vcxproj.filters b/CppUnit/CppUnit_vs110.vcxproj.filters index 1618c2b0a..6ad984e0c 100644 --- a/CppUnit/CppUnit_vs110.vcxproj.filters +++ b/CppUnit/CppUnit_vs110.vcxproj.filters @@ -1,89 +1,89 @@ - - - - - {ce2987f4-05b4-4816-8402-83d6e2f8f80c} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {7c3a94cf-cfae-4dbe-8baf-b8a5a61faf48} - *.h - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - + + + + + {ce2987f4-05b4-4816-8402-83d6e2f8f80c} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {7c3a94cf-cfae-4dbe-8baf-b8a5a61faf48} + *.h + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + \ No newline at end of file diff --git a/CppUnit/CppUnit_x64_vs110.sln b/CppUnit/CppUnit_x64_vs110.sln index 793a32ec9..95dfac69c 100644 --- a/CppUnit/CppUnit_x64_vs110.sln +++ b/CppUnit/CppUnit_x64_vs110.sln @@ -1,49 +1,49 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_x64_vs110.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 - release_static_mt|x64 = release_static_mt|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.Build.0 = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.ActiveCfg = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.Build.0 = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.Build.0 = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.Build.0 = release_static_mt|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_x64_vs110.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" + ProjectSection(ProjectDependencies) = postProject + {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + debug_static_md|x64 = debug_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_shared|x64 = release_shared|x64 + release_static_md|x64 = release_static_md|x64 + release_static_mt|x64 = release_static_mt|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.Build.0 = debug_shared|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.ActiveCfg = release_shared|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.Build.0 = release_shared|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.Build.0 = release_static_md|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.Build.0 = release_static_mt|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/CppUnit/CppUnit_x64_vs110.vcxproj b/CppUnit/CppUnit_x64_vs110.vcxproj index 426bb621b..eea6ba8fc 100644 --- a/CppUnit/CppUnit_x64_vs110.vcxproj +++ b/CppUnit/CppUnit_x64_vs110.vcxproj @@ -1,415 +1,415 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - CppUnit - {138BB448-808A-4FE5-A66D-78D1F8770F59} - MFCProj - - - - StaticLibrary - false - MultiByte - v110 - - - StaticLibrary - false - MultiByte - v110 - - - StaticLibrary - false - MultiByte - v110 - - - StaticLibrary - false - MultiByte - v110 - - - DynamicLibrary - false - MultiByte - v110 - - - DynamicLibrary - false - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - CppUnit64d - CppUnitmdd - CppUnitmtd - CppUnit64 - CppUnit64md - CppUnit64mt - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - $(IntDir)vc80.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - NotSet - ..\bin64\CppUnit64d.dll - true - %(AdditionalLibraryDirectories) - true - ..\bin64\CppUnit64d.pdb - ..\lib64\CppUnitd.lib - MachineX64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\bin64\CppUnit64.dll - true - %(AdditionalLibraryDirectories) - - - ..\lib64\CppUnit.lib - MachineX64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\lib64\CppUnitmdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\CppUnitmdd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\CppUnitmd.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.tlb - - - - - Disabled - Default - false - include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\lib64\CppUnitmtd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\CppUnitmtd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\CppUnit.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c07 - - - ..\lib64\CppUnitmt.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + CppUnit + {138BB448-808A-4FE5-A66D-78D1F8770F59} + MFCProj + + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + DynamicLibrary + false + MultiByte + v110 + + + DynamicLibrary + false + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + CppUnit64d + CppUnitmdd + CppUnitmtd + CppUnit64 + CppUnit64md + CppUnit64mt + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\CppUnit.tlb + + + + + Disabled + Default + false + include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + + + $(IntDir) + $(IntDir)vc80.pdb + Level3 + true + ProgramDatabase + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + NotSet + ..\bin64\CppUnit64d.dll + true + %(AdditionalLibraryDirectories) + true + ..\bin64\CppUnit64d.pdb + ..\lib64\CppUnitd.lib + MachineX64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\CppUnit.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + ..\bin64\CppUnit64.dll + true + %(AdditionalLibraryDirectories) + + + ..\lib64\CppUnit.lib + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\CppUnit.tlb + + + + + Disabled + Default + false + include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + + + $(IntDir) + ..\lib64\CppUnitmdd.pdb + Level3 + true + ProgramDatabase + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + ..\lib64\CppUnitmdd.lib + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\CppUnit.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + ..\lib64\CppUnitmd.lib + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\CppUnit.tlb + + + + + Disabled + Default + false + include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + + + $(IntDir) + ..\lib64\CppUnitmtd.pdb + Level3 + true + ProgramDatabase + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + ..\lib64\CppUnitmtd.lib + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\CppUnit.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0c07 + + + ..\lib64\CppUnitmt.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CppUnit/CppUnit_x64_vs110.vcxproj.filters b/CppUnit/CppUnit_x64_vs110.vcxproj.filters index 8352bf40c..e0ea945ff 100644 --- a/CppUnit/CppUnit_x64_vs110.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs110.vcxproj.filters @@ -1,89 +1,89 @@ - - - - - {d780d541-ae9b-4dc6-9c70-cc0e5498be41} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {102c5e2b-3268-48b6-a3da-c96949868573} - *.h - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - + + + + + {d780d541-ae9b-4dc6-9c70-cc0e5498be41} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {102c5e2b-3268-48b6-a3da-c96949868573} + *.h + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj b/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj index 4f8b4057f..38c27e246 100644 --- a/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj +++ b/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj @@ -1,439 +1,439 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - WinTestRunner - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD} - WinTestRunner - MFCProj - - - - StaticLibrary - Static - MultiByte - v110 - - - StaticLibrary - Static - MultiByte - v110 - - - StaticLibrary - Dynamic - MultiByte - v110 - - - StaticLibrary - Dynamic - MultiByte - v110 - - - DynamicLibrary - Dynamic - MultiByte - v110 - - - DynamicLibrary - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\..\bin\ - obj\$(Configuration)\ - false - ..\..\bin\ - obj\$(Configuration)\ - true - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - WinTestRunnerd - WinTestRunnermdd - WinTestRunnermtd - WinTestRunner - WinTestRunnermd - WinTestRunnermt - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - cppunit.lib;winmm.lib;%(AdditionalDependencies) - ..\..\bin\WinTestRunner.dll - true - ..\..\lib;%(AdditionalLibraryDirectories) - - - Windows - ..\..\lib\WinTestRunner.lib - MachineX86 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - EditAndContinue - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - cppunitd.lib;winmm.lib;%(AdditionalDependencies) - NotSet - ..\..\bin\WinTestRunnerd.dll - true - ..\..\lib;%(AdditionalLibraryDirectories) - true - ..\..\bin\WinTestRunnerd.pdb - Windows - ..\..\lib\WinTestRunnerd.lib - MachineX86 - - - - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\..\lib\WinTestRunnermdd.pdb - Level3 - true - EditAndContinue - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermdd.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermd.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\..\lib\WinTestRunnermtd.pdb - Level3 - true - EditAndContinue - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermtd.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermt.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + WinTestRunner + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD} + WinTestRunner + MFCProj + + + + StaticLibrary + Static + MultiByte + v110 + + + StaticLibrary + Static + MultiByte + v110 + + + StaticLibrary + Dynamic + MultiByte + v110 + + + StaticLibrary + Dynamic + MultiByte + v110 + + + DynamicLibrary + Dynamic + MultiByte + v110 + + + DynamicLibrary + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\..\bin\ + obj\$(Configuration)\ + false + ..\..\bin\ + obj\$(Configuration)\ + true + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + WinTestRunnerd + WinTestRunnermdd + WinTestRunnermtd + WinTestRunner + WinTestRunnermd + WinTestRunnermt + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\wintestrunner.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0000 + + + cppunit.lib;winmm.lib;%(AdditionalDependencies) + ..\..\bin\WinTestRunner.dll + true + ..\..\lib;%(AdditionalLibraryDirectories) + + + Windows + ..\..\lib\WinTestRunner.lib + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\wintestrunner.tlb + + + + + Disabled + Default + false + include;..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + EditAndContinue + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0000 + + + cppunitd.lib;winmm.lib;%(AdditionalDependencies) + NotSet + ..\..\bin\WinTestRunnerd.dll + true + ..\..\lib;%(AdditionalLibraryDirectories) + true + ..\..\bin\WinTestRunnerd.pdb + Windows + ..\..\lib\WinTestRunnerd.lib + MachineX86 + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\wintestrunner.tlb + + + + + Disabled + Default + false + include;..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + + + $(IntDir) + ..\..\lib\WinTestRunnermdd.pdb + Level3 + true + EditAndContinue + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0000 + + + ..\..\lib\WinTestRunnermdd.lib + MachineX86 + + + Copying resources... + copy "$(IntDir)$(ProjectName).res" ..\..\lib\ + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\wintestrunner.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0000 + + + ..\..\lib\WinTestRunnermd.lib + MachineX86 + + + Copying resources... + copy "$(IntDir)$(ProjectName).res" ..\..\lib\ + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\wintestrunner.tlb + + + + + Disabled + Default + false + include;..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + + + $(IntDir) + ..\..\lib\WinTestRunnermtd.pdb + Level3 + true + EditAndContinue + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0000 + + + ..\..\lib\WinTestRunnermtd.lib + MachineX86 + + + Copying resources... + copy "$(IntDir)$(ProjectName).res" ..\..\lib\ + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib\wintestrunner.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0000 + + + ..\..\lib\WinTestRunnermt.lib + MachineX86 + + + Copying resources... + copy "$(IntDir)$(ProjectName).res" ..\..\lib\ + + + + + + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj.filters b/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj.filters index 070e77fdf..4f586ae3e 100644 --- a/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj.filters +++ b/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj.filters @@ -1,61 +1,61 @@ - - - - - {24a6f8c4-75a8-42be-afd6-586f23d02e79} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {8916ac8c-0791-483a-a494-0c7a0c9b6f8f} - *.h - - - {bcd6db0a-4bfb-4d8d-bf3b-efdbcc45d3b2} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Resource Files - - - - - Resource Files - - + + + + + {24a6f8c4-75a8-42be-afd6-586f23d02e79} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {8916ac8c-0791-483a-a494-0c7a0c9b6f8f} + *.h + + + {bcd6db0a-4bfb-4d8d-bf3b-efdbcc45d3b2} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Resource Files + + + + + Resource Files + + \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj b/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj index 0ab5a6da9..b64c1ab3f 100644 --- a/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj +++ b/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj @@ -1,439 +1,439 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - WinTestRunner - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD} - WinTestRunner - MFCProj - - - - StaticLibrary - Static - MultiByte - v110 - - - StaticLibrary - Static - MultiByte - v110 - - - StaticLibrary - Dynamic - MultiByte - v110 - - - StaticLibrary - Dynamic - MultiByte - v110 - - - DynamicLibrary - Dynamic - MultiByte - v110 - - - DynamicLibrary - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\..\bin64\ - obj64\$(Configuration)\ - false - ..\..\bin\ - obj64\$(Configuration)\ - true - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - WinTestRunner64d - WinTestRunnermdd - WinTestRunnermtd - WinTestRunner - WinTestRunnermd - WinTestRunnermt - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - cppunit.lib;winmm.lib;%(AdditionalDependencies) - ..\..\bin64\WinTestRunner64.dll - true - ..\..\lib64;%(AdditionalLibraryDirectories) - - - Windows - ..\..\lib64\WinTestRunner.lib - MachineX64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - cppunitd.lib;winmm.lib;%(AdditionalDependencies) - NotSet - ..\..\bin64\WinTestRunner64d.dll - true - ..\..\lib64;%(AdditionalLibraryDirectories) - true - ..\..\bin64\WinTestRunner64d.pdb - Windows - ..\..\lib64\WinTestRunnerd.lib - MachineX64 - - - - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\..\lib64\WinTestRunnermdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermdd.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermd.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\..\lib64\WinTestRunnermtd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermtd.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermt.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + WinTestRunner + {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD} + WinTestRunner + MFCProj + + + + StaticLibrary + Static + MultiByte + v110 + + + StaticLibrary + Static + MultiByte + v110 + + + StaticLibrary + Dynamic + MultiByte + v110 + + + StaticLibrary + Dynamic + MultiByte + v110 + + + DynamicLibrary + Dynamic + MultiByte + v110 + + + DynamicLibrary + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\..\bin64\ + obj64\$(Configuration)\ + false + ..\..\bin\ + obj64\$(Configuration)\ + true + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + WinTestRunner64d + WinTestRunnermdd + WinTestRunnermtd + WinTestRunner + WinTestRunnermd + WinTestRunnermt + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\wintestrunner.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0000 + + + cppunit.lib;winmm.lib;%(AdditionalDependencies) + ..\..\bin64\WinTestRunner64.dll + true + ..\..\lib64;%(AdditionalLibraryDirectories) + + + Windows + ..\..\lib64\WinTestRunner.lib + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\wintestrunner.tlb + + + + + Disabled + Default + false + include;..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + ProgramDatabase + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0000 + + + cppunitd.lib;winmm.lib;%(AdditionalDependencies) + NotSet + ..\..\bin64\WinTestRunner64d.dll + true + ..\..\lib64;%(AdditionalLibraryDirectories) + true + ..\..\bin64\WinTestRunner64d.pdb + Windows + ..\..\lib64\WinTestRunnerd.lib + MachineX64 + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\wintestrunner.tlb + + + + + Disabled + Default + false + include;..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + + + $(IntDir) + ..\..\lib64\WinTestRunnermdd.pdb + Level3 + true + ProgramDatabase + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0000 + + + ..\..\lib64\WinTestRunnermdd.lib + MachineX64 + + + Copying resources... + copy "$(IntDir)$(ProjectName).res" ..\..\lib64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\wintestrunner.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0000 + + + ..\..\lib64\WinTestRunnermd.lib + MachineX64 + + + Copying resources... + copy "$(IntDir)$(ProjectName).res" ..\..\lib64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\wintestrunner.tlb + + + + + Disabled + Default + false + include;..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + + + $(IntDir) + ..\..\lib64\WinTestRunnermtd.pdb + Level3 + true + ProgramDatabase + Default + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0000 + + + ..\..\lib64\WinTestRunnermtd.lib + MachineX64 + + + Copying resources... + copy "$(IntDir)$(ProjectName).res" ..\..\lib64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\lib64\wintestrunner.tlb + + + + + Disabled + OnlyExplicitInline + true + Speed + true + include;..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded + false + true + true + true + + + + + $(IntDir) + $(IntDir)vc70.pdb + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0000 + + + ..\..\lib64\WinTestRunnermt.lib + MachineX64 + + + Copying resources... + copy "$(IntDir)$(ProjectName).res" ..\..\lib64 + + + + + + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj.filters b/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj.filters index 99afa804b..a51a3912c 100644 --- a/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj.filters +++ b/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj.filters @@ -1,61 +1,61 @@ - - - - - {287a609c-665e-4810-863e-0737d5c606db} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {e90e89b4-cc09-45a8-ac7a-2afec3ded013} - *.h - - - {30a11146-41a7-4d34-b980-7d573885cf6e} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Resource Files - - - - - Resource Files - - + + + + + {287a609c-665e-4810-863e-0737d5c606db} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {e90e89b4-cc09-45a8-ac7a-2afec3ded013} + *.h + + + {30a11146-41a7-4d34-b980-7d573885cf6e} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Include Files + + + Resource Files + + + + + Resource Files + + \ No newline at end of file diff --git a/Crypto/Crypto_vs110.vcxproj b/Crypto/Crypto_vs110.vcxproj index 3cbee945f..e1873768c 100644 --- a/Crypto/Crypto_vs110.vcxproj +++ b/Crypto/Crypto_vs110.vcxproj @@ -1,313 +1,313 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Crypto - {EEEE7259-32E9-4D56-B023-C733940AB2A0} - Crypto - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoCryptod - PocoCryptomdd - PocoCryptomtd - PocoCrypto - PocoCryptomd - PocoCryptomt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - ..\bin\PocoCryptod.dll - true - true - ..\bin\PocoCryptod.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoCryptod.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - ..\bin\PocoCrypto.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoCrypto.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoCryptomtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoCryptomtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoCryptomt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoCryptomdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoCryptomdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoCryptomd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - ..\lib\PocoCryptomd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Crypto + {EEEE7259-32E9-4D56-B023-C733940AB2A0} + Crypto + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoCryptod + PocoCryptomdd + PocoCryptomtd + PocoCrypto + PocoCryptomd + PocoCryptomt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ..\bin\PocoCryptod.dll + true + true + ..\bin\PocoCryptod.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoCryptod.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ..\bin\PocoCrypto.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoCrypto.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoCryptomtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoCryptomtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoCryptomt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoCryptomdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoCryptomdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoCryptomd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ..\lib\PocoCryptomd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Crypto/Crypto_vs110.vcxproj.filters b/Crypto/Crypto_vs110.vcxproj.filters index 9356d8ebd..7c16467a5 100644 --- a/Crypto/Crypto_vs110.vcxproj.filters +++ b/Crypto/Crypto_vs110.vcxproj.filters @@ -1,144 +1,144 @@ - - - - - {17594743-3f2a-4d0a-b9f2-1ca0bb26cc43} - - - {c0d3b9f3-9eec-4517-a3d2-4612ced13c30} - - - {4ec98d78-64f3-4fa5-98a3-3f0390361fd0} - - - {85bc4e63-194e-4b61-99d0-175653201d78} - - - {bf6c3bf5-b255-4056-a747-30ae03bf3349} - - - {58c8d32d-a284-4f25-9f3b-7ad71773a245} - - - {2f7618fd-a309-4b9b-b5f4-44758eb9e1aa} - - - {41359fb8-89cb-47c8-a492-96a495599bb8} - - - {3d1cdd90-779b-4d65-a02b-650fe695e311} - - - {0d281f4c-ec39-4580-a67b-c45533a2121c} - - - {8fd56e7b-745f-4b74-8f8b-6f97dc587eaa} - - - {2d809b0b-b26c-4587-ad74-9729d040e6c0} - - - {c3f1cc05-f4e6-4e31-bc04-3dec0d300f4d} - - - {e7dfc2ed-51f6-4277-b4b3-2dd27f0d3247} - - - {5a9bcfa5-e9c8-4f64-abce-b452db7c6b94} - - - - - Cipher\Header Files - - - Cipher\Header Files - - - Cipher\Header Files - - - Cipher\Header Files - - - Cipher\Header Files - - - Cipher\Header Files - - - Cipher\Header Files - - - RSA\Header Files - - - RSA\Header Files - - - RSA\Header Files - - - RSA\Header Files - - - Certificate\Header Files - - - CryptoCore\Header Files - - - CryptoCore\Header Files - - - Digest\Header Files - - - - - Cipher\Source Files - - - Cipher\Source Files - - - Cipher\Source Files - - - Cipher\Source Files - - - Cipher\Source Files - - - Cipher\Source Files - - - Cipher\Source Files - - - RSA\Source Files - - - RSA\Source Files - - - RSA\Source Files - - - RSA\Source Files - - - Certificate\Source Files - - - CryptoCore\Source Files - - - Digest\Source Files - - - - - + + + + + {17594743-3f2a-4d0a-b9f2-1ca0bb26cc43} + + + {c0d3b9f3-9eec-4517-a3d2-4612ced13c30} + + + {4ec98d78-64f3-4fa5-98a3-3f0390361fd0} + + + {85bc4e63-194e-4b61-99d0-175653201d78} + + + {bf6c3bf5-b255-4056-a747-30ae03bf3349} + + + {58c8d32d-a284-4f25-9f3b-7ad71773a245} + + + {2f7618fd-a309-4b9b-b5f4-44758eb9e1aa} + + + {41359fb8-89cb-47c8-a492-96a495599bb8} + + + {3d1cdd90-779b-4d65-a02b-650fe695e311} + + + {0d281f4c-ec39-4580-a67b-c45533a2121c} + + + {8fd56e7b-745f-4b74-8f8b-6f97dc587eaa} + + + {2d809b0b-b26c-4587-ad74-9729d040e6c0} + + + {c3f1cc05-f4e6-4e31-bc04-3dec0d300f4d} + + + {e7dfc2ed-51f6-4277-b4b3-2dd27f0d3247} + + + {5a9bcfa5-e9c8-4f64-abce-b452db7c6b94} + + + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + Certificate\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + Digest\Header Files + + + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + Certificate\Source Files + + + CryptoCore\Source Files + + + Digest\Source Files + + + + + \ No newline at end of file diff --git a/Crypto/Crypto_x64_vs110.vcxproj b/Crypto/Crypto_x64_vs110.vcxproj index c52779dfc..93c097518 100644 --- a/Crypto/Crypto_x64_vs110.vcxproj +++ b/Crypto/Crypto_x64_vs110.vcxproj @@ -1,311 +1,311 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Crypto - {EEEE7259-32E9-4D56-B023-C733940AB2A0} - Crypto - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoCrypto64d - PocoCryptomdd - PocoCryptomtd - PocoCrypto64 - PocoCryptomd - PocoCryptomt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - ..\bin64\PocoCrypto64d.dll - true - true - ..\bin64\PocoCrypto64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoCryptod.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - ..\bin64\PocoCrypto64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoCrypto.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoCryptomtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoCryptomtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoCryptomt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoCryptomdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoCryptomdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoCryptomd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Crypto + {EEEE7259-32E9-4D56-B023-C733940AB2A0} + Crypto + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoCrypto64d + PocoCryptomdd + PocoCryptomtd + PocoCrypto64 + PocoCryptomd + PocoCryptomt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ..\bin64\PocoCrypto64d.dll + true + true + ..\bin64\PocoCrypto64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoCryptod.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ..\bin64\PocoCrypto64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoCrypto.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoCryptomtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoCryptomtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoCryptomt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoCryptomdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoCryptomdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoCryptomd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Crypto/Crypto_x64_vs110.vcxproj.filters b/Crypto/Crypto_x64_vs110.vcxproj.filters index a51a324fc..55cc54c49 100644 --- a/Crypto/Crypto_x64_vs110.vcxproj.filters +++ b/Crypto/Crypto_x64_vs110.vcxproj.filters @@ -1,144 +1,144 @@ - - - - - {3f9f5db7-e5a5-4665-ac8a-ba3b69472818} - - - {213f2cb2-159b-4c5d-9476-ac88d1edbe41} - - - {04acc5ed-cf5c-4559-8d18-b868152590ba} - - - {a7a20176-8f0b-4819-a12c-7bd07667a2b2} - - - {b5aa8129-dc21-4a39-b45e-b21130fc0d00} - - - {abc7e151-a8f8-4abd-80ca-53ac9a3bf00d} - - - {2e604245-080b-45fc-be1b-4fc052de941d} - - - {c619c482-ec12-4c90-9272-3d49b3b67618} - - - {354d77a3-0818-4e37-9ff5-e2e22260408e} - - - {d4f86c3f-bdc6-4ac3-bf88-7984d22fca2f} - - - {fd2a6fb2-66d6-4132-b3a6-10ca6326e634} - - - {3782f037-1b89-44ee-8758-1527f0f13bd3} - - - {9432ffdb-04a3-4261-a59a-2bfb8dd1a16d} - - - {45a5fa97-2c74-4311-b2e7-803135265ae6} - - - {c31ed094-d39a-4818-925e-736e5476fc7f} - - - - - Cipher\Header Files - - - Cipher\Header Files - - - Cipher\Header Files - - - Cipher\Header Files - - - Cipher\Header Files - - - Cipher\Header Files - - - Cipher\Header Files - - - RSA\Header Files - - - RSA\Header Files - - - RSA\Header Files - - - RSA\Header Files - - - Certificate\Header Files - - - CryptoCore\Header Files - - - CryptoCore\Header Files - - - Digest\Header Files - - - - - Cipher\Source Files - - - Cipher\Source Files - - - Cipher\Source Files - - - Cipher\Source Files - - - Cipher\Source Files - - - Cipher\Source Files - - - Cipher\Source Files - - - RSA\Source Files - - - RSA\Source Files - - - RSA\Source Files - - - RSA\Source Files - - - Certificate\Source Files - - - CryptoCore\Source Files - - - Digest\Source Files - - - - - + + + + + {3f9f5db7-e5a5-4665-ac8a-ba3b69472818} + + + {213f2cb2-159b-4c5d-9476-ac88d1edbe41} + + + {04acc5ed-cf5c-4559-8d18-b868152590ba} + + + {a7a20176-8f0b-4819-a12c-7bd07667a2b2} + + + {b5aa8129-dc21-4a39-b45e-b21130fc0d00} + + + {abc7e151-a8f8-4abd-80ca-53ac9a3bf00d} + + + {2e604245-080b-45fc-be1b-4fc052de941d} + + + {c619c482-ec12-4c90-9272-3d49b3b67618} + + + {354d77a3-0818-4e37-9ff5-e2e22260408e} + + + {d4f86c3f-bdc6-4ac3-bf88-7984d22fca2f} + + + {fd2a6fb2-66d6-4132-b3a6-10ca6326e634} + + + {3782f037-1b89-44ee-8758-1527f0f13bd3} + + + {9432ffdb-04a3-4261-a59a-2bfb8dd1a16d} + + + {45a5fa97-2c74-4311-b2e7-803135265ae6} + + + {c31ed094-d39a-4818-925e-736e5476fc7f} + + + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + Cipher\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + RSA\Header Files + + + Certificate\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + Digest\Header Files + + + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + Cipher\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + RSA\Source Files + + + Certificate\Source Files + + + CryptoCore\Source Files + + + Digest\Source Files + + + + + \ No newline at end of file diff --git a/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj b/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj index 8df34a6f0..676801a7c 100644 --- a/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj +++ b/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - genrsakey - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947} - genrsakey - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - genrsakeyd - genrsakeyd - genrsakeyd - genrsakey - genrsakey - genrsakey - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\genrsakeyd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\genrsakeyd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\genrsakey.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\genrsakeyd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\genrsakeyd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\genrsakey.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\genrsakeyd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\genrsakeyd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\genrsakey.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + genrsakey + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947} + genrsakey + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + genrsakeyd + genrsakeyd + genrsakeyd + genrsakey + genrsakey + genrsakey + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\genrsakeyd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\genrsakeyd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\genrsakey.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\genrsakeyd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\genrsakeyd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\genrsakey.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\genrsakeyd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\genrsakeyd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\genrsakey.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.filters index 0e773d405..166c41e4d 100644 --- a/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.filters +++ b/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {381b2559-cc38-487e-b5bf-b795affe682c} - - - {96980b90-ddc8-4f21-8d66-511c4eeb1f1b} - - - - - Source Files - - + + + + + {381b2559-cc38-487e-b5bf-b795affe682c} + + + {96980b90-ddc8-4f21-8d66-511c4eeb1f1b} + + + + + Source Files + + \ No newline at end of file diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj b/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj index 4454fee68..b038dae63 100644 --- a/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj +++ b/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - genrsakey - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947} - genrsakey - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - genrsakeyd - genrsakeyd - genrsakeyd - genrsakey - genrsakey - genrsakey - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\genrsakeyd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\genrsakeyd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\genrsakey.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\genrsakeyd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\genrsakeyd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\genrsakey.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\genrsakeyd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\genrsakeyd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\genrsakey.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + genrsakey + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947} + genrsakey + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + genrsakeyd + genrsakeyd + genrsakeyd + genrsakey + genrsakey + genrsakey + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\genrsakeyd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\genrsakeyd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\genrsakey.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\genrsakeyd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\genrsakeyd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\genrsakey.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\genrsakeyd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\genrsakeyd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\genrsakey.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.filters index 953ac465e..37715bebb 100644 --- a/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.filters +++ b/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {752288ff-9835-4729-a04f-7862c6391838} - - - {dc290695-43b9-4284-b075-1eadd4cb2cf3} - - - - - Source Files - - + + + + + {752288ff-9835-4729-a04f-7862c6391838} + + + {dc290695-43b9-4284-b075-1eadd4cb2cf3} + + + + + Source Files + + \ No newline at end of file diff --git a/Crypto/samples/samples_vs110.sln b/Crypto/samples/samples_vs110.sln index 4d9dc076b..8b64f56ad 100644 --- a/Crypto/samples/samples_vs110.sln +++ b/Crypto/samples/samples_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genrsakey_vs110.vcxproj", "{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.Build.0 = release_shared|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genrsakey_vs110.vcxproj", "{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.Build.0 = release_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Crypto/samples/samples_x64_vs110.sln b/Crypto/samples/samples_x64_vs110.sln index 1fd23f250..b51c30964 100644 --- a/Crypto/samples/samples_x64_vs110.sln +++ b/Crypto/samples/samples_x64_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genrsakey_x64_vs110.vcxproj", "{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.Build.0 = debug_shared|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.ActiveCfg = release_shared|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.Build.0 = release_shared|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.Deploy.0 = release_shared|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.Build.0 = release_static_md|x64 - {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genrsakey_x64_vs110.vcxproj", "{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.Build.0 = debug_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.ActiveCfg = release_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.Build.0 = release_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.Deploy.0 = release_shared|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.Build.0 = release_static_md|x64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj b/Crypto/testsuite/TestSuite_vs110.vcxproj index 869b33fbd..214b511c5 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj @@ -1,323 +1,323 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters index b7af4c139..47150f0cb 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,60 +1,60 @@ - - - - - {e3337374-58ec-4088-b09e-b64458aa23e5} - - - {667a5bf7-fa51-4460-8394-2f72db8293ed} - - - {0d82609d-2c6d-4540-8a69-d46c22d7c33e} - - - {b7352f7d-5b81-40a2-b647-f0b2aa37ddd7} - - - {efeb8c04-c633-4677-b99c-257a5e542c7d} - - - {048cb1e3-1b8a-4fe1-9fbc-2f7e543265c6} - - - {5ac33225-2aae-446e-b3a5-88b11de4948e} - - - {e71d3272-bba3-42e9-bd06-254603056cb9} - - - - - Crypto\Header Files - - - Crypto\Header Files - - - Crypto\Header Files - - - _Suite\Header Files - - - - - Crypto\Header Files - - - Crypto\Source Files - - - Crypto\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {e3337374-58ec-4088-b09e-b64458aa23e5} + + + {667a5bf7-fa51-4460-8394-2f72db8293ed} + + + {0d82609d-2c6d-4540-8a69-d46c22d7c33e} + + + {b7352f7d-5b81-40a2-b647-f0b2aa37ddd7} + + + {efeb8c04-c633-4677-b99c-257a5e542c7d} + + + {048cb1e3-1b8a-4fe1-9fbc-2f7e543265c6} + + + {5ac33225-2aae-446e-b3a5-88b11de4948e} + + + {e71d3272-bba3-42e9-bd06-254603056cb9} + + + + + Crypto\Header Files + + + Crypto\Header Files + + + Crypto\Header Files + + + _Suite\Header Files + + + + + Crypto\Header Files + + + Crypto\Source Files + + + Crypto\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj index 134759600..c3f2007b6 100644 --- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,323 +1,323 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters index c4adb898f..e7c37b295 100644 --- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,60 +1,60 @@ - - - - - {fc4c72b2-b1bf-4fc8-98a5-a819adc4d87c} - - - {e0739809-7be5-4b90-bc58-488765116c7c} - - - {1ef47158-e786-4e1f-97eb-646f6ab613fe} - - - {f518cd8f-d3ab-411b-9971-7be59754c4c6} - - - {3f9a762f-b6da-44fb-859f-36ac3eeb2e12} - - - {0871e0bb-c6ba-40af-852b-ac4b0ebfa9d6} - - - {77116e24-5df2-4bbe-bc05-219863391b85} - - - {f010500b-dd76-42d4-859a-06d7a67f1bf7} - - - - - Crypto\Header Files - - - Crypto\Header Files - - - Crypto\Header Files - - - _Suite\Header Files - - - - - Crypto\Header Files - - - Crypto\Source Files - - - Crypto\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {fc4c72b2-b1bf-4fc8-98a5-a819adc4d87c} + + + {e0739809-7be5-4b90-bc58-488765116c7c} + + + {1ef47158-e786-4e1f-97eb-646f6ab613fe} + + + {f518cd8f-d3ab-411b-9971-7be59754c4c6} + + + {3f9a762f-b6da-44fb-859f-36ac3eeb2e12} + + + {0871e0bb-c6ba-40af-852b-ac4b0ebfa9d6} + + + {77116e24-5df2-4bbe-bc05-219863391b85} + + + {f010500b-dd76-42d4-859a-06d7a67f1bf7} + + + + + Crypto\Header Files + + + Crypto\Header Files + + + Crypto\Header Files + + + _Suite\Header Files + + + + + Crypto\Header Files + + + Crypto\Source Files + + + Crypto\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Data/Data_CE_vs90.sln b/Data/Data_CE_vs90.sln index 0ed1ffcd8..19e261f79 100644 --- a/Data/Data_CE_vs90.sln +++ b/Data/Data_CE_vs90.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_CE_vs90.vcproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_CE_vs90.vcproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" - ProjectSection(ProjectDependencies) = postProject - {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) - release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) - debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) - release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) - debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) - release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_CE_vs90.vcproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_CE_vs90.vcproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" + ProjectSection(ProjectDependencies) = postProject + {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) + release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) + debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) + release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) + debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) + release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/Data_CE_vs90.vcproj b/Data/Data_CE_vs90.vcproj index fa213e82c..6469c8bab 100644 --- a/Data/Data_CE_vs90.vcproj +++ b/Data/Data_CE_vs90.vcproj @@ -1,628 +1,628 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/Data_vs110.sln b/Data/Data_vs110.sln index 059a4aec8..6aeba895c 100644 --- a/Data/Data_vs110.sln +++ b/Data/Data_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_vs110.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" - ProjectSection(ProjectDependencies) = postProject - {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Build.0 = release_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_vs110.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" + ProjectSection(ProjectDependencies) = postProject + {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Build.0 = release_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/Data_vs110.vcxproj b/Data/Data_vs110.vcxproj index 62c6bcd0a..eddd7d4d7 100644 --- a/Data/Data_vs110.vcxproj +++ b/Data/Data_vs110.vcxproj @@ -1,365 +1,365 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Data - {240E83C3-368D-11DB-9FBC-00123FC423B5} - Data - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoDatad - PocoDatamdd - PocoDatamtd - PocoData - PocoDatamd - PocoDatamt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoDatad.dll - true - true - ..\bin\PocoDatad.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoDatad.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoData.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoData.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoDatamtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoDatamtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoDatamt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoDatamdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoDatamdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoDatamd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\lib\PocoDatamd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Data + {240E83C3-368D-11DB-9FBC-00123FC423B5} + Data + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoDatad + PocoDatamdd + PocoDatamtd + PocoData + PocoDatamd + PocoDatamt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoDatad.dll + true + true + ..\bin\PocoDatad.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoDatad.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoData.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoData.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoDatamtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoDatamtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoDatamt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoDatamdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoDatamdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoDatamd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\lib\PocoDatamd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/Data_vs110.vcxproj.filters b/Data/Data_vs110.vcxproj.filters index 087f73992..85d6cdf19 100644 --- a/Data/Data_vs110.vcxproj.filters +++ b/Data/Data_vs110.vcxproj.filters @@ -1,288 +1,288 @@ - - - - - {b0c4ecb5-2fec-44b6-b2ed-73a184c13d7e} - - - {ff68fd41-c965-4b22-8850-7337edeba804} - - - {296a992f-335f-486c-bd02-b933d64d5448} - - - {d47207b2-d566-42aa-bd9b-7fdc74e2b04c} - - - {4edd2b1c-efb1-4e9b-b9c7-7f6008059889} - - - {3a9a37f7-0449-4e91-9a6f-25b4586bef31} - - - {3eaaa4d7-9839-4bb9-878d-c0ebc8f77b23} - - - {f576b05c-f4ab-43c1-b494-39c2e5eb5608} - - - {74dee80f-3ec5-4caf-b009-e60e1307aa78} - - - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - - Logging\Source Files - - - Logging\Source Files - - + + + + + {b0c4ecb5-2fec-44b6-b2ed-73a184c13d7e} + + + {ff68fd41-c965-4b22-8850-7337edeba804} + + + {296a992f-335f-486c-bd02-b933d64d5448} + + + {d47207b2-d566-42aa-bd9b-7fdc74e2b04c} + + + {4edd2b1c-efb1-4e9b-b9c7-7f6008059889} + + + {3a9a37f7-0449-4e91-9a6f-25b4586bef31} + + + {3eaaa4d7-9839-4bb9-878d-c0ebc8f77b23} + + + {f576b05c-f4ab-43c1-b494-39c2e5eb5608} + + + {74dee80f-3ec5-4caf-b009-e60e1307aa78} + + + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + Logging\Source Files + + + Logging\Source Files + + \ No newline at end of file diff --git a/Data/Data_x64_vs100.sln b/Data/Data_x64_vs100.sln index fef60c896..66198a92a 100644 --- a/Data/Data_x64_vs100.sln +++ b/Data/Data_x64_vs100.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_x64_vs100.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs100.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" - ProjectSection(ProjectDependencies) = postProject - {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Build.0 = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_x64_vs100.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs100.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" + ProjectSection(ProjectDependencies) = postProject + {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Build.0 = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/Data_x64_vs100.vcxproj b/Data/Data_x64_vs100.vcxproj index ada140ceb..d82d446cb 100644 --- a/Data/Data_x64_vs100.vcxproj +++ b/Data/Data_x64_vs100.vcxproj @@ -1,357 +1,357 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Data - {240E83C3-368D-11DB-9FBC-00123FC423B5} - Data - Win32Proj - - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoData64d - PocoDatamdd - PocoDatamtd - PocoData64 - PocoDatamd - PocoDatamt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoData64d.dll - true - true - ..\bin64\PocoData64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoDatad.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoData64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoData.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoDatamtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoDatamtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoDatamt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoDatamdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoDatamdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoDatamd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Data + {240E83C3-368D-11DB-9FBC-00123FC423B5} + Data + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoData64d + PocoDatamdd + PocoDatamtd + PocoData64 + PocoDatamd + PocoDatamt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoData64d.dll + true + true + ..\bin64\PocoData64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoDatad.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoData64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoData.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoDatamtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoDatamtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoDatamt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoDatamdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoDatamdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoDatamd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/Data_x64_vs100.vcxproj.filters b/Data/Data_x64_vs100.vcxproj.filters index 5e718d6e7..369d64104 100644 --- a/Data/Data_x64_vs100.vcxproj.filters +++ b/Data/Data_x64_vs100.vcxproj.filters @@ -1,288 +1,288 @@ - - - - - {415ac94a-5cf7-4951-9c4c-bd3694fb721c} - - - {ac8b82f8-eadc-49d9-bbee-9ad9a9aef7a8} - - - {37e9b003-f160-47c5-a087-5fbc2dd15492} - - - {d17d6956-aad7-49a6-ae09-cbffb0dcd033} - - - {b11cd0b0-3dd3-4bd6-9371-552ac2001fcc} - - - {be44cfbd-51dd-42a0-9a98-08de85852f0b} - - - {af48f137-2142-4770-ac06-6922aed340b4} - - - {91250500-da6d-4eec-90fe-07b029c5503e} - - - {18032e06-2256-4712-a247-fbe32a970013} - - - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - - Logging\Source Files - - - Logging\Source Files - - + + + + + {415ac94a-5cf7-4951-9c4c-bd3694fb721c} + + + {ac8b82f8-eadc-49d9-bbee-9ad9a9aef7a8} + + + {37e9b003-f160-47c5-a087-5fbc2dd15492} + + + {d17d6956-aad7-49a6-ae09-cbffb0dcd033} + + + {b11cd0b0-3dd3-4bd6-9371-552ac2001fcc} + + + {be44cfbd-51dd-42a0-9a98-08de85852f0b} + + + {af48f137-2142-4770-ac06-6922aed340b4} + + + {91250500-da6d-4eec-90fe-07b029c5503e} + + + {18032e06-2256-4712-a247-fbe32a970013} + + + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + Logging\Source Files + + + Logging\Source Files + + \ No newline at end of file diff --git a/Data/Data_x64_vs110.sln b/Data/Data_x64_vs110.sln index d649914f9..379805ecf 100644 --- a/Data/Data_x64_vs110.sln +++ b/Data/Data_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_x64_vs110.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" - ProjectSection(ProjectDependencies) = postProject - {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Build.0 = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_x64_vs110.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" + ProjectSection(ProjectDependencies) = postProject + {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Build.0 = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/Data_x64_vs110.vcxproj b/Data/Data_x64_vs110.vcxproj index 1344f7564..87ed20362 100644 --- a/Data/Data_x64_vs110.vcxproj +++ b/Data/Data_x64_vs110.vcxproj @@ -1,363 +1,363 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Data - {240E83C3-368D-11DB-9FBC-00123FC423B5} - Data - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoData64d - PocoDatamdd - PocoDatamtd - PocoData64 - PocoDatamd - PocoDatamt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoData64d.dll - true - true - ..\bin64\PocoData64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoDatad.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoData64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoData.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoDatamtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoDatamtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoDatamt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoDatamdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoDatamdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoDatamd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Data + {240E83C3-368D-11DB-9FBC-00123FC423B5} + Data + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoData64d + PocoDatamdd + PocoDatamtd + PocoData64 + PocoDatamd + PocoDatamt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoData64d.dll + true + true + ..\bin64\PocoData64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoDatad.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoData64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoData.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoDatamtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoDatamtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoDatamt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoDatamdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoDatamdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoDatamd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/Data_x64_vs110.vcxproj.filters b/Data/Data_x64_vs110.vcxproj.filters index a7c5f5801..89b8776d0 100644 --- a/Data/Data_x64_vs110.vcxproj.filters +++ b/Data/Data_x64_vs110.vcxproj.filters @@ -1,288 +1,288 @@ - - - - - {fd9f72c0-7bc6-4903-8554-c06757614b09} - - - {dbef72b3-cba1-42ba-a173-159ab2872383} - - - {ff8b6c72-edec-4b4e-8a3b-19e60597d338} - - - {a8b72238-0410-4165-b7e1-7a0c6ff0322d} - - - {23f172ea-bc6b-4011-ac6e-8a06d821358b} - - - {82c9086c-6883-4ec1-bd8e-b8037e3cbb4f} - - - {08c7cdb3-362f-4d63-915c-f9baeee2399e} - - - {8a1c4ecf-8304-41b7-9214-121d9a8e6a1d} - - - {7966d047-b3e5-4534-ba0f-825c88ef8b33} - - - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - - Logging\Source Files - - - Logging\Source Files - - + + + + + {fd9f72c0-7bc6-4903-8554-c06757614b09} + + + {dbef72b3-cba1-42ba-a173-159ab2872383} + + + {ff8b6c72-edec-4b4e-8a3b-19e60597d338} + + + {a8b72238-0410-4165-b7e1-7a0c6ff0322d} + + + {23f172ea-bc6b-4011-ac6e-8a06d821358b} + + + {82c9086c-6883-4ec1-bd8e-b8037e3cbb4f} + + + {08c7cdb3-362f-4d63-915c-f9baeee2399e} + + + {8a1c4ecf-8304-41b7-9214-121d9a8e6a1d} + + + {7966d047-b3e5-4534-ba0f-825c88ef8b33} + + + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + Logging\Source Files + + + Logging\Source Files + + \ No newline at end of file diff --git a/Data/Data_x64_vs90.sln b/Data/Data_x64_vs90.sln index 731d7730b..f78653de8 100644 --- a/Data/Data_x64_vs90.sln +++ b/Data/Data_x64_vs90.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_x64_vs90.vcproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" - ProjectSection(ProjectDependencies) = postProject - {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Build.0 = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_x64_vs90.vcproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" + ProjectSection(ProjectDependencies) = postProject + {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Build.0 = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/Data_x64_vs90.vcproj b/Data/Data_x64_vs90.vcproj index d6ba6b16a..d7a950393 100644 --- a/Data/Data_x64_vs90.vcproj +++ b/Data/Data_x64_vs90.vcproj @@ -1,585 +1,585 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/MySQL_vs110.sln b/Data/MySQL/MySQL_vs110.sln index 4af55c126..b8bbf578c 100644 --- a/Data/MySQL/MySQL_vs110.sln +++ b/Data/MySQL/MySQL_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_vs110.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}" - ProjectSection(ProjectDependencies) = postProject - {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Build.0 = release_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.Build.0 = release_shared|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_vs110.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}" + ProjectSection(ProjectDependencies) = postProject + {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Build.0 = release_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.Build.0 = release_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/MySQL/MySQL_vs110.vcxproj b/Data/MySQL/MySQL_vs110.vcxproj index b7dd9fc35..59afdd928 100644 --- a/Data/MySQL/MySQL_vs110.vcxproj +++ b/Data/MySQL/MySQL_vs110.vcxproj @@ -1,300 +1,300 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - MySQL - {73E19FDE-1570-488C-B3DB-72A60FADD408} - MySQL - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\bin\ - obj\$(Configuration)\ - true - ..\..\bin\ - obj\$(Configuration)\ - false - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - PocoDataMySQLd - PocoDataMySQLmdd - PocoDataMySQLmtd - PocoDataMySQL - PocoDataMySQLmd - PocoDataMySQLmt - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - libmysql.lib;%(AdditionalDependencies) - ..\..\bin\PocoDataMySQLd.dll - true - true - ..\..\bin\PocoDataMySQLd.pdb - ..\..\lib;%(AdditionalLibraryDirectories) - Console - ..\..\lib\PocoDataMySQLd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libmysql.lib;%(AdditionalDependencies) - ..\..\bin\PocoDataMySQL.dll - true - false - ..\..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\..\lib\PocoDataMySQL.lib - MachineX86 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\..\lib\PocoDataMySQLmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\..\lib\PocoDataMySQLmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\..\lib\PocoDataMySQLmt.lib - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\..\lib\PocoDataMySQLmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\..\lib\PocoDataMySQLmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\..\lib\PocoDataMySQLmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - libmysql.lib;%(AdditionalDependencies) - ..\..\lib\PocoDataMySQLmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + MySQL + {73E19FDE-1570-488C-B3DB-72A60FADD408} + MySQL + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\..\bin\ + obj\$(Configuration)\ + true + ..\..\bin\ + obj\$(Configuration)\ + false + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + PocoDataMySQLd + PocoDataMySQLmdd + PocoDataMySQLmtd + PocoDataMySQL + PocoDataMySQLmd + PocoDataMySQLmt + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + libmysql.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataMySQLd.dll + true + true + ..\..\bin\PocoDataMySQLd.pdb + ..\..\lib;%(AdditionalLibraryDirectories) + Console + ..\..\lib\PocoDataMySQLd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libmysql.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataMySQL.dll + true + false + ..\..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib\PocoDataMySQL.lib + MachineX86 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib\PocoDataMySQLmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\..\lib\PocoDataMySQLmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\..\lib\PocoDataMySQLmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib\PocoDataMySQLmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\..\lib\PocoDataMySQLmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\..\lib\PocoDataMySQLmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + libmysql.lib;%(AdditionalDependencies) + ..\..\lib\PocoDataMySQLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/MySQL_vs110.vcxproj.filters b/Data/MySQL/MySQL_vs110.vcxproj.filters index b9b24aa15..98b4c6317 100644 --- a/Data/MySQL/MySQL_vs110.vcxproj.filters +++ b/Data/MySQL/MySQL_vs110.vcxproj.filters @@ -1,78 +1,78 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/Data/MySQL/MySQL_vs71.sln b/Data/MySQL/MySQL_vs71.sln index d481c2ab9..d1775b7b1 100644 --- a/Data/MySQL/MySQL_vs71.sln +++ b/Data/MySQL/MySQL_vs71.sln @@ -1,50 +1,50 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_vs71.vcproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs71.vcproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}" - ProjectSection(ProjectDependencies) = postProject - {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - debug_shared = debug_shared - release_shared = release_shared - debug_static_mt = debug_static_mt - release_static_mt = release_static_mt - debug_static_md = debug_static_md - release_static_md = release_static_md - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared.ActiveCfg = debug_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared.Build.0 = debug_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared.ActiveCfg = release_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared.Build.0 = release_shared|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt.Build.0 = debug_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt.ActiveCfg = release_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt.Build.0 = release_static_mt|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md.ActiveCfg = debug_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md.Build.0 = debug_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md.ActiveCfg = release_static_md|Win32 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md.Build.0 = release_static_md|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared.ActiveCfg = debug_shared|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared.Build.0 = debug_shared|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared.ActiveCfg = release_shared|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared.Build.0 = release_shared|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt.Build.0 = debug_static_mt|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt.ActiveCfg = release_static_mt|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt.Build.0 = release_static_mt|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md.ActiveCfg = debug_static_md|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md.Build.0 = debug_static_md|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md.ActiveCfg = release_static_md|Win32 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md.Build.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_vs71.vcproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs71.vcproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}" + ProjectSection(ProjectDependencies) = postProject + {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + debug_shared = debug_shared + release_shared = release_shared + debug_static_mt = debug_static_mt + release_static_mt = release_static_mt + debug_static_md = debug_static_md + release_static_md = release_static_md + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared.ActiveCfg = debug_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared.Build.0 = debug_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared.ActiveCfg = release_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared.Build.0 = release_shared|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt.Build.0 = debug_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt.ActiveCfg = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt.Build.0 = release_static_mt|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md.ActiveCfg = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md.Build.0 = debug_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md.ActiveCfg = release_static_md|Win32 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md.Build.0 = release_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared.ActiveCfg = debug_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared.Build.0 = debug_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared.ActiveCfg = release_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared.Build.0 = release_shared|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt.Build.0 = debug_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt.ActiveCfg = release_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt.Build.0 = release_static_mt|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md.ActiveCfg = debug_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md.Build.0 = debug_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md.ActiveCfg = release_static_md|Win32 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md.Build.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/Data/MySQL/MySQL_vs71.vcproj b/Data/MySQL/MySQL_vs71.vcproj index 13ae43384..a0a303bd5 100644 --- a/Data/MySQL/MySQL_vs71.vcproj +++ b/Data/MySQL/MySQL_vs71.vcproj @@ -1,417 +1,417 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/MySQL_x64_vs110.sln b/Data/MySQL/MySQL_x64_vs110.sln index 2a5577bde..05fee3f3f 100644 --- a/Data/MySQL/MySQL_x64_vs110.sln +++ b/Data/MySQL/MySQL_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_x64_vs110.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}" - ProjectSection(ProjectDependencies) = postProject - {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Build.0 = debug_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.ActiveCfg = release_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Build.0 = release_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Deploy.0 = release_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.Build.0 = debug_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.ActiveCfg = release_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.Build.0 = release_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.Deploy.0 = release_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Build.0 = release_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_x64_vs110.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}" + ProjectSection(ProjectDependencies) = postProject + {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Build.0 = debug_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.ActiveCfg = release_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Build.0 = release_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Deploy.0 = release_shared|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.Build.0 = debug_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.ActiveCfg = release_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.Build.0 = release_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.Deploy.0 = release_shared|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Build.0 = release_static_md|x64 + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/MySQL/MySQL_x64_vs110.vcxproj b/Data/MySQL/MySQL_x64_vs110.vcxproj index 8589796cb..128c8dd0f 100644 --- a/Data/MySQL/MySQL_x64_vs110.vcxproj +++ b/Data/MySQL/MySQL_x64_vs110.vcxproj @@ -1,298 +1,298 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - MySQL - {73E19FDE-1570-488C-B3DB-72A60FADD408} - MySQL - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\bin64\ - obj64\$(Configuration)\ - true - ..\..\bin64\ - obj64\$(Configuration)\ - false - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - PocoDataMySQL64d - PocoDataMySQLmdd - PocoDataMySQLmtd - PocoDataMySQL64 - PocoDataMySQLmd - PocoDataMySQLmt - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - libmysql.lib;%(AdditionalDependencies) - ..\..\bin64\PocoDataMySQL64d.dll - true - true - ..\..\bin64\PocoDataMySQL64d.pdb - ..\..\lib64;%(AdditionalLibraryDirectories) - Console - ..\..\lib64\PocoDataMySQLd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libmysql.lib;%(AdditionalDependencies) - ..\..\bin64\PocoDataMySQL64.dll - true - false - ..\..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\..\lib64\PocoDataMySQL.lib - MachineX64 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\..\lib64\PocoDataMySQLmtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataMySQLmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataMySQLmt.lib - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\..\lib64\PocoDataMySQLmdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataMySQLmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataMySQLmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + MySQL + {73E19FDE-1570-488C-B3DB-72A60FADD408} + MySQL + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\..\bin64\ + obj64\$(Configuration)\ + true + ..\..\bin64\ + obj64\$(Configuration)\ + false + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + PocoDataMySQL64d + PocoDataMySQLmdd + PocoDataMySQLmtd + PocoDataMySQL64 + PocoDataMySQLmd + PocoDataMySQLmt + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + libmysql.lib;%(AdditionalDependencies) + ..\..\bin64\PocoDataMySQL64d.dll + true + true + ..\..\bin64\PocoDataMySQL64d.pdb + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + ..\..\lib64\PocoDataMySQLd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libmysql.lib;%(AdditionalDependencies) + ..\..\bin64\PocoDataMySQL64.dll + true + false + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib64\PocoDataMySQL.lib + MachineX64 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib64\PocoDataMySQLmtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataMySQLmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataMySQLmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib64\PocoDataMySQLmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataMySQLmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataMySQLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/MySQL_x64_vs110.vcxproj.filters b/Data/MySQL/MySQL_x64_vs110.vcxproj.filters index b9b24aa15..98b4c6317 100644 --- a/Data/MySQL/MySQL_x64_vs110.vcxproj.filters +++ b/Data/MySQL/MySQL_x64_vs110.vcxproj.filters @@ -1,78 +1,78 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/Data/MySQL/include/Poco/Data/MySQL/Connector.h b/Data/MySQL/include/Poco/Data/MySQL/Connector.h index 160cf6f80..47c8dd7c7 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Connector.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Connector.h @@ -1,80 +1,83 @@ -// -// Connector.h -// -// $Id: //poco/1.4/Data/MySQL/include/Poco/Data/MySQL/Connector.h#1 $ -// -// Library: Data -// Package: MySQL -// Module: Connector -// -// Definition of the Connector class. -// -// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef Data_MySQL_Connector_INCLUDED -#define Data_MySQL_Connector_INCLUDED - -#include "MySQL.h" -#include "Poco/Data/Connector.h" - -namespace Poco { -namespace Data { -namespace MySQL { - -class MySQL_API Connector: public Poco::Data::Connector - /// Connector instantiates MySQL SessionImpl objects. -{ -public: - - static std::string KEY; - - Connector(); - /// Creates the Connector. - - virtual ~Connector(); - /// Destroys the Connector. - - virtual const std::string& name() const; - /// Returns the name associated with this connector. - - virtual Poco::AutoPtr createSession(const std::string& connectionString, - std::size_t timeout = Poco::Data::SessionImpl::LOGIN_TIMEOUT_DEFAULT); - /// Creates a MySQL SessionImpl object and initializes it with the given connectionString. - - static void registerConnector(); - /// Registers the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory - - static void unregisterConnector(); - /// Unregisters the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory -}; - - -} } } // namespace Poco::Data::MySQL - - -#endif // Data_MySQL_Connector_INCLUDED +// +// Connector.h +// +// $Id: //poco/1.4/Data/MySQL/include/Poco/Data/MySQL/Connector.h#1 $ +// +// Library: Data +// Package: MySQL +// Module: Connector +// +// Definition of the Connector class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Data_MySQL_Connector_INCLUDED +#define Data_MySQL_Connector_INCLUDED + + +#include "MySQL.h" +#include "Poco/Data/Connector.h" + + +namespace Poco { +namespace Data { +namespace MySQL { + + +class MySQL_API Connector: public Poco::Data::Connector + /// Connector instantiates MySQL SessionImpl objects. +{ +public: + + static std::string KEY; + + Connector(); + /// Creates the Connector. + + virtual ~Connector(); + /// Destroys the Connector. + + virtual const std::string& name() const; + /// Returns the name associated with this connector. + + virtual Poco::AutoPtr createSession(const std::string& connectionString, + std::size_t timeout = Poco::Data::SessionImpl::LOGIN_TIMEOUT_DEFAULT); + /// Creates a MySQL SessionImpl object and initializes it with the given connectionString. + + static void registerConnector(); + /// Registers the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory + + static void unregisterConnector(); + /// Unregisters the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory +}; + + +} } } // namespace Poco::Data::MySQL + + +#endif // Data_MySQL_Connector_INCLUDED diff --git a/Data/MySQL/src/Connector.cpp b/Data/MySQL/src/Connector.cpp index 40fd7f00f..9739518d6 100644 --- a/Data/MySQL/src/Connector.cpp +++ b/Data/MySQL/src/Connector.cpp @@ -1,93 +1,93 @@ -// -// MySQLException.cpp -// -// $Id: //poco/1.4/Data/MySQL/src/Connector.cpp#1 $ -// -// Library: Data -// Package: MySQL -// Module: Connector -// -// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Data/MySQL/Connector.h" -#include "Poco/Data/MySQL/SessionImpl.h" -#include "Poco/Data/SessionFactory.h" -#include "Poco/Exception.h" - -#include - - -namespace Poco { -namespace Data { -namespace MySQL { - - -std::string Connector::KEY("mysql"); - - -Connector::Connector() -{ -} - - -Connector::~Connector() -{ -} - -const std::string& Connector::name() const -{ - return KEY; -} - -Poco::AutoPtr Connector::createSession(const std::string& connectionString, - std::size_t timeout) -{ - return Poco::AutoPtr(new SessionImpl(connectionString, timeout)); -} - - -void Connector::registerConnector() -{ - if (mysql_library_init(0, 0, 0) != 0) - { - throw Exception("mysql_library_init error"); - } - - Poco::Data::SessionFactory::instance().add(new Connector()); -} - - -void Connector::unregisterConnector() -{ - Poco::Data::SessionFactory::instance().remove(KEY); - mysql_library_end(); -} - - -} } } // namespace Poco::Data::MySQL - +// +// MySQLException.cpp +// +// $Id: //poco/1.4/Data/MySQL/src/Connector.cpp#1 $ +// +// Library: Data +// Package: MySQL +// Module: Connector +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Data/MySQL/Connector.h" +#include "Poco/Data/MySQL/SessionImpl.h" +#include "Poco/Data/SessionFactory.h" +#include "Poco/Exception.h" + +#include + + +namespace Poco { +namespace Data { +namespace MySQL { + + +std::string Connector::KEY("mysql"); + + +Connector::Connector() +{ +} + + +Connector::~Connector() +{ +} + +const std::string& Connector::name() const +{ + return KEY; +} + +Poco::AutoPtr Connector::createSession(const std::string& connectionString, + std::size_t timeout) +{ + return Poco::AutoPtr(new SessionImpl(connectionString, timeout)); +} + + +void Connector::registerConnector() +{ + if (mysql_library_init(0, 0, 0) != 0) + { + throw Exception("mysql_library_init error"); + } + + Poco::Data::SessionFactory::instance().add(new Connector()); +} + + +void Connector::unregisterConnector() +{ + Poco::Data::SessionFactory::instance().remove(KEY); + mysql_library_end(); +} + + +} } } // namespace Poco::Data::MySQL + diff --git a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj index a18354a14..0f9d7d9c5 100644 --- a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj @@ -1,321 +1,321 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;libmysql.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;libmysql.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;libmysql.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;libmysql.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters index b29739050..0cd6b3773 100644 --- a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,54 +1,54 @@ - - - - - {fca6e86e-18c4-4e02-a61b-34e1db086866} - - - {54864d2c-cbbb-4b9f-bf22-e5b10b1d520f} - - - {6e9ecc7f-f391-41a2-8c5d-dc2bae072c06} - - - {7eeaca26-07d1-4196-934c-8ece6176c780} - - - {66ff2502-78a6-42b1-9c0c-c87b2bec53ae} - - - {5ed3d39f-4ca4-4ee8-b2e9-7905fbf2bc49} - - - {e11189c8-1556-4568-bf3a-367a1944b003} - - - {1a703f5b-5ef0-4ad3-94a9-c053949bd1ce} - - - - - MySQL\Header Files - - - MySQL\Header Files - - - _Suite\Header Files - - - - - MySQL\Source Files - - - MySQL\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {fca6e86e-18c4-4e02-a61b-34e1db086866} + + + {54864d2c-cbbb-4b9f-bf22-e5b10b1d520f} + + + {6e9ecc7f-f391-41a2-8c5d-dc2bae072c06} + + + {7eeaca26-07d1-4196-934c-8ece6176c780} + + + {66ff2502-78a6-42b1-9c0c-c87b2bec53ae} + + + {5ed3d39f-4ca4-4ee8-b2e9-7905fbf2bc49} + + + {e11189c8-1556-4568-bf3a-367a1944b003} + + + {1a703f5b-5ef0-4ad3-94a9-c053949bd1ce} + + + + + MySQL\Header Files + + + MySQL\Header Files + + + _Suite\Header Files + + + + + MySQL\Source Files + + + MySQL\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Data/MySQL/testsuite/TestSuite_vs71.vcproj b/Data/MySQL/testsuite/TestSuite_vs71.vcproj index 5993e7d2e..2852776f0 100644 --- a/Data/MySQL/testsuite/TestSuite_vs71.vcproj +++ b/Data/MySQL/testsuite/TestSuite_vs71.vcproj @@ -1,434 +1,434 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj index 25175bfc1..30aaa66b7 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj @@ -1,315 +1,315 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - Application - Static - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;libmysql.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;libmysql.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Static + MultiByte + + + Application + Static + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;libmysql.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;libmysql.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters index 75d249378..8eb6c152d 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -1,54 +1,54 @@ - - - - - {fd624a94-0fec-47b0-b4e3-247417d7921c} - - - {c7b2414c-a697-4b00-bd0c-46203b1cc7c8} - - - {bdaadb80-3374-4798-b558-1106961bb7a9} - - - {cea588d3-9aa0-4b45-8b36-fad431b31422} - - - {b6eaf401-3568-4fd7-b5a2-3d76552e3c0a} - - - {f44ced2a-2c70-4a85-b012-fdc60c97306e} - - - {c922efdc-3966-494e-98ee-426a522bcbe0} - - - {c28e44ef-3d01-436c-bb1a-f3e7d5f7f666} - - - - - MySQL\Header Files - - - MySQL\Header Files - - - _Suite\Header Files - - - - - MySQL\Source Files - - - MySQL\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {fd624a94-0fec-47b0-b4e3-247417d7921c} + + + {c7b2414c-a697-4b00-bd0c-46203b1cc7c8} + + + {bdaadb80-3374-4798-b558-1106961bb7a9} + + + {cea588d3-9aa0-4b45-8b36-fad431b31422} + + + {b6eaf401-3568-4fd7-b5a2-3d76552e3c0a} + + + {f44ced2a-2c70-4a85-b012-fdc60c97306e} + + + {c922efdc-3966-494e-98ee-426a522bcbe0} + + + {c28e44ef-3d01-436c-bb1a-f3e7d5f7f666} + + + + + MySQL\Header Files + + + MySQL\Header Files + + + _Suite\Header Files + + + + + MySQL\Source Files + + + MySQL\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj index 13a502c31..68678d5f7 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,321 +1,321 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;libmysql.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;libmysql.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;libmysql.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;libmysql.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters index 000f970d3..26b2b9622 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,54 +1,54 @@ - - - - - {eeab736f-4879-478b-9df8-239d4fddc440} - - - {86a5f1fe-f6ea-450f-b567-45bbaa5af9e8} - - - {e8f13685-3064-44a9-a63d-51bc639e5cf5} - - - {2d8dc3d7-7962-47a5-9afa-f0205a2c6096} - - - {0af92344-9f0d-4307-818d-565651f6552e} - - - {22bc2f62-6dd9-4ac1-90e4-0e6a319c475e} - - - {634d5106-80ee-4969-80d9-44a9a0a7fe7b} - - - {72b5e2d1-e3bf-46eb-98b0-15a306c392f1} - - - - - MySQL\Header Files - - - MySQL\Header Files - - - _Suite\Header Files - - - - - MySQL\Source Files - - - MySQL\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {eeab736f-4879-478b-9df8-239d4fddc440} + + + {86a5f1fe-f6ea-450f-b567-45bbaa5af9e8} + + + {e8f13685-3064-44a9-a63d-51bc639e5cf5} + + + {2d8dc3d7-7962-47a5-9afa-f0205a2c6096} + + + {0af92344-9f0d-4307-818d-565651f6552e} + + + {22bc2f62-6dd9-4ac1-90e4-0e6a319c475e} + + + {634d5106-80ee-4969-80d9-44a9a0a7fe7b} + + + {72b5e2d1-e3bf-46eb-98b0-15a306c392f1} + + + + + MySQL\Header Files + + + MySQL\Header Files + + + _Suite\Header Files + + + + + MySQL\Source Files + + + MySQL\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj b/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj index 64f664bd7..19dd40d0b 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj @@ -1,474 +1,474 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/MySQL/testsuite/src/SQLExecutor.h b/Data/MySQL/testsuite/src/SQLExecutor.h index cccf8e8a0..4166224d1 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.h +++ b/Data/MySQL/testsuite/src/SQLExecutor.h @@ -1,125 +1,126 @@ -// -// SQLExecutor.h -// -// $Id: //poco/1.4/Data/MySQL/testsuite/src/SQLExecutor.h#1 $ -// -// Definition of the SQLExecutor class. -// -// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef SQLExecutor_INCLUDED -#define SQLExecutor_INCLUDED - - -#include "Poco/Data/MySQL/MySQL.h" -#include "Poco/Data/Session.h" - -class SQLExecutor: public CppUnit::TestCase -{ -public: - enum DataBinding - { - PB_IMMEDIATE, - PB_AT_EXEC - }; - - enum DataExtraction - { - DE_MANUAL, - DE_BOUND - }; - - SQLExecutor(const std::string& name, Poco::Data::Session* _pSession); - ~SQLExecutor(); - - void bareboneMySQLTest(const char* host, const char* user, const char* pwd, const char* db, int port, const char* tableCreateString); - /// This function uses "bare bone" MySQL API calls (i.e. calls are not - /// "wrapped" in PocoData framework structures). - /// The purpose of the function is to verify that driver behaves - /// correctly. If this test passes, subsequent tests failures are likely ours. - - void simpleAccess(); - void complexType(); - void simpleAccessVector(); - void complexTypeVector(); - void insertVector(); - void insertEmptyVector(); - - void insertSingleBulk(); - void insertSingleBulkVec(); - - void limits(); - void limitOnce(); - void limitPrepare(); - void limitZero(); - void prepare(); - - void setSimple(); - void setComplex(); - void setComplexUnique(); - void multiSetSimple(); - void multiSetComplex(); - void mapComplex(); - void mapComplexUnique(); - void multiMapComplex(); - void selectIntoSingle(); - void selectIntoSingleStep(); - void selectIntoSingleFail(); - void lowerLimitOk(); - void lowerLimitFail(); - void combinedLimits(); - void combinedIllegalLimits(); - void ranges(); - void illegalRange(); - void singleSelect(); - void emptyDB(); - - void blob(int bigSize = 1024); - void blobStmt(); - - void floats(); - void doubles(); - void tuples(); - void tupleVector(); - - void internalExtraction(); - void doNull(); - - void sessionTransaction(const std::string& connect); - void transaction(const std::string& connect); - - void reconnect(); - -private: - void setTransactionIsolation(Poco::Data::Session& session, Poco::UInt32 ti); - - Poco::Data::Session* _pSession; -}; - - -#endif // SQLExecutor_INCLUDED +// +// SQLExecutor.h +// +// $Id: //poco/1.4/Data/MySQL/testsuite/src/SQLExecutor.h#1 $ +// +// Definition of the SQLExecutor class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef SQLExecutor_INCLUDED +#define SQLExecutor_INCLUDED + + +#include "Poco/Data/MySQL/MySQL.h" +#include "Poco/Data/Session.h" + + +class SQLExecutor: public CppUnit::TestCase +{ +public: + enum DataBinding + { + PB_IMMEDIATE, + PB_AT_EXEC + }; + + enum DataExtraction + { + DE_MANUAL, + DE_BOUND + }; + + SQLExecutor(const std::string& name, Poco::Data::Session* _pSession); + ~SQLExecutor(); + + void bareboneMySQLTest(const char* host, const char* user, const char* pwd, const char* db, int port, const char* tableCreateString); + /// This function uses "bare bone" MySQL API calls (i.e. calls are not + /// "wrapped" in PocoData framework structures). + /// The purpose of the function is to verify that driver behaves + /// correctly. If this test passes, subsequent tests failures are likely ours. + + void simpleAccess(); + void complexType(); + void simpleAccessVector(); + void complexTypeVector(); + void insertVector(); + void insertEmptyVector(); + + void insertSingleBulk(); + void insertSingleBulkVec(); + + void limits(); + void limitOnce(); + void limitPrepare(); + void limitZero(); + void prepare(); + + void setSimple(); + void setComplex(); + void setComplexUnique(); + void multiSetSimple(); + void multiSetComplex(); + void mapComplex(); + void mapComplexUnique(); + void multiMapComplex(); + void selectIntoSingle(); + void selectIntoSingleStep(); + void selectIntoSingleFail(); + void lowerLimitOk(); + void lowerLimitFail(); + void combinedLimits(); + void combinedIllegalLimits(); + void ranges(); + void illegalRange(); + void singleSelect(); + void emptyDB(); + + void blob(int bigSize = 1024); + void blobStmt(); + + void floats(); + void doubles(); + void tuples(); + void tupleVector(); + + void internalExtraction(); + void doNull(); + + void sessionTransaction(const std::string& connect); + void transaction(const std::string& connect); + + void reconnect(); + +private: + void setTransactionIsolation(Poco::Data::Session& session, Poco::UInt32 ti); + + Poco::Data::Session* _pSession; +}; + + +#endif // SQLExecutor_INCLUDED diff --git a/Data/ODBC/ODBC_vs110.sln b/Data/ODBC/ODBC_vs110.sln index ffb4a634b..9cf65b776 100644 --- a/Data/ODBC/ODBC_vs110.sln +++ b/Data/ODBC/ODBC_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ODBC", "ODBC_vs110.vcxproj", "{1B29820D-375F-11DB-837B-00123FC423B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{00627063-395B-4413-9099-23BDB56562FA}" - ProjectSection(ProjectDependencies) = postProject - {1B29820D-375F-11DB-837B-00123FC423B5} = {1B29820D-375F-11DB-837B-00123FC423B5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.release_shared|Win32.Build.0 = release_shared|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ODBC", "ODBC_vs110.vcxproj", "{1B29820D-375F-11DB-837B-00123FC423B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{00627063-395B-4413-9099-23BDB56562FA}" + ProjectSection(ProjectDependencies) = postProject + {1B29820D-375F-11DB-837B-00123FC423B5} = {1B29820D-375F-11DB-837B-00123FC423B5} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.release_shared|Win32.Build.0 = release_shared|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/ODBC/ODBC_vs110.vcxproj b/Data/ODBC/ODBC_vs110.vcxproj index 5dd34d0c4..dd9306629 100644 --- a/Data/ODBC/ODBC_vs110.vcxproj +++ b/Data/ODBC/ODBC_vs110.vcxproj @@ -1,331 +1,331 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - ODBC - {1B29820D-375F-11DB-837B-00123FC423B5} - ODBC - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\bin\ - obj\$(Configuration)\ - true - ..\..\bin\ - obj\$(Configuration)\ - false - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - PocoDataODBCd - PocoDataODBCmdd - PocoDataODBCmtd - PocoDataODBC - PocoDataODBCmd - PocoDataODBCmt - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\bin\PocoDataODBCd.dll - true - true - ..\..\bin\PocoDataODBCd.pdb - ..\..\lib;%(AdditionalLibraryDirectories) - Console - ..\..\lib\PocoDataODBCd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\bin\PocoDataODBC.dll - true - false - ..\..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\..\lib\PocoDataODBC.lib - MachineX86 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\..\lib\PocoDataODBCmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\..\lib\PocoDataODBCmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\..\lib\PocoDataODBCmt.lib - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\..\lib\PocoDataODBCmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\..\lib\PocoDataODBCmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\..\lib\PocoDataODBCmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\lib\PocoDataODBCmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + ODBC + {1B29820D-375F-11DB-837B-00123FC423B5} + ODBC + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\..\bin\ + obj\$(Configuration)\ + true + ..\..\bin\ + obj\$(Configuration)\ + false + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + PocoDataODBCd + PocoDataODBCmdd + PocoDataODBCmtd + PocoDataODBC + PocoDataODBCmd + PocoDataODBCmt + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataODBCd.dll + true + true + ..\..\bin\PocoDataODBCd.pdb + ..\..\lib;%(AdditionalLibraryDirectories) + Console + ..\..\lib\PocoDataODBCd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataODBC.dll + true + false + ..\..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib\PocoDataODBC.lib + MachineX86 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib\PocoDataODBCmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\..\lib\PocoDataODBCmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\..\lib\PocoDataODBCmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib\PocoDataODBCmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\..\lib\PocoDataODBCmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\..\lib\PocoDataODBCmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\lib\PocoDataODBCmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + diff --git a/Data/ODBC/ODBC_vs110.vcxproj.filters b/Data/ODBC/ODBC_vs110.vcxproj.filters index c0f7c157c..957389d86 100644 --- a/Data/ODBC/ODBC_vs110.vcxproj.filters +++ b/Data/ODBC/ODBC_vs110.vcxproj.filters @@ -1,126 +1,126 @@ - - - - - {03440dec-c896-4fd4-a8db-22536df013c8} - - - {1e6ce965-d823-48dd-9a98-a34b0a6dcc3d} - - - {5705317d-df7a-4c45-b630-340dc071021e} - - - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - + + + + + {03440dec-c896-4fd4-a8db-22536df013c8} + + + {1e6ce965-d823-48dd-9a98-a34b0a6dcc3d} + + + {5705317d-df7a-4c45-b630-340dc071021e} + + + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + \ No newline at end of file diff --git a/Data/ODBC/ODBC_x64_vs110.sln b/Data/ODBC/ODBC_x64_vs110.sln index 02367dc9e..b10e38cae 100644 --- a/Data/ODBC/ODBC_x64_vs110.sln +++ b/Data/ODBC/ODBC_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ODBC", "ODBC_x64_vs110.vcxproj", "{1B29820D-375F-11DB-837B-00123FC423B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{00627063-395B-4413-9099-23BDB56562FA}" - ProjectSection(ProjectDependencies) = postProject - {1B29820D-375F-11DB-837B-00123FC423B5} = {1B29820D-375F-11DB-837B-00123FC423B5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 - {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|x64.Build.0 = debug_shared|x64 - {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {00627063-395B-4413-9099-23BDB56562FA}.release_shared|x64.ActiveCfg = release_shared|x64 - {00627063-395B-4413-9099-23BDB56562FA}.release_shared|x64.Build.0 = release_shared|x64 - {00627063-395B-4413-9099-23BDB56562FA}.release_shared|x64.Deploy.0 = release_shared|x64 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.Build.0 = release_static_md|x64 - {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ODBC", "ODBC_x64_vs110.vcxproj", "{1B29820D-375F-11DB-837B-00123FC423B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{00627063-395B-4413-9099-23BDB56562FA}" + ProjectSection(ProjectDependencies) = postProject + {1B29820D-375F-11DB-837B-00123FC423B5} = {1B29820D-375F-11DB-837B-00123FC423B5} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 + {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|x64.Build.0 = debug_shared|x64 + {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {00627063-395B-4413-9099-23BDB56562FA}.release_shared|x64.ActiveCfg = release_shared|x64 + {00627063-395B-4413-9099-23BDB56562FA}.release_shared|x64.Build.0 = release_shared|x64 + {00627063-395B-4413-9099-23BDB56562FA}.release_shared|x64.Deploy.0 = release_shared|x64 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.Build.0 = release_static_md|x64 + {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/ODBC/ODBC_x64_vs110.vcxproj b/Data/ODBC/ODBC_x64_vs110.vcxproj index 6c2e67f6c..a5beb3c65 100644 --- a/Data/ODBC/ODBC_x64_vs110.vcxproj +++ b/Data/ODBC/ODBC_x64_vs110.vcxproj @@ -1,329 +1,329 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - ODBC - {1B29820D-375F-11DB-837B-00123FC423B5} - ODBC - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\bin64\ - obj64\$(Configuration)\ - true - ..\..\bin64\ - obj64\$(Configuration)\ - false - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - PocoDataODBC64d - PocoDataODBCmdd - PocoDataODBCmtd - PocoDataODBC64 - PocoDataODBCmd - PocoDataODBCmt - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\bin64\PocoDataODBC64d.dll - true - true - ..\..\bin64\PocoDataODBC64d.pdb - ..\..\lib64;%(AdditionalLibraryDirectories) - Console - ..\..\lib64\PocoDataODBCd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\bin64\PocoDataODBC64.dll - true - false - ..\..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\..\lib64\PocoDataODBC.lib - MachineX64 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\..\lib64\PocoDataODBCmtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataODBCmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataODBCmt.lib - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\..\lib64\PocoDataODBCmdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataODBCmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataODBCmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + ODBC + {1B29820D-375F-11DB-837B-00123FC423B5} + ODBC + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\..\bin64\ + obj64\$(Configuration)\ + true + ..\..\bin64\ + obj64\$(Configuration)\ + false + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + PocoDataODBC64d + PocoDataODBCmdd + PocoDataODBCmtd + PocoDataODBC64 + PocoDataODBCmd + PocoDataODBCmt + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\bin64\PocoDataODBC64d.dll + true + true + ..\..\bin64\PocoDataODBC64d.pdb + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + ..\..\lib64\PocoDataODBCd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\bin64\PocoDataODBC64.dll + true + false + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib64\PocoDataODBC.lib + MachineX64 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib64\PocoDataODBCmtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataODBCmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataODBCmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib64\PocoDataODBCmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataODBCmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataODBCmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + diff --git a/Data/ODBC/ODBC_x64_vs110.vcxproj.filters b/Data/ODBC/ODBC_x64_vs110.vcxproj.filters index 243408655..9127ffdc4 100644 --- a/Data/ODBC/ODBC_x64_vs110.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs110.vcxproj.filters @@ -1,126 +1,126 @@ - - - - - {5fb79c66-d4bb-4bbc-b06d-21acd9b46378} - - - {115196b5-3428-45df-b236-56a0b20954f2} - - - {b4f0a46d-6286-480e-9a50-3c44db55c9cc} - - - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - + + + + + {5fb79c66-d4bb-4bbc-b06d-21acd9b46378} + + + {115196b5-3428-45df-b236-56a0b20954f2} + + + {b4f0a46d-6286-480e-9a50-3c44db55c9cc} + + + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + \ No newline at end of file diff --git a/Data/ODBC/src/Utility.cpp b/Data/ODBC/src/Utility.cpp index d9279e827..fa18dee97 100644 --- a/Data/ODBC/src/Utility.cpp +++ b/Data/ODBC/src/Utility.cpp @@ -1,68 +1,68 @@ -// -// Utility.cpp -// -// $Id: //poco/Main/Data/ODBC/src/Utility.cpp#3 $ -// -// Library: ODBC -// Package: ODBC -// Module: Utility -// -// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Data/ODBC/Utility.h" -#include "Poco/Data/ODBC/Handle.h" -#include "Poco/Data/ODBC/ODBCException.h" -#include "Poco/NumberFormatter.h" -#include "Poco/DateTime.h" -#include - - -namespace Poco { -namespace Data { -namespace ODBC { - - -const TypeInfo Utility::_dataTypes; - - -Utility::DriverMap& Utility::drivers(Utility::DriverMap& driverMap) -{ - static const EnvironmentHandle henv; - const int length = sizeof(SQLCHAR) * 512; - - SQLCHAR desc[length]; - std::memset(desc, 0, length); - SQLSMALLINT len1 = length; - SQLCHAR attr[length]; - std::memset(attr, 0, length); - SQLSMALLINT len2 = length; - RETCODE rc = 0; - +// +// Utility.cpp +// +// $Id: //poco/Main/Data/ODBC/src/Utility.cpp#3 $ +// +// Library: ODBC +// Package: ODBC +// Module: Utility +// +// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Data/ODBC/Utility.h" +#include "Poco/Data/ODBC/Handle.h" +#include "Poco/Data/ODBC/ODBCException.h" +#include "Poco/NumberFormatter.h" +#include "Poco/DateTime.h" +#include + + +namespace Poco { +namespace Data { +namespace ODBC { + + +const TypeInfo Utility::_dataTypes; + + +Utility::DriverMap& Utility::drivers(Utility::DriverMap& driverMap) +{ + static const EnvironmentHandle henv; + const int length = sizeof(SQLCHAR) * 512; + + SQLCHAR desc[length]; + std::memset(desc, 0, length); + SQLSMALLINT len1 = length; + SQLCHAR attr[length]; + std::memset(attr, 0, length); + SQLSMALLINT len2 = length; + RETCODE rc = 0; + if (!Utility::isError(rc = SQLDrivers(henv, SQL_FETCH_FIRST, desc, @@ -87,95 +87,95 @@ Utility::DriverMap& Utility::drivers(Utility::DriverMap& driverMap) attr, len2, &len2))); - } - - if (SQL_NO_DATA != rc) - throw EnvironmentException(henv); - - return driverMap; -} - - -Utility::DSNMap& Utility::dataSources(Utility::DSNMap& dsnMap) -{ - static const EnvironmentHandle henv; - const int length = sizeof(SQLCHAR) * 512; - const int dsnLength = sizeof(SQLCHAR) * (SQL_MAX_DSN_LENGTH + 1); - - SQLCHAR dsn[dsnLength]; - std::memset(dsn, 0, dsnLength); - SQLSMALLINT len1 = sizeof(SQLCHAR) * SQL_MAX_DSN_LENGTH; - SQLCHAR desc[length]; - std::memset(desc, 0, length); - SQLSMALLINT len2 = length; - RETCODE rc = 0; - - while (!Utility::isError(rc = Poco::Data::ODBC::SQLDataSources(henv, - SQL_FETCH_NEXT, - dsn, - SQL_MAX_DSN_LENGTH, - &len1, - desc, - len2, - &len2))) - { - dsnMap.insert(DSNMap::value_type(std::string((char *) dsn), std::string((char *) desc))); - std::memset(dsn, 0, dsnLength); - std::memset(desc, 0, length); - len2 = length; - } - - if (SQL_NO_DATA != rc) - throw EnvironmentException(henv); - - return dsnMap; -} - - -void Utility::dateTimeSync(Poco::DateTime& dt, const SQL_TIMESTAMP_STRUCT& ts) -{ - double msec = ts.fraction/1000000; - double usec = 1000 * (msec - std::floor(msec)); - - dt.assign(ts.year, - ts.month, - ts.day, - ts.hour, - ts.minute, - ts.second, - (int) std::floor(msec), - (int) std::floor(usec)); -} - - -void Utility::dateSync(SQL_DATE_STRUCT& ds, const Date& d) -{ - ds.year = d.year(); - ds.month = d.month(); - ds.day = d.day(); -} - - -void Utility::timeSync(SQL_TIME_STRUCT& ts, const Time& t) -{ - ts.hour = t.hour(); - ts.minute = t.minute(); - ts.second = t.second(); -} - - -void Utility::dateTimeSync(SQL_TIMESTAMP_STRUCT& ts, const Poco::DateTime& dt) -{ - ts.year = dt.year(); - ts.month = dt.month(); - ts.day = dt.day(); - ts.hour = dt.hour(); - ts.minute = dt.minute(); - ts.second = dt.second(); - // Fraction support is limited to milliseconds due to MS SQL Server limitation - // see http://support.microsoft.com/kb/263872 - ts.fraction = (dt.millisecond() * 1000000);// + (dt.microsecond() * 1000); -} - - -} } } // namespace Poco::Data::ODBC + } + + if (SQL_NO_DATA != rc) + throw EnvironmentException(henv); + + return driverMap; +} + + +Utility::DSNMap& Utility::dataSources(Utility::DSNMap& dsnMap) +{ + static const EnvironmentHandle henv; + const int length = sizeof(SQLCHAR) * 512; + const int dsnLength = sizeof(SQLCHAR) * (SQL_MAX_DSN_LENGTH + 1); + + SQLCHAR dsn[dsnLength]; + std::memset(dsn, 0, dsnLength); + SQLSMALLINT len1 = sizeof(SQLCHAR) * SQL_MAX_DSN_LENGTH; + SQLCHAR desc[length]; + std::memset(desc, 0, length); + SQLSMALLINT len2 = length; + RETCODE rc = 0; + + while (!Utility::isError(rc = Poco::Data::ODBC::SQLDataSources(henv, + SQL_FETCH_NEXT, + dsn, + SQL_MAX_DSN_LENGTH, + &len1, + desc, + len2, + &len2))) + { + dsnMap.insert(DSNMap::value_type(std::string((char *) dsn), std::string((char *) desc))); + std::memset(dsn, 0, dsnLength); + std::memset(desc, 0, length); + len2 = length; + } + + if (SQL_NO_DATA != rc) + throw EnvironmentException(henv); + + return dsnMap; +} + + +void Utility::dateTimeSync(Poco::DateTime& dt, const SQL_TIMESTAMP_STRUCT& ts) +{ + double msec = ts.fraction/1000000; + double usec = 1000 * (msec - std::floor(msec)); + + dt.assign(ts.year, + ts.month, + ts.day, + ts.hour, + ts.minute, + ts.second, + (int) std::floor(msec), + (int) std::floor(usec)); +} + + +void Utility::dateSync(SQL_DATE_STRUCT& ds, const Date& d) +{ + ds.year = d.year(); + ds.month = d.month(); + ds.day = d.day(); +} + + +void Utility::timeSync(SQL_TIME_STRUCT& ts, const Time& t) +{ + ts.hour = t.hour(); + ts.minute = t.minute(); + ts.second = t.second(); +} + + +void Utility::dateTimeSync(SQL_TIMESTAMP_STRUCT& ts, const Poco::DateTime& dt) +{ + ts.year = dt.year(); + ts.month = dt.month(); + ts.day = dt.day(); + ts.hour = dt.hour(); + ts.minute = dt.minute(); + ts.second = dt.second(); + // Fraction support is limited to milliseconds due to MS SQL Server limitation + // see http://support.microsoft.com/kb/263872 + ts.fraction = (dt.millisecond() * 1000000);// + (dt.microsecond() * 1000); +} + + +} } } // namespace Poco::Data::ODBC diff --git a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj index 03e6d6711..05f964ed3 100644 --- a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj @@ -1,335 +1,335 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {00627063-395B-4413-9099-23BDB56562FA} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {00627063-395B-4413-9099-23BDB56562FA} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters index f25df5838..9b044f50a 100644 --- a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,96 +1,96 @@ - - - - - {3449dd28-7057-47c6-893e-484357382f9a} - - - {7ed33364-9c61-4cd7-aad4-03f61947c14b} - - - {7ddb490c-7c7b-4da8-8a90-1d820dfe1bae} - - - {d2795ed5-abee-45ae-9068-06cc174577b8} - - - {9dc476e2-51c9-4b3a-9cd2-d4e3e387ab57} - - - {26f55ba4-38a0-442f-85ea-91780fba6800} - - - {b6ab5073-2cb1-4def-835a-a67e75256155} - - - {b5999f29-7591-499d-b481-86b994e01470} - - - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - _Suite\Header Files - - - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {3449dd28-7057-47c6-893e-484357382f9a} + + + {7ed33364-9c61-4cd7-aad4-03f61947c14b} + + + {7ddb490c-7c7b-4da8-8a90-1d820dfe1bae} + + + {d2795ed5-abee-45ae-9068-06cc174577b8} + + + {9dc476e2-51c9-4b3a-9cd2-d4e3e387ab57} + + + {26f55ba4-38a0-442f-85ea-91780fba6800} + + + {b6ab5073-2cb1-4def-835a-a67e75256155} + + + {b5999f29-7591-499d-b481-86b994e01470} + + + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + _Suite\Header Files + + + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj index e8075760c..f7e69a384 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj @@ -1,329 +1,329 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {00627063-395B-4413-9099-23BDB56562FA} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - Application - Static - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {00627063-395B-4413-9099-23BDB56562FA} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Static + MultiByte + + + Application + Static + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters index 2256310aa..a3677896d 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -1,96 +1,96 @@ - - - - - {450ebf5c-f147-47c2-8a5e-3cda37407219} - - - {89b6c7d3-9bb2-4b47-8d91-cdfb6596501d} - - - {cf9a15ae-bb42-43a5-8aa9-45facce2b88c} - - - {d6d9e99f-c2d1-4836-a7e1-2c8a88ced3e6} - - - {e01e9cb5-8dfa-4cb2-a82d-cf75e69a897d} - - - {1abfbea0-122c-4788-b536-c33b2c08fec7} - - - {b669a038-aca9-4f39-891f-745fe7fdc150} - - - {298fc110-71e2-4503-a466-821275b2ea76} - - - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - _Suite\Header Files - - - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {450ebf5c-f147-47c2-8a5e-3cda37407219} + + + {89b6c7d3-9bb2-4b47-8d91-cdfb6596501d} + + + {cf9a15ae-bb42-43a5-8aa9-45facce2b88c} + + + {d6d9e99f-c2d1-4836-a7e1-2c8a88ced3e6} + + + {e01e9cb5-8dfa-4cb2-a82d-cf75e69a897d} + + + {1abfbea0-122c-4788-b536-c33b2c08fec7} + + + {b669a038-aca9-4f39-891f-745fe7fdc150} + + + {298fc110-71e2-4503-a466-821275b2ea76} + + + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + _Suite\Header Files + + + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj index 872437fb8..c8c08ffba 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,335 +1,335 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {00627063-395B-4413-9099-23BDB56562FA} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {00627063-395B-4413-9099-23BDB56562FA} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters index e235ed7d7..1c29b8f2a 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,96 +1,96 @@ - - - - - {89896c1f-80b8-4553-97b2-124e891da195} - - - {7d0215ed-c19e-4250-9135-2a3ffb5b3aed} - - - {5cfde2cd-4e9c-4083-a96e-d54b7b057d01} - - - {cf2ae3df-893c-477b-81ff-aa660ce0bca9} - - - {00806c84-5431-47c7-bbcc-bc4b8a7863ca} - - - {8528442a-571e-42e5-90b9-a33e5422ecf9} - - - {b27c75b0-7d05-41d9-b98f-370f0e6ac8f2} - - - {aee0592d-fb93-4733-8a07-19ff5cf04c2f} - - - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - _Suite\Header Files - - - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {89896c1f-80b8-4553-97b2-124e891da195} + + + {7d0215ed-c19e-4250-9135-2a3ffb5b3aed} + + + {5cfde2cd-4e9c-4083-a96e-d54b7b057d01} + + + {cf2ae3df-893c-477b-81ff-aa660ce0bca9} + + + {00806c84-5431-47c7-bbcc-bc4b8a7863ca} + + + {8528442a-571e-42e5-90b9-a33e5422ecf9} + + + {b27c75b0-7d05-41d9-b98f-370f0e6ac8f2} + + + {aee0592d-fb93-4733-8a07-19ff5cf04c2f} + + + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + _Suite\Header Files + + + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj b/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj index 18f86fabc..0daf5a979 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj @@ -1,502 +1,502 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/SQLite/SQLite_CE_vs90.sln b/Data/SQLite/SQLite_CE_vs90.sln index 853c8cf61..9b9529982 100644 --- a/Data/SQLite/SQLite_CE_vs90.sln +++ b/Data/SQLite/SQLite_CE_vs90.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_CE_vs90.vcproj", "{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_CE_vs90.vcproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}" - ProjectSection(ProjectDependencies) = postProject - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} = {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) - release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) - debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) - release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) - debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) - release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_CE_vs90.vcproj", "{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_CE_vs90.vcproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}" + ProjectSection(ProjectDependencies) = postProject + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} = {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) + release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) + debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) + release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) + debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) + release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/SQLite/SQLite_CE_vs90.vcproj b/Data/SQLite/SQLite_CE_vs90.vcproj index 90ce04317..dddf6d1f6 100644 --- a/Data/SQLite/SQLite_CE_vs90.vcproj +++ b/Data/SQLite/SQLite_CE_vs90.vcproj @@ -1,522 +1,522 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/SQLite/SQLite_vs110.sln b/Data/SQLite/SQLite_vs110.sln index 204adf586..df903a9cf 100644 --- a/Data/SQLite/SQLite_vs110.sln +++ b/Data/SQLite/SQLite_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_vs110.vcxproj", "{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}" - ProjectSection(ProjectDependencies) = postProject - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} = {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Win32.Build.0 = release_shared|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Build.0 = release_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_vs110.vcxproj", "{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}" + ProjectSection(ProjectDependencies) = postProject + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} = {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Win32.Build.0 = release_shared|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Build.0 = release_shared|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/SQLite/SQLite_vs110.vcxproj b/Data/SQLite/SQLite_vs110.vcxproj index 66c0178cf..1d60c79bc 100644 --- a/Data/SQLite/SQLite_vs110.vcxproj +++ b/Data/SQLite/SQLite_vs110.vcxproj @@ -1,298 +1,298 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - SQLite - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} - SQLite - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\bin\ - obj\$(Configuration)\ - true - ..\..\bin\ - obj\$(Configuration)\ - false - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - PocoDataSQLited - PocoDataSQLitemdd - PocoDataSQLitemtd - PocoDataSQLite - PocoDataSQLitemd - PocoDataSQLitemt - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\..\bin\PocoDataSQLited.dll - true - true - ..\..\bin\PocoDataSQLited.pdb - ..\..\lib;%(AdditionalLibraryDirectories) - Console - ..\..\lib\PocoDataSQLited.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\..\bin\PocoDataSQLite.dll - true - false - ..\..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\..\lib\PocoDataSQLite.lib - MachineX86 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\..\lib\PocoDataSQLitemtd.pdb - Level3 - EditAndContinue - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\PocoDataSQLitemtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\PocoDataSQLitemt.lib - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\..\lib\PocoDataSQLitemdd.pdb - Level3 - EditAndContinue - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\PocoDataSQLitemdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\..\lib\PocoDataSQLitemd.pdb - Level3 - - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\..\lib\PocoDataSQLitemd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + SQLite + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} + SQLite + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\..\bin\ + obj\$(Configuration)\ + true + ..\..\bin\ + obj\$(Configuration)\ + false + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + ..\..\lib\ + obj\$(Configuration)\ + PocoDataSQLited + PocoDataSQLitemdd + PocoDataSQLitemtd + PocoDataSQLite + PocoDataSQLitemd + PocoDataSQLitemt + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\..\bin\PocoDataSQLited.dll + true + true + ..\..\bin\PocoDataSQLited.pdb + ..\..\lib;%(AdditionalLibraryDirectories) + Console + ..\..\lib\PocoDataSQLited.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\..\bin\PocoDataSQLite.dll + true + false + ..\..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib\PocoDataSQLite.lib + MachineX86 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib\PocoDataSQLitemtd.pdb + Level3 + EditAndContinue + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + ..\..\lib\PocoDataSQLitemtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + ..\..\lib\PocoDataSQLitemt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib\PocoDataSQLitemdd.pdb + Level3 + EditAndContinue + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + ..\..\lib\PocoDataSQLitemdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\..\lib\PocoDataSQLitemd.pdb + Level3 + + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\..\lib\PocoDataSQLitemd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/SQLite/SQLite_vs110.vcxproj.filters b/Data/SQLite/SQLite_vs110.vcxproj.filters index ec2a162f9..b8cadaba9 100644 --- a/Data/SQLite/SQLite_vs110.vcxproj.filters +++ b/Data/SQLite/SQLite_vs110.vcxproj.filters @@ -1,78 +1,78 @@ - - - - - {1a11f0bf-d7d2-41ce-a6b9-189725a7c759} - - - {cc1106a7-077d-45cb-91bb-532ec071322f} - - - {b971f786-32a3-42bf-9622-0f495e128b32} - - - {88f78d93-7bd3-4f0c-bdfb-a0732dc4b514} - - - {42f1eb2b-1c36-4d03-a18a-bcee720e45cc} - - - {33125f09-7f0b-4e6c-a373-45395d623d45} - - - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - 3rdparty\Header Files - - - - - SQLite\Source Files - - - SQLite\Source Files - - - SQLite\Source Files - - - SQLite\Source Files - - - SQLite\Source Files - - - SQLite\Source Files - - - SQLite\Source Files - - - 3rdparty\Source Files - - + + + + + {1a11f0bf-d7d2-41ce-a6b9-189725a7c759} + + + {cc1106a7-077d-45cb-91bb-532ec071322f} + + + {b971f786-32a3-42bf-9622-0f495e128b32} + + + {88f78d93-7bd3-4f0c-bdfb-a0732dc4b514} + + + {42f1eb2b-1c36-4d03-a18a-bcee720e45cc} + + + {33125f09-7f0b-4e6c-a373-45395d623d45} + + + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + 3rdparty\Header Files + + + + + SQLite\Source Files + + + SQLite\Source Files + + + SQLite\Source Files + + + SQLite\Source Files + + + SQLite\Source Files + + + SQLite\Source Files + + + SQLite\Source Files + + + 3rdparty\Source Files + + \ No newline at end of file diff --git a/Data/SQLite/SQLite_x64_vs110.sln b/Data/SQLite/SQLite_x64_vs110.sln index 202dece9b..5258edd75 100644 --- a/Data/SQLite/SQLite_x64_vs110.sln +++ b/Data/SQLite/SQLite_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_x64_vs110.vcxproj", "{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}" - ProjectSection(ProjectDependencies) = postProject - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} = {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|x64.Build.0 = debug_shared|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|x64.ActiveCfg = release_shared|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|x64.Build.0 = release_shared|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|x64.Deploy.0 = release_shared|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.Build.0 = release_static_md|x64 - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.Build.0 = debug_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.ActiveCfg = release_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Build.0 = release_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Deploy.0 = release_shared|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Build.0 = release_static_md|x64 - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_x64_vs110.vcxproj", "{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}" + ProjectSection(ProjectDependencies) = postProject + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} = {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|x64.Build.0 = debug_shared|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|x64.ActiveCfg = release_shared|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|x64.Build.0 = release_shared|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|x64.Deploy.0 = release_shared|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.Build.0 = release_static_md|x64 + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.Build.0 = debug_shared|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.ActiveCfg = release_shared|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Build.0 = release_shared|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Deploy.0 = release_shared|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Build.0 = release_static_md|x64 + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/SQLite/SQLite_x64_vs110.vcxproj b/Data/SQLite/SQLite_x64_vs110.vcxproj index bb1ddb95c..680862987 100644 --- a/Data/SQLite/SQLite_x64_vs110.vcxproj +++ b/Data/SQLite/SQLite_x64_vs110.vcxproj @@ -1,296 +1,296 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - SQLite - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} - SQLite - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\bin64\ - obj64\$(Configuration)\ - true - ..\..\bin64\ - obj64\$(Configuration)\ - false - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - PocoDataSQLite64d - PocoDataSQLitemdd - PocoDataSQLitemtd - PocoDataSQLite64 - PocoDataSQLitemd - PocoDataSQLitemt - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\..\bin64\PocoDataSQLite64d.dll - true - true - ..\..\bin64\PocoDataSQLite64d.pdb - ..\..\lib64;%(AdditionalLibraryDirectories) - Console - ..\..\lib64\PocoDataSQLited.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\..\bin64\PocoDataSQLite64.dll - true - false - ..\..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\..\lib64\PocoDataSQLite.lib - MachineX64 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\..\lib64\PocoDataSQLitemtd.pdb - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataSQLitemtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataSQLitemt.lib - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\..\lib64\PocoDataSQLitemdd.pdb - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataSQLitemdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib64\PocoDataSQLitemd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + SQLite + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} + SQLite + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\..\bin64\ + obj64\$(Configuration)\ + true + ..\..\bin64\ + obj64\$(Configuration)\ + false + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + ..\..\lib64\ + obj64\$(Configuration)\ + PocoDataSQLite64d + PocoDataSQLitemdd + PocoDataSQLitemtd + PocoDataSQLite64 + PocoDataSQLitemd + PocoDataSQLitemt + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\..\bin64\PocoDataSQLite64d.dll + true + true + ..\..\bin64\PocoDataSQLite64d.pdb + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + ..\..\lib64\PocoDataSQLited.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\..\bin64\PocoDataSQLite64.dll + true + false + ..\..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib64\PocoDataSQLite.lib + MachineX64 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib64\PocoDataSQLitemtd.pdb + Level3 + ProgramDatabase + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataSQLitemtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataSQLitemt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib64\PocoDataSQLitemdd.pdb + Level3 + ProgramDatabase + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataSQLitemdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + 4996;4244;4018;%(DisableSpecificWarnings) + + + ..\..\lib64\PocoDataSQLitemd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/SQLite/SQLite_x64_vs110.vcxproj.filters b/Data/SQLite/SQLite_x64_vs110.vcxproj.filters index b3f6d8be4..f887ab2de 100644 --- a/Data/SQLite/SQLite_x64_vs110.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs110.vcxproj.filters @@ -1,78 +1,78 @@ - - - - - {974d9006-374b-427c-b476-d123b141d9e4} - - - {1b669eb5-0be6-48fb-81da-18a39706df79} - - - {74179984-e181-4c88-b34d-458b6ee631e8} - - - {5078ec57-4db8-4592-b687-6842aeb1d9ef} - - - {f5bccf88-548a-41b5-b7e6-c1c525121815} - - - {1c7fc6d1-3431-4f04-9278-3c8b78a3bd91} - - - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - SQLite\Header Files - - - 3rdparty\Header Files - - - - - SQLite\Source Files - - - SQLite\Source Files - - - SQLite\Source Files - - - SQLite\Source Files - - - SQLite\Source Files - - - SQLite\Source Files - - - SQLite\Source Files - - - 3rdparty\Source Files - - + + + + + {974d9006-374b-427c-b476-d123b141d9e4} + + + {1b669eb5-0be6-48fb-81da-18a39706df79} + + + {74179984-e181-4c88-b34d-458b6ee631e8} + + + {5078ec57-4db8-4592-b687-6842aeb1d9ef} + + + {f5bccf88-548a-41b5-b7e6-c1c525121815} + + + {1c7fc6d1-3431-4f04-9278-3c8b78a3bd91} + + + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + SQLite\Header Files + + + 3rdparty\Header Files + + + + + SQLite\Source Files + + + SQLite\Source Files + + + SQLite\Source Files + + + SQLite\Source Files + + + SQLite\Source Files + + + SQLite\Source Files + + + SQLite\Source Files + + + 3rdparty\Source Files + + \ No newline at end of file diff --git a/Data/SQLite/src/Connector.cpp b/Data/SQLite/src/Connector.cpp index c6964bcd7..c4c6fa6db 100644 --- a/Data/SQLite/src/Connector.cpp +++ b/Data/SQLite/src/Connector.cpp @@ -1,96 +1,96 @@ -// -// Connector.cpp -// -// $Id: //poco/Main/Data/SQLite/src/Connector.cpp#2 $ -// -// Library: SQLite -// Package: SQLite -// Module: Connector -// -// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Data/SQLite/Connector.h" -#include "Poco/Data/SQLite/SessionImpl.h" -#include "Poco/Data/SessionFactory.h" -#if defined(POCO_UNBUNDLED) -#include -#else -#include "sqlite3.h" -#endif - - -namespace Poco { -namespace Data { -namespace SQLite { - - -const std::string Connector::KEY("sqlite"); - - -Connector::Connector() -{ -} - - -Connector::~Connector() -{ -} - - -Poco::AutoPtr Connector::createSession(const std::string& connectionString, - std::size_t timeout) -{ - return Poco::AutoPtr(new SessionImpl(connectionString, timeout)); -} - - -void Connector::registerConnector() -{ - Poco::Data::SessionFactory::instance().add(new Connector()); -} - - -void Connector::unregisterConnector() -{ - Poco::Data::SessionFactory::instance().remove(KEY); -} - - -void Connector::enableSharedCache(bool flag) -{ - sqlite3_enable_shared_cache(flag ? 1 : 0); -} - - -void Connector::enableSoftHeapLimit(int limit) -{ - sqlite3_soft_heap_limit(limit); -} - - -} } } // namespace Poco::Data::SQLite +// +// Connector.cpp +// +// $Id: //poco/Main/Data/SQLite/src/Connector.cpp#2 $ +// +// Library: SQLite +// Package: SQLite +// Module: Connector +// +// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Data/SQLite/Connector.h" +#include "Poco/Data/SQLite/SessionImpl.h" +#include "Poco/Data/SessionFactory.h" +#if defined(POCO_UNBUNDLED) +#include +#else +#include "sqlite3.h" +#endif + + +namespace Poco { +namespace Data { +namespace SQLite { + + +const std::string Connector::KEY("sqlite"); + + +Connector::Connector() +{ +} + + +Connector::~Connector() +{ +} + + +Poco::AutoPtr Connector::createSession(const std::string& connectionString, + std::size_t timeout) +{ + return Poco::AutoPtr(new SessionImpl(connectionString, timeout)); +} + + +void Connector::registerConnector() +{ + Poco::Data::SessionFactory::instance().add(new Connector()); +} + + +void Connector::unregisterConnector() +{ + Poco::Data::SessionFactory::instance().remove(KEY); +} + + +void Connector::enableSharedCache(bool flag) +{ + sqlite3_enable_shared_cache(flag ? 1 : 0); +} + + +void Connector::enableSoftHeapLimit(int limit) +{ + sqlite3_soft_heap_limit(limit); +} + + +} } } // namespace Poco::Data::SQLite diff --git a/Data/SQLite/src/Extractor.cpp b/Data/SQLite/src/Extractor.cpp index 6a538a505..e1cd19bf7 100644 --- a/Data/SQLite/src/Extractor.cpp +++ b/Data/SQLite/src/Extractor.cpp @@ -1,260 +1,260 @@ -// -// Extractor.cpp -// -// $Id: //poco/Main/Data/SQLite/src/Extractor.cpp#5 $ -// -// Library: SQLite -// Package: SQLite -// Module: Extractor -// -// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Data/SQLite/Extractor.h" -#include "Poco/Data/SQLite/Utility.h" -#include "Poco/Data/Date.h" -#include "Poco/Data/Time.h" -#include "Poco/Data/LOB.h" -#include "Poco/Data/DataException.h" -#include "Poco/DateTimeParser.h" -#include "Poco/Exception.h" -#if defined(POCO_UNBUNDLED) -#include -#else -#include "sqlite3.h" -#endif -#include - - -using Poco::DateTimeParser; - - -namespace Poco { -namespace Data { -namespace SQLite { - - -Extractor::Extractor(sqlite3_stmt* pStmt): - _pStmt(pStmt) -{ -} - - -Extractor::~Extractor() -{ -} - - -bool Extractor::extract(std::size_t pos, Poco::Int32& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int(_pStmt, (int) pos); - return true; -} - - -bool Extractor::extract(std::size_t pos, Poco::Int64& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int64(_pStmt, (int) pos); - return true; -} - - -#ifndef POCO_LONG_IS_64_BIT -bool Extractor::extract(std::size_t pos, long& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int(_pStmt, (int) pos); - return true; -} - - -bool Extractor::extract(std::size_t pos, unsigned long& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int(_pStmt, (int) pos); - return true; -} -#endif - - -bool Extractor::extract(std::size_t pos, double& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_double(_pStmt, (int) pos); - return true; -} - - -bool Extractor::extract(std::size_t pos, std::string& val) -{ - if (isNull(pos)) return false; - const char *pBuf = reinterpret_cast(sqlite3_column_text(_pStmt, (int) pos)); - if (!pBuf) - val.clear(); - else - val = std::string(pBuf); - return true; -} - - -bool Extractor::extract(std::size_t pos, Poco::Int8& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int(_pStmt, (int) pos); - return true; -} - - -bool Extractor::extract(std::size_t pos, Poco::UInt8& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int(_pStmt, (int) pos); - return true; -} - - -bool Extractor::extract(std::size_t pos, Poco::Int16& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int(_pStmt, (int) pos); - return true; -} - - -bool Extractor::extract(std::size_t pos, Poco::UInt16& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int(_pStmt, (int) pos); - return true; -} - - -bool Extractor::extract(std::size_t pos, Poco::UInt32& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int(_pStmt, (int) pos); - return true; -} - - -bool Extractor::extract(std::size_t pos, Poco::UInt64& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int64(_pStmt, (int) pos); - return true; -} - - -bool Extractor::extract(std::size_t pos, bool& val) -{ - if (isNull(pos)) return false; - val = (0 != sqlite3_column_int(_pStmt, (int) pos)); - return true; -} - - -bool Extractor::extract(std::size_t pos, float& val) -{ - if (isNull(pos)) return false; - val = static_cast(sqlite3_column_double(_pStmt, (int) pos)); - return true; -} - - -bool Extractor::extract(std::size_t pos, char& val) -{ - if (isNull(pos)) return false; - val = sqlite3_column_int(_pStmt, (int) pos); - return true; -} - - -bool Extractor::extract(std::size_t pos, Date& val) -{ - if (isNull(pos)) return false; - std::string str; - extract(pos, str); - int tzd; - DateTime dt = DateTimeParser::parse(Utility::SQLITE_DATE_FORMAT, str, tzd); - val = dt; - return true; -} - - -bool Extractor::extract(std::size_t pos, Time& val) -{ - if (isNull(pos)) return false; - std::string str; - extract(pos, str); - int tzd; - DateTime dt = DateTimeParser::parse(Utility::SQLITE_TIME_FORMAT, str, tzd); - val = dt; - return true; -} - - -bool Extractor::extract(std::size_t pos, DateTime& val) -{ - if (isNull(pos)) return false; - std::string dt; - extract(pos, dt); - int tzd; - DateTimeParser::parse(dt, val, tzd); - return true; -} - - -bool Extractor::extract(std::size_t pos, Poco::Any& val) -{ - return extractImpl(pos, val); -} - - -bool Extractor::extract(std::size_t pos, Poco::DynamicAny& val) -{ - return extractImpl(pos, val); -} - - -bool Extractor::isNull(std::size_t pos, std::size_t) -{ - if (pos >= _nulls.size()) - _nulls.resize(pos + 1); - - if (!_nulls[pos].first) - { - _nulls[pos].first = true; - _nulls[pos].second = (SQLITE_NULL == sqlite3_column_type(_pStmt, pos)); - } - - return _nulls[pos].second; -} - - -} } } // namespace Poco::Data::SQLite +// +// Extractor.cpp +// +// $Id: //poco/Main/Data/SQLite/src/Extractor.cpp#5 $ +// +// Library: SQLite +// Package: SQLite +// Module: Extractor +// +// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Data/SQLite/Extractor.h" +#include "Poco/Data/SQLite/Utility.h" +#include "Poco/Data/Date.h" +#include "Poco/Data/Time.h" +#include "Poco/Data/LOB.h" +#include "Poco/Data/DataException.h" +#include "Poco/DateTimeParser.h" +#include "Poco/Exception.h" +#if defined(POCO_UNBUNDLED) +#include +#else +#include "sqlite3.h" +#endif +#include + + +using Poco::DateTimeParser; + + +namespace Poco { +namespace Data { +namespace SQLite { + + +Extractor::Extractor(sqlite3_stmt* pStmt): + _pStmt(pStmt) +{ +} + + +Extractor::~Extractor() +{ +} + + +bool Extractor::extract(std::size_t pos, Poco::Int32& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int(_pStmt, (int) pos); + return true; +} + + +bool Extractor::extract(std::size_t pos, Poco::Int64& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int64(_pStmt, (int) pos); + return true; +} + + +#ifndef POCO_LONG_IS_64_BIT +bool Extractor::extract(std::size_t pos, long& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int(_pStmt, (int) pos); + return true; +} + + +bool Extractor::extract(std::size_t pos, unsigned long& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int(_pStmt, (int) pos); + return true; +} +#endif + + +bool Extractor::extract(std::size_t pos, double& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_double(_pStmt, (int) pos); + return true; +} + + +bool Extractor::extract(std::size_t pos, std::string& val) +{ + if (isNull(pos)) return false; + const char *pBuf = reinterpret_cast(sqlite3_column_text(_pStmt, (int) pos)); + if (!pBuf) + val.clear(); + else + val = std::string(pBuf); + return true; +} + + +bool Extractor::extract(std::size_t pos, Poco::Int8& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int(_pStmt, (int) pos); + return true; +} + + +bool Extractor::extract(std::size_t pos, Poco::UInt8& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int(_pStmt, (int) pos); + return true; +} + + +bool Extractor::extract(std::size_t pos, Poco::Int16& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int(_pStmt, (int) pos); + return true; +} + + +bool Extractor::extract(std::size_t pos, Poco::UInt16& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int(_pStmt, (int) pos); + return true; +} + + +bool Extractor::extract(std::size_t pos, Poco::UInt32& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int(_pStmt, (int) pos); + return true; +} + + +bool Extractor::extract(std::size_t pos, Poco::UInt64& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int64(_pStmt, (int) pos); + return true; +} + + +bool Extractor::extract(std::size_t pos, bool& val) +{ + if (isNull(pos)) return false; + val = (0 != sqlite3_column_int(_pStmt, (int) pos)); + return true; +} + + +bool Extractor::extract(std::size_t pos, float& val) +{ + if (isNull(pos)) return false; + val = static_cast(sqlite3_column_double(_pStmt, (int) pos)); + return true; +} + + +bool Extractor::extract(std::size_t pos, char& val) +{ + if (isNull(pos)) return false; + val = sqlite3_column_int(_pStmt, (int) pos); + return true; +} + + +bool Extractor::extract(std::size_t pos, Date& val) +{ + if (isNull(pos)) return false; + std::string str; + extract(pos, str); + int tzd; + DateTime dt = DateTimeParser::parse(Utility::SQLITE_DATE_FORMAT, str, tzd); + val = dt; + return true; +} + + +bool Extractor::extract(std::size_t pos, Time& val) +{ + if (isNull(pos)) return false; + std::string str; + extract(pos, str); + int tzd; + DateTime dt = DateTimeParser::parse(Utility::SQLITE_TIME_FORMAT, str, tzd); + val = dt; + return true; +} + + +bool Extractor::extract(std::size_t pos, DateTime& val) +{ + if (isNull(pos)) return false; + std::string dt; + extract(pos, dt); + int tzd; + DateTimeParser::parse(dt, val, tzd); + return true; +} + + +bool Extractor::extract(std::size_t pos, Poco::Any& val) +{ + return extractImpl(pos, val); +} + + +bool Extractor::extract(std::size_t pos, Poco::DynamicAny& val) +{ + return extractImpl(pos, val); +} + + +bool Extractor::isNull(std::size_t pos, std::size_t) +{ + if (pos >= _nulls.size()) + _nulls.resize(pos + 1); + + if (!_nulls[pos].first) + { + _nulls[pos].first = true; + _nulls[pos].second = (SQLITE_NULL == sqlite3_column_type(_pStmt, pos)); + } + + return _nulls[pos].second; +} + + +} } } // namespace Poco::Data::SQLite diff --git a/Data/SQLite/src/SQLiteStatementImpl.cpp b/Data/SQLite/src/SQLiteStatementImpl.cpp index d3fd4f039..58be0f305 100644 --- a/Data/SQLite/src/SQLiteStatementImpl.cpp +++ b/Data/SQLite/src/SQLiteStatementImpl.cpp @@ -1,311 +1,311 @@ -// -// SQLiteStatementImpl.cpp -// -// $Id: //poco/Main/Data/SQLite/src/SQLiteStatementImpl.cpp#8 $ -// -// Library: SQLite -// Package: SQLite -// Module: SQLiteStatementImpl -// -// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Data/SQLite/SQLiteStatementImpl.h" -#include "Poco/Data/SQLite/Utility.h" -#include "Poco/Data/SQLite/SQLiteException.h" -#include "Poco/String.h" -#include -#include -#if defined(POCO_UNBUNDLED) -#include -#else -#include "sqlite3.h" -#endif - - -namespace Poco { -namespace Data { -namespace SQLite { - - -SQLiteStatementImpl::SQLiteStatementImpl(Poco::Data::SessionImpl& rSession, sqlite3* pDB): - StatementImpl(rSession), - _pDB(pDB), - _pStmt(0), - _stepCalled(false), - _nextResponse(0), - _affectedRowCount(0), - _canBind(false), - _isExtracted(false), - _canCompile(true) -{ - _columns.resize(1); -} - - -SQLiteStatementImpl::~SQLiteStatementImpl() -{ - clear(); -} - - -void SQLiteStatementImpl::compileImpl() -{ - if (!_pLeftover) _bindBegin = bindings().begin(); - - std::string statement(toString()); - sqlite3_stmt* pStmt = 0; - const char* pSql = _pLeftover ? _pLeftover->c_str() : statement.c_str(); - - if (0 == std::strlen(pSql)) - throw InvalidSQLStatementException("Empty statements are illegal"); - - int rc = SQLITE_OK; - const char* pLeftover = 0; - bool queryFound = false; - - do - { - rc = sqlite3_prepare_v2(_pDB, pSql, -1, &pStmt, &pLeftover); - if (rc != SQLITE_OK) - { - if (pStmt) sqlite3_finalize(pStmt); - pStmt = 0; - std::string errMsg = sqlite3_errmsg(_pDB); - Utility::throwException(rc, errMsg); - } - else if (rc == SQLITE_OK && pStmt) - { - queryFound = true; - } - else if (rc == SQLITE_OK && !pStmt) // comment/whitespace ignore - { - pSql = pLeftover; - if (std::strlen(pSql) == 0) - { - // empty statement or an conditional statement! like CREATE IF NOT EXISTS - // this is valid - queryFound = true; - } - } - } while (rc == SQLITE_OK && !pStmt && !queryFound); - - //Finalization call in clear() invalidates the pointer, so the value is remembered here. - //For last statement in a batch (or a single statement), pLeftover == "", so the next call - // to compileImpl() shall return false immediately when there are no more statements left. - std::string leftOver(pLeftover); - trimInPlace(leftOver); - clear(); - _pStmt = pStmt; - if (!leftOver.empty()) - { - _pLeftover = new std::string(leftOver); - _canCompile = true; - } - else _canCompile = false; - - _pBinder = new Binder(_pStmt); - _pExtractor = new Extractor(_pStmt); - - if (SQLITE_DONE == _nextResponse && _isExtracted) - { - //if this is not the first compile and there has already been extraction - //during previous step, switch to the next set if there is one provided - if (hasMoreDataSets()) - { - activateNextDataSet(); - _isExtracted = false; - } - } - - int colCount = sqlite3_column_count(_pStmt); - - if (colCount) - { - std::size_t curDataSet = currentDataSet(); - if (curDataSet >= _columns.size()) _columns.resize(curDataSet + 1); - for (int i = 0; i < colCount; ++i) - { - MetaColumn mc(i, sqlite3_column_name(_pStmt, i), Utility::getColumnType(_pStmt, i)); - _columns[curDataSet].push_back(mc); - } - } -} - - -void SQLiteStatementImpl::bindImpl() -{ - _stepCalled = false; - _nextResponse = 0; - if (_pStmt == 0) return; - - sqlite3_reset(_pStmt); - - int paramCount = sqlite3_bind_parameter_count(_pStmt); - BindIt bindEnd = bindings().end(); - if (0 == paramCount || bindEnd == _bindBegin) - { - _canBind = false; - return; - } - - int availableCount = 0; - Bindings::difference_type bindCount = 0; - Bindings::iterator it = _bindBegin; - for (; it != bindEnd; ++it) - { - availableCount += (*it)->numOfColumnsHandled(); - if (availableCount <= paramCount) ++bindCount; - else break; - } - - Bindings::difference_type remainingBindCount = bindEnd - _bindBegin; - if (bindCount < remainingBindCount) - { - bindEnd = _bindBegin + bindCount; - _canBind = true; - } - else if (bindCount > remainingBindCount) - throw ParameterCountMismatchException(); - - if (_bindBegin != bindings().end()) - { - _affectedRowCount = (*_bindBegin)->numOfRowsHandled(); - - Bindings::iterator oldBegin = _bindBegin; - for (std::size_t pos = 1; _bindBegin != bindEnd && (*_bindBegin)->canBind(); ++_bindBegin) - { - if (_affectedRowCount != (*_bindBegin)->numOfRowsHandled()) - throw BindingException("Size mismatch in Bindings. All Bindings MUST have the same size"); - - (*_bindBegin)->bind(pos); - pos += (*_bindBegin)->numOfColumnsHandled(); - } - - if ((*oldBegin)->canBind()) - { - //container binding will come back for more, so we must rewind - _bindBegin = oldBegin; - _canBind = true; - } - else _canBind = false; - } -} - - -void SQLiteStatementImpl::clear() -{ - _columns[currentDataSet()].clear(); - _affectedRowCount = 0; - - if (_pStmt) - { - sqlite3_finalize(_pStmt); - _pStmt=0; - } - _pLeftover = 0; -} - - -bool SQLiteStatementImpl::hasNext() -{ - if (_stepCalled) - return (_nextResponse == SQLITE_ROW); - - // _pStmt is allowed to be null for conditional SQL statements - if (_pStmt == 0) - { - _stepCalled = true; - _nextResponse = SQLITE_DONE; - return false; - } - - _stepCalled = true; - _nextResponse = sqlite3_step(_pStmt); - - if (_nextResponse != SQLITE_ROW && _nextResponse != SQLITE_OK && _nextResponse != SQLITE_DONE) - Utility::throwException(_nextResponse); - - _pExtractor->reset();//clear the cached null indicators - - return (_nextResponse == SQLITE_ROW); -} - - -std::size_t SQLiteStatementImpl::next() -{ - if (SQLITE_ROW == _nextResponse) - { - poco_assert (columnsReturned() == sqlite3_column_count(_pStmt)); - - Extractions& extracts = extractions(); - Extractions::iterator it = extracts.begin(); - Extractions::iterator itEnd = extracts.end(); - std::size_t pos = 0; // sqlite starts with pos 0 for results! - for (; it != itEnd; ++it) - { - (*it)->extract(pos); - pos += (*it)->numOfColumnsHandled(); - _isExtracted = true; - } - _stepCalled = false; - } - else if (SQLITE_DONE == _nextResponse) - { - throw Poco::Data::DataException("No data received"); - } - else - { - int rc = _nextResponse; - Utility::throwException(rc, std::string("Iterator Error: trying to access the next value")); - } - - return 1u; -} - - -std::size_t SQLiteStatementImpl::columnsReturned() const -{ - return (std::size_t) _columns[currentDataSet()].size(); -} - - -const MetaColumn& SQLiteStatementImpl::metaColumn(std::size_t pos) const -{ - std::size_t curDataSet = currentDataSet(); - poco_assert (pos >= 0 && pos <= _columns[curDataSet].size()); - return _columns[curDataSet][pos]; -} - - -std::size_t SQLiteStatementImpl::affectedRowCount() const -{ - return _affectedRowCount ? _affectedRowCount : sqlite3_changes(_pDB); -} - - -} } } // namespace Poco::Data::SQLite +// +// SQLiteStatementImpl.cpp +// +// $Id: //poco/Main/Data/SQLite/src/SQLiteStatementImpl.cpp#8 $ +// +// Library: SQLite +// Package: SQLite +// Module: SQLiteStatementImpl +// +// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Data/SQLite/SQLiteStatementImpl.h" +#include "Poco/Data/SQLite/Utility.h" +#include "Poco/Data/SQLite/SQLiteException.h" +#include "Poco/String.h" +#include +#include +#if defined(POCO_UNBUNDLED) +#include +#else +#include "sqlite3.h" +#endif + + +namespace Poco { +namespace Data { +namespace SQLite { + + +SQLiteStatementImpl::SQLiteStatementImpl(Poco::Data::SessionImpl& rSession, sqlite3* pDB): + StatementImpl(rSession), + _pDB(pDB), + _pStmt(0), + _stepCalled(false), + _nextResponse(0), + _affectedRowCount(0), + _canBind(false), + _isExtracted(false), + _canCompile(true) +{ + _columns.resize(1); +} + + +SQLiteStatementImpl::~SQLiteStatementImpl() +{ + clear(); +} + + +void SQLiteStatementImpl::compileImpl() +{ + if (!_pLeftover) _bindBegin = bindings().begin(); + + std::string statement(toString()); + sqlite3_stmt* pStmt = 0; + const char* pSql = _pLeftover ? _pLeftover->c_str() : statement.c_str(); + + if (0 == std::strlen(pSql)) + throw InvalidSQLStatementException("Empty statements are illegal"); + + int rc = SQLITE_OK; + const char* pLeftover = 0; + bool queryFound = false; + + do + { + rc = sqlite3_prepare_v2(_pDB, pSql, -1, &pStmt, &pLeftover); + if (rc != SQLITE_OK) + { + if (pStmt) sqlite3_finalize(pStmt); + pStmt = 0; + std::string errMsg = sqlite3_errmsg(_pDB); + Utility::throwException(rc, errMsg); + } + else if (rc == SQLITE_OK && pStmt) + { + queryFound = true; + } + else if (rc == SQLITE_OK && !pStmt) // comment/whitespace ignore + { + pSql = pLeftover; + if (std::strlen(pSql) == 0) + { + // empty statement or an conditional statement! like CREATE IF NOT EXISTS + // this is valid + queryFound = true; + } + } + } while (rc == SQLITE_OK && !pStmt && !queryFound); + + //Finalization call in clear() invalidates the pointer, so the value is remembered here. + //For last statement in a batch (or a single statement), pLeftover == "", so the next call + // to compileImpl() shall return false immediately when there are no more statements left. + std::string leftOver(pLeftover); + trimInPlace(leftOver); + clear(); + _pStmt = pStmt; + if (!leftOver.empty()) + { + _pLeftover = new std::string(leftOver); + _canCompile = true; + } + else _canCompile = false; + + _pBinder = new Binder(_pStmt); + _pExtractor = new Extractor(_pStmt); + + if (SQLITE_DONE == _nextResponse && _isExtracted) + { + //if this is not the first compile and there has already been extraction + //during previous step, switch to the next set if there is one provided + if (hasMoreDataSets()) + { + activateNextDataSet(); + _isExtracted = false; + } + } + + int colCount = sqlite3_column_count(_pStmt); + + if (colCount) + { + std::size_t curDataSet = currentDataSet(); + if (curDataSet >= _columns.size()) _columns.resize(curDataSet + 1); + for (int i = 0; i < colCount; ++i) + { + MetaColumn mc(i, sqlite3_column_name(_pStmt, i), Utility::getColumnType(_pStmt, i)); + _columns[curDataSet].push_back(mc); + } + } +} + + +void SQLiteStatementImpl::bindImpl() +{ + _stepCalled = false; + _nextResponse = 0; + if (_pStmt == 0) return; + + sqlite3_reset(_pStmt); + + int paramCount = sqlite3_bind_parameter_count(_pStmt); + BindIt bindEnd = bindings().end(); + if (0 == paramCount || bindEnd == _bindBegin) + { + _canBind = false; + return; + } + + int availableCount = 0; + Bindings::difference_type bindCount = 0; + Bindings::iterator it = _bindBegin; + for (; it != bindEnd; ++it) + { + availableCount += (*it)->numOfColumnsHandled(); + if (availableCount <= paramCount) ++bindCount; + else break; + } + + Bindings::difference_type remainingBindCount = bindEnd - _bindBegin; + if (bindCount < remainingBindCount) + { + bindEnd = _bindBegin + bindCount; + _canBind = true; + } + else if (bindCount > remainingBindCount) + throw ParameterCountMismatchException(); + + if (_bindBegin != bindings().end()) + { + _affectedRowCount = (*_bindBegin)->numOfRowsHandled(); + + Bindings::iterator oldBegin = _bindBegin; + for (std::size_t pos = 1; _bindBegin != bindEnd && (*_bindBegin)->canBind(); ++_bindBegin) + { + if (_affectedRowCount != (*_bindBegin)->numOfRowsHandled()) + throw BindingException("Size mismatch in Bindings. All Bindings MUST have the same size"); + + (*_bindBegin)->bind(pos); + pos += (*_bindBegin)->numOfColumnsHandled(); + } + + if ((*oldBegin)->canBind()) + { + //container binding will come back for more, so we must rewind + _bindBegin = oldBegin; + _canBind = true; + } + else _canBind = false; + } +} + + +void SQLiteStatementImpl::clear() +{ + _columns[currentDataSet()].clear(); + _affectedRowCount = 0; + + if (_pStmt) + { + sqlite3_finalize(_pStmt); + _pStmt=0; + } + _pLeftover = 0; +} + + +bool SQLiteStatementImpl::hasNext() +{ + if (_stepCalled) + return (_nextResponse == SQLITE_ROW); + + // _pStmt is allowed to be null for conditional SQL statements + if (_pStmt == 0) + { + _stepCalled = true; + _nextResponse = SQLITE_DONE; + return false; + } + + _stepCalled = true; + _nextResponse = sqlite3_step(_pStmt); + + if (_nextResponse != SQLITE_ROW && _nextResponse != SQLITE_OK && _nextResponse != SQLITE_DONE) + Utility::throwException(_nextResponse); + + _pExtractor->reset();//clear the cached null indicators + + return (_nextResponse == SQLITE_ROW); +} + + +std::size_t SQLiteStatementImpl::next() +{ + if (SQLITE_ROW == _nextResponse) + { + poco_assert (columnsReturned() == sqlite3_column_count(_pStmt)); + + Extractions& extracts = extractions(); + Extractions::iterator it = extracts.begin(); + Extractions::iterator itEnd = extracts.end(); + std::size_t pos = 0; // sqlite starts with pos 0 for results! + for (; it != itEnd; ++it) + { + (*it)->extract(pos); + pos += (*it)->numOfColumnsHandled(); + _isExtracted = true; + } + _stepCalled = false; + } + else if (SQLITE_DONE == _nextResponse) + { + throw Poco::Data::DataException("No data received"); + } + else + { + int rc = _nextResponse; + Utility::throwException(rc, std::string("Iterator Error: trying to access the next value")); + } + + return 1u; +} + + +std::size_t SQLiteStatementImpl::columnsReturned() const +{ + return (std::size_t) _columns[currentDataSet()].size(); +} + + +const MetaColumn& SQLiteStatementImpl::metaColumn(std::size_t pos) const +{ + std::size_t curDataSet = currentDataSet(); + poco_assert (pos >= 0 && pos <= _columns[curDataSet].size()); + return _columns[curDataSet][pos]; +} + + +std::size_t SQLiteStatementImpl::affectedRowCount() const +{ + return _affectedRowCount ? _affectedRowCount : sqlite3_changes(_pDB); +} + + +} } } // namespace Poco::Data::SQLite diff --git a/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj b/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj index 474be95e1..5d53c0240 100644 --- a/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj @@ -1,495 +1,495 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj index 8cf6dd87d..c6bd69faa 100644 --- a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj @@ -1,319 +1,319 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + diff --git a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters index 24d219103..09226aae4 100644 --- a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,48 +1,48 @@ - - - - - {0662a8ea-3883-4e35-8ec6-7d870a14b969} - - - {61ffd2c4-5462-4b8f-8d59-975032b98058} - - - {099cbc40-aa50-4fd1-8db7-ab27ffe6cb84} - - - {5e5f5bf6-7159-4c2f-91a0-ad00c23b8199} - - - {3a853a0c-9d8c-4ee8-a623-6c5800666808} - - - {c96364cf-ec64-4448-a6a8-a3fdd2a44909} - - - {4c007f51-0179-4ed0-a019-b38f7c44dd3b} - - - {b644ff17-c8ee-44f1-a89b-e4344471fae0} - - - - - SQLite\Header Files - - - _Suite\Header Files - - - - - SQLite\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {0662a8ea-3883-4e35-8ec6-7d870a14b969} + + + {61ffd2c4-5462-4b8f-8d59-975032b98058} + + + {099cbc40-aa50-4fd1-8db7-ab27ffe6cb84} + + + {5e5f5bf6-7159-4c2f-91a0-ad00c23b8199} + + + {3a853a0c-9d8c-4ee8-a623-6c5800666808} + + + {c96364cf-ec64-4448-a6a8-a3fdd2a44909} + + + {4c007f51-0179-4ed0-a019-b38f7c44dd3b} + + + {b644ff17-c8ee-44f1-a89b-e4344471fae0} + + + + + SQLite\Header Files + + + _Suite\Header Files + + + + + SQLite\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj index b131c1378..f85b7fad3 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj @@ -1,313 +1,313 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - Application - Static - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Static + MultiByte + + + Application + Static + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters index 689edcc86..c0f26a91d 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -1,48 +1,48 @@ - - - - - {fff903bd-ba4c-4a5d-9488-6cfeab5f713b} - - - {9cdc94ed-fba4-4ae7-a30c-96664254cede} - - - {40d2cce8-a1ac-4276-91fd-9fd1c9397ea5} - - - {140ee65e-f5c2-45c6-a013-28be2fe111f5} - - - {7ae0327a-eb00-4286-b5e9-0390a17513b1} - - - {748d9483-8726-4334-904b-3d1b91cf1d29} - - - {66719422-976f-498a-a87f-f6c4c081fb0e} - - - {65cfd2c0-8b43-4e77-8d8d-1f83fdc85157} - - - - - SQLite\Header Files - - - _Suite\Header Files - - - - - SQLite\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {fff903bd-ba4c-4a5d-9488-6cfeab5f713b} + + + {9cdc94ed-fba4-4ae7-a30c-96664254cede} + + + {40d2cce8-a1ac-4276-91fd-9fd1c9397ea5} + + + {140ee65e-f5c2-45c6-a013-28be2fe111f5} + + + {7ae0327a-eb00-4286-b5e9-0390a17513b1} + + + {748d9483-8726-4334-904b-3d1b91cf1d29} + + + {66719422-976f-498a-a87f-f6c4c081fb0e} + + + {65cfd2c0-8b43-4e77-8d8d-1f83fdc85157} + + + + + SQLite\Header Files + + + _Suite\Header Files + + + + + SQLite\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj index d53524ffe..9bdd9edf1 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,319 +1,319 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {45528A81-2523-48DD-AEB3-6B6BD73A2C5D} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {45528A81-2523-48DD-AEB3-6B6BD73A2C5D} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters index 620f63f32..e56cef929 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,48 +1,48 @@ - - - - - {92265c65-9aab-49eb-893f-8b7525e1482a} - - - {9878a3bd-8ef8-4f0b-8d35-4a62f7c0f429} - - - {b4b05e39-fdce-4146-b271-889b219fbe99} - - - {b241bcbf-6cbd-4485-9388-124d89635e93} - - - {68d4069e-b364-4d3f-8256-a9fbdf435a56} - - - {d1a62fec-a9cc-4db5-bc76-84e148d54f16} - - - {639d0d88-6f91-4c81-a34d-28b5f87d11a2} - - - {bc4741f4-35a3-4a6b-979b-1209bc96dfbd} - - - - - SQLite\Header Files - - - _Suite\Header Files - - - - - SQLite\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {92265c65-9aab-49eb-893f-8b7525e1482a} + + + {9878a3bd-8ef8-4f0b-8d35-4a62f7c0f429} + + + {b4b05e39-fdce-4146-b271-889b219fbe99} + + + {b241bcbf-6cbd-4485-9388-124d89635e93} + + + {68d4069e-b364-4d3f-8256-a9fbdf435a56} + + + {d1a62fec-a9cc-4db5-bc76-84e148d54f16} + + + {639d0d88-6f91-4c81-a34d-28b5f87d11a2} + + + {bc4741f4-35a3-4a6b-979b-1209bc96dfbd} + + + + + SQLite\Header Files + + + _Suite\Header Files + + + + + SQLite\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj index 131a69a0d..bfc7c129c 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj @@ -1,470 +1,470 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/SQLite/testsuite/src/WinCEDriver.cpp b/Data/SQLite/testsuite/src/WinCEDriver.cpp index c3c687965..8afe2975f 100644 --- a/Data/SQLite/testsuite/src/WinCEDriver.cpp +++ b/Data/SQLite/testsuite/src/WinCEDriver.cpp @@ -1,52 +1,52 @@ -// -// WinCEDriver.cpp -// -// $Id: //poco/1.3-WinCE/Net/testsuite/src/WinCEDriver.cpp#2 $ -// -// Console-based test driver for Windows CE. -// -// Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "CppUnit/TestRunner.h" -#include "SQLiteTestSuite.h" -#include - - -int _tmain(int argc, wchar_t* argv[]) -{ - std::vector args; - for (int i = 0; i < argc; ++i) - { - char buffer[1024]; - std::wcstombs(buffer, argv[i], sizeof(buffer)); - args.push_back(std::string(buffer)); - } - CppUnit::TestRunner runner; - runner.addTest("SQLiteTestSuite", SQLiteTestSuite::suite()); - return runner.run(args) ? 0 : 1; -} +// +// WinCEDriver.cpp +// +// $Id: //poco/1.3-WinCE/Net/testsuite/src/WinCEDriver.cpp#2 $ +// +// Console-based test driver for Windows CE. +// +// Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "CppUnit/TestRunner.h" +#include "SQLiteTestSuite.h" +#include + + +int _tmain(int argc, wchar_t* argv[]) +{ + std::vector args; + for (int i = 0; i < argc; ++i) + { + char buffer[1024]; + std::wcstombs(buffer, argv[i], sizeof(buffer)); + args.push_back(std::string(buffer)); + } + CppUnit::TestRunner runner; + runner.addTest("SQLiteTestSuite", SQLiteTestSuite::suite()); + return runner.run(args) ? 0 : 1; +} diff --git a/Data/samples/Binding/Binding_CE_vs90.vcproj b/Data/samples/Binding/Binding_CE_vs90.vcproj index f2d198114..8ac35542e 100644 --- a/Data/samples/Binding/Binding_CE_vs90.vcproj +++ b/Data/samples/Binding/Binding_CE_vs90.vcproj @@ -1,468 +1,468 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/samples/Binding/Binding_vs110.vcxproj b/Data/samples/Binding/Binding_vs110.vcxproj index 1d349a57d..cacd4d1a7 100644 --- a/Data/samples/Binding/Binding_vs110.vcxproj +++ b/Data/samples/Binding/Binding_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Binding - {0F0DF069-83D1-378D-A949-8DF9A883B627} - Binding - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Bindingd - Bindingd - Bindingd - Binding - Binding - Binding - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Bindingd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Bindingd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Binding.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Bindingd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Bindingd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Binding.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Bindingd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Bindingd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Binding.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Binding + {0F0DF069-83D1-378D-A949-8DF9A883B627} + Binding + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Bindingd + Bindingd + Bindingd + Binding + Binding + Binding + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Bindingd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Bindingd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Binding.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Bindingd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Bindingd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Binding.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Bindingd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Bindingd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Binding.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Data/samples/Binding/Binding_vs110.vcxproj.filters b/Data/samples/Binding/Binding_vs110.vcxproj.filters index 29c276875..379ee3004 100644 --- a/Data/samples/Binding/Binding_vs110.vcxproj.filters +++ b/Data/samples/Binding/Binding_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {271a256f-87f8-4f4c-a95b-2d9fb1b21db2} - - - {52deecb9-bcbf-47b1-b991-beab0a91d75a} - - - - - Source Files - - + + + + + {271a256f-87f8-4f4c-a95b-2d9fb1b21db2} + + + {52deecb9-bcbf-47b1-b991-beab0a91d75a} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/Binding/Binding_x64_vs100.vcxproj b/Data/samples/Binding/Binding_x64_vs100.vcxproj index 38e5aa2a3..91341ea0d 100644 --- a/Data/samples/Binding/Binding_x64_vs100.vcxproj +++ b/Data/samples/Binding/Binding_x64_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Binding - {0F0DF069-83D1-378D-A949-8DF9A883B627} - Binding - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Bindingd - Bindingd - Bindingd - Binding - Binding - Binding - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Bindingd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Bindingd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Binding.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Bindingd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Bindingd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Binding.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Bindingd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Bindingd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Binding.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Binding + {0F0DF069-83D1-378D-A949-8DF9A883B627} + Binding + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Bindingd + Bindingd + Bindingd + Binding + Binding + Binding + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Bindingd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Bindingd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Binding.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Bindingd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Bindingd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Binding.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Bindingd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Bindingd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Binding.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Data/samples/Binding/Binding_x64_vs100.vcxproj.filters b/Data/samples/Binding/Binding_x64_vs100.vcxproj.filters index 59f81e4dd..1e936390e 100644 --- a/Data/samples/Binding/Binding_x64_vs100.vcxproj.filters +++ b/Data/samples/Binding/Binding_x64_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {e632f5f6-92dc-4bd4-a2c0-792e900a14e3} - - - {6eda1939-2478-4c10-9ae7-a65a16b74db5} - - - - - Source Files - - + + + + + {e632f5f6-92dc-4bd4-a2c0-792e900a14e3} + + + {6eda1939-2478-4c10-9ae7-a65a16b74db5} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/Binding/Binding_x64_vs110.vcxproj b/Data/samples/Binding/Binding_x64_vs110.vcxproj index 56564c777..401abac40 100644 --- a/Data/samples/Binding/Binding_x64_vs110.vcxproj +++ b/Data/samples/Binding/Binding_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Binding - {0F0DF069-83D1-378D-A949-8DF9A883B627} - Binding - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Bindingd - Bindingd - Bindingd - Binding - Binding - Binding - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Bindingd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Bindingd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Binding.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Bindingd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Bindingd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Binding.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Bindingd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Bindingd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Binding.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Binding + {0F0DF069-83D1-378D-A949-8DF9A883B627} + Binding + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Bindingd + Bindingd + Bindingd + Binding + Binding + Binding + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Bindingd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Bindingd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Binding.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Bindingd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Bindingd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Binding.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Bindingd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Bindingd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Binding.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Data/samples/Binding/Binding_x64_vs110.vcxproj.filters b/Data/samples/Binding/Binding_x64_vs110.vcxproj.filters index 97733527e..cb3296356 100644 --- a/Data/samples/Binding/Binding_x64_vs110.vcxproj.filters +++ b/Data/samples/Binding/Binding_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {7a2bddf7-0f40-4466-9bea-5a7d428406a4} - - - {74e010a0-6275-41f8-aeaa-21cec3ec3a64} - - - - - Source Files - - + + + + + {7a2bddf7-0f40-4466-9bea-5a7d428406a4} + + + {74e010a0-6275-41f8-aeaa-21cec3ec3a64} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/Binding/Binding_x64_vs90.vcproj b/Data/samples/Binding/Binding_x64_vs90.vcproj index 44bf657de..2b693859c 100644 --- a/Data/samples/Binding/Binding_x64_vs90.vcproj +++ b/Data/samples/Binding/Binding_x64_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/samples/RecordSet/RecordSet_CE_vs90.vcproj b/Data/samples/RecordSet/RecordSet_CE_vs90.vcproj index 1b8ec2bfb..58a56aa3e 100644 --- a/Data/samples/RecordSet/RecordSet_CE_vs90.vcproj +++ b/Data/samples/RecordSet/RecordSet_CE_vs90.vcproj @@ -1,468 +1,468 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/samples/RecordSet/RecordSet_vs110.vcxproj b/Data/samples/RecordSet/RecordSet_vs110.vcxproj index 4abd66075..8936925a8 100644 --- a/Data/samples/RecordSet/RecordSet_vs110.vcxproj +++ b/Data/samples/RecordSet/RecordSet_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - RecordSet - {FEE20DCE-B9E3-30AB-A40C-B6A324997328} - RecordSet - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - RecordSetd - RecordSetd - RecordSetd - RecordSet - RecordSet - RecordSet - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\RecordSetd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\RecordSetd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\RecordSet.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\RecordSetd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\RecordSetd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\RecordSet.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\RecordSetd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\RecordSetd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\RecordSet.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + RecordSet + {FEE20DCE-B9E3-30AB-A40C-B6A324997328} + RecordSet + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + RecordSetd + RecordSetd + RecordSetd + RecordSet + RecordSet + RecordSet + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\RecordSetd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\RecordSetd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\RecordSet.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\RecordSetd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\RecordSetd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\RecordSet.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\RecordSetd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\RecordSetd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\RecordSet.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Data/samples/RecordSet/RecordSet_vs110.vcxproj.filters b/Data/samples/RecordSet/RecordSet_vs110.vcxproj.filters index 3e06fae4c..40255c3c2 100644 --- a/Data/samples/RecordSet/RecordSet_vs110.vcxproj.filters +++ b/Data/samples/RecordSet/RecordSet_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {e45c2332-bc5d-42ca-9026-388657786459} - - - {af8dd17b-0b74-47de-b36d-fdec40d1d90d} - - - - - Source Files - - + + + + + {e45c2332-bc5d-42ca-9026-388657786459} + + + {af8dd17b-0b74-47de-b36d-fdec40d1d90d} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj b/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj index 17ad512d8..13e0c7ae0 100644 --- a/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj +++ b/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - RecordSet - {FEE20DCE-B9E3-30AB-A40C-B6A324997328} - RecordSet - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - RecordSetd - RecordSetd - RecordSetd - RecordSet - RecordSet - RecordSet - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\RecordSetd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\RecordSetd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\RecordSet.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\RecordSetd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\RecordSetd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\RecordSet.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\RecordSetd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\RecordSetd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\RecordSet.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + RecordSet + {FEE20DCE-B9E3-30AB-A40C-B6A324997328} + RecordSet + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + RecordSetd + RecordSetd + RecordSetd + RecordSet + RecordSet + RecordSet + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\RecordSetd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\RecordSetd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\RecordSet.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\RecordSetd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\RecordSetd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\RecordSet.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\RecordSetd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\RecordSetd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\RecordSet.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj.filters b/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj.filters index 6c2b91d98..6d7db4a52 100644 --- a/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj.filters +++ b/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {5a0c1ff6-b3db-48bd-b7f4-6540528bb8e7} - - - {4e881fb2-92f2-4c76-bf17-ef191bfbdc32} - - - - - Source Files - - + + + + + {5a0c1ff6-b3db-48bd-b7f4-6540528bb8e7} + + + {4e881fb2-92f2-4c76-bf17-ef191bfbdc32} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj b/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj index 7811186a3..d4d59183e 100644 --- a/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj +++ b/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - RecordSet - {FEE20DCE-B9E3-30AB-A40C-B6A324997328} - RecordSet - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - RecordSetd - RecordSetd - RecordSetd - RecordSet - RecordSet - RecordSet - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\RecordSetd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\RecordSetd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\RecordSet.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\RecordSetd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\RecordSetd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\RecordSet.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\RecordSetd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\RecordSetd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\RecordSet.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + RecordSet + {FEE20DCE-B9E3-30AB-A40C-B6A324997328} + RecordSet + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + RecordSetd + RecordSetd + RecordSetd + RecordSet + RecordSet + RecordSet + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\RecordSetd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\RecordSetd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\RecordSet.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\RecordSetd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\RecordSetd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\RecordSet.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\RecordSetd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\RecordSetd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\RecordSet.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.filters b/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.filters index dca90b35b..1ec1da21e 100644 --- a/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.filters +++ b/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {25e43f11-2fc6-438b-ad55-210ab53dc2f2} - - - {2d4bd2eb-7cf8-41fb-a1f4-dfa4e2ce3baa} - - - - - Source Files - - + + + + + {25e43f11-2fc6-438b-ad55-210ab53dc2f2} + + + {2d4bd2eb-7cf8-41fb-a1f4-dfa4e2ce3baa} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/RecordSet/RecordSet_x64_vs90.vcproj b/Data/samples/RecordSet/RecordSet_x64_vs90.vcproj index 32aa29bb3..7bc724bbe 100644 --- a/Data/samples/RecordSet/RecordSet_x64_vs90.vcproj +++ b/Data/samples/RecordSet/RecordSet_x64_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/samples/RowFormatter/RowFormatter_CE_vs90.vcproj b/Data/samples/RowFormatter/RowFormatter_CE_vs90.vcproj index d17c43740..982b20cd3 100644 --- a/Data/samples/RowFormatter/RowFormatter_CE_vs90.vcproj +++ b/Data/samples/RowFormatter/RowFormatter_CE_vs90.vcproj @@ -1,468 +1,468 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj index 310db295b..8d3a9d341 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj +++ b/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - RowFormatter - {133C62C7-3301-3F43-9ABF-14DF094A042F} - RowFormatter - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - RowFormatterd - RowFormatterd - RowFormatterd - RowFormatter - RowFormatter - RowFormatter - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\RowFormatterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\RowFormatterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\RowFormatter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\RowFormatterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\RowFormatterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\RowFormatter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\RowFormatterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\RowFormatterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\RowFormatter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + RowFormatter + {133C62C7-3301-3F43-9ABF-14DF094A042F} + RowFormatter + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + RowFormatterd + RowFormatterd + RowFormatterd + RowFormatter + RowFormatter + RowFormatter + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\RowFormatterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\RowFormatterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\RowFormatter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\RowFormatterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\RowFormatterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\RowFormatter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\RowFormatterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\RowFormatterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\RowFormatter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj.filters index 4e34824c9..e5ee3a991 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj.filters +++ b/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {510d304f-3103-452b-a37a-6645fc85ea64} - - - {bd78f743-f2e4-49fe-affb-edef598cbf23} - - - - - Source Files - - + + + + + {510d304f-3103-452b-a37a-6645fc85ea64} + + + {bd78f743-f2e4-49fe-affb-edef598cbf23} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj index 9234a707f..67d1e0d34 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj +++ b/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - RowFormatter - {133C62C7-3301-3F43-9ABF-14DF094A042F} - RowFormatter - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - RowFormatterd - RowFormatterd - RowFormatterd - RowFormatter - RowFormatter - RowFormatter - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\RowFormatterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\RowFormatterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\RowFormatter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\RowFormatterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\RowFormatterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\RowFormatter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\RowFormatterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\RowFormatterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\RowFormatter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + RowFormatter + {133C62C7-3301-3F43-9ABF-14DF094A042F} + RowFormatter + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + RowFormatterd + RowFormatterd + RowFormatterd + RowFormatter + RowFormatter + RowFormatter + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\RowFormatterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\RowFormatterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\RowFormatter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\RowFormatterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\RowFormatterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\RowFormatter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\RowFormatterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\RowFormatterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\RowFormatter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.filters index f4a37e4b4..98c1f4b2c 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.filters +++ b/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {54148e6f-e05b-4516-ad24-7fbd79706c55} - - - {ee4b08dc-256d-466e-b911-1c464c49be51} - - - - - Source Files - - + + + + + {54148e6f-e05b-4516-ad24-7fbd79706c55} + + + {ee4b08dc-256d-466e-b911-1c464c49be51} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj b/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj index 9b0062751..1d0dd2863 100644 --- a/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj +++ b/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - RowFormatter - {133C62C7-3301-3F43-9ABF-14DF094A042F} - RowFormatter - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - RowFormatterd - RowFormatterd - RowFormatterd - RowFormatter - RowFormatter - RowFormatter - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\RowFormatterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\RowFormatterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\RowFormatter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\RowFormatterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\RowFormatterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\RowFormatter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\RowFormatterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\RowFormatterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\RowFormatter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + RowFormatter + {133C62C7-3301-3F43-9ABF-14DF094A042F} + RowFormatter + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + RowFormatterd + RowFormatterd + RowFormatterd + RowFormatter + RowFormatter + RowFormatter + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\RowFormatterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\RowFormatterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\RowFormatter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\RowFormatterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\RowFormatterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\RowFormatter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\RowFormatterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\RowFormatterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\RowFormatter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj.filters index eb3d0e270..f97233945 100644 --- a/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj.filters +++ b/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {3e78d069-dd5f-480d-9195-6f1c1de37dab} - - - {e1d33694-777b-4a34-898a-5d19a463278f} - - - - - Source Files - - + + + + + {3e78d069-dd5f-480d-9195-6f1c1de37dab} + + + {e1d33694-777b-4a34-898a-5d19a463278f} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj b/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj index 91a85df0e..82c3bb4a7 100644 --- a/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj +++ b/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - RowFormatter - {133C62C7-3301-3F43-9ABF-14DF094A042F} - RowFormatter - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - RowFormatterd - RowFormatterd - RowFormatterd - RowFormatter - RowFormatter - RowFormatter - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\RowFormatterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\RowFormatterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\RowFormatter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\RowFormatterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\RowFormatterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\RowFormatter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\RowFormatterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\RowFormatterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\RowFormatter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + RowFormatter + {133C62C7-3301-3F43-9ABF-14DF094A042F} + RowFormatter + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + RowFormatterd + RowFormatterd + RowFormatterd + RowFormatter + RowFormatter + RowFormatter + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\RowFormatterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\RowFormatterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\RowFormatter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\RowFormatterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\RowFormatterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\RowFormatter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\RowFormatterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\RowFormatterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\RowFormatter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.filters index fae0aebbe..5f8102463 100644 --- a/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.filters +++ b/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {1a0b9e86-2482-4cd5-907a-6bf396974db3} - - - {75b1142f-c8c2-4cb7-ac5d-85bfc34c2b2e} - - - - - Source Files - - + + + + + {1a0b9e86-2482-4cd5-907a-6bf396974db3} + + + {75b1142f-c8c2-4cb7-ac5d-85bfc34c2b2e} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs90.vcproj b/Data/samples/RowFormatter/RowFormatter_x64_vs90.vcproj index 8fc1433c5..93782957b 100644 --- a/Data/samples/RowFormatter/RowFormatter_x64_vs90.vcproj +++ b/Data/samples/RowFormatter/RowFormatter_x64_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/samples/Tuple/Tuple_CE_vs90.vcproj b/Data/samples/Tuple/Tuple_CE_vs90.vcproj index 27130511d..2d697e416 100644 --- a/Data/samples/Tuple/Tuple_CE_vs90.vcproj +++ b/Data/samples/Tuple/Tuple_CE_vs90.vcproj @@ -1,468 +1,468 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/samples/Tuple/Tuple_vs110.vcxproj b/Data/samples/Tuple/Tuple_vs110.vcxproj index bb664f26f..7915c51cf 100644 --- a/Data/samples/Tuple/Tuple_vs110.vcxproj +++ b/Data/samples/Tuple/Tuple_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Tuple - {F143DA5A-221A-3737-BCBA-F5BFD977038F} - Tuple - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Tupled - Tupled - Tupled - Tuple - Tuple - Tuple - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Tupled.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Tupled.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Tuple.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Tupled.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Tupled.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Tuple.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Tupled.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Tupled.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Tuple.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Tuple + {F143DA5A-221A-3737-BCBA-F5BFD977038F} + Tuple + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Tupled + Tupled + Tupled + Tuple + Tuple + Tuple + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Tupled.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Tupled.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Tuple.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Tupled.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Tupled.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Tuple.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Tupled.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Tupled.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Tuple.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Data/samples/Tuple/Tuple_vs110.vcxproj.filters b/Data/samples/Tuple/Tuple_vs110.vcxproj.filters index 04b4930f7..d12dc7cfe 100644 --- a/Data/samples/Tuple/Tuple_vs110.vcxproj.filters +++ b/Data/samples/Tuple/Tuple_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {ea64c750-1948-47f5-953a-bb1fbf35d710} - - - {976e1de7-e809-4863-a90b-7da06dee29b4} - - - - - Source Files - - + + + + + {ea64c750-1948-47f5-953a-bb1fbf35d710} + + + {976e1de7-e809-4863-a90b-7da06dee29b4} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/Tuple/Tuple_x64_vs100.vcxproj b/Data/samples/Tuple/Tuple_x64_vs100.vcxproj index 7515a8fd1..6bd0f8852 100644 --- a/Data/samples/Tuple/Tuple_x64_vs100.vcxproj +++ b/Data/samples/Tuple/Tuple_x64_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Tuple - {F143DA5A-221A-3737-BCBA-F5BFD977038F} - Tuple - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Tupled - Tupled - Tupled - Tuple - Tuple - Tuple - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Tupled.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Tupled.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Tuple.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Tupled.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Tupled.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Tuple.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Tupled.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Tupled.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Tuple.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Tuple + {F143DA5A-221A-3737-BCBA-F5BFD977038F} + Tuple + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Tupled + Tupled + Tupled + Tuple + Tuple + Tuple + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Tupled.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Tupled.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Tuple.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Tupled.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Tupled.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Tuple.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Tupled.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Tupled.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Tuple.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Data/samples/Tuple/Tuple_x64_vs100.vcxproj.filters b/Data/samples/Tuple/Tuple_x64_vs100.vcxproj.filters index 3a938f0ac..30b17448d 100644 --- a/Data/samples/Tuple/Tuple_x64_vs100.vcxproj.filters +++ b/Data/samples/Tuple/Tuple_x64_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {39bcd675-dbb0-43ea-b21d-8e0842c62149} - - - {a86c6f21-08d3-41e3-a568-fb59f60709de} - - - - - Source Files - - + + + + + {39bcd675-dbb0-43ea-b21d-8e0842c62149} + + + {a86c6f21-08d3-41e3-a568-fb59f60709de} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/Tuple/Tuple_x64_vs110.vcxproj b/Data/samples/Tuple/Tuple_x64_vs110.vcxproj index 9562899d7..212d0025c 100644 --- a/Data/samples/Tuple/Tuple_x64_vs110.vcxproj +++ b/Data/samples/Tuple/Tuple_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Tuple - {F143DA5A-221A-3737-BCBA-F5BFD977038F} - Tuple - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Tupled - Tupled - Tupled - Tuple - Tuple - Tuple - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Tupled.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Tupled.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Tuple.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Tupled.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Tupled.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Tuple.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Tupled.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Tupled.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Tuple.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Tuple + {F143DA5A-221A-3737-BCBA-F5BFD977038F} + Tuple + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Tupled + Tupled + Tupled + Tuple + Tuple + Tuple + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Tupled.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Tupled.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Tuple.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Tupled.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Tupled.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Tuple.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Tupled.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Tupled.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Tuple.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Data/samples/Tuple/Tuple_x64_vs110.vcxproj.filters b/Data/samples/Tuple/Tuple_x64_vs110.vcxproj.filters index 209399250..0dd4c04d7 100644 --- a/Data/samples/Tuple/Tuple_x64_vs110.vcxproj.filters +++ b/Data/samples/Tuple/Tuple_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {f71da730-18ec-491e-acbb-924b5ab98211} - - - {6432a61c-963a-4c15-992a-bd1b70e18680} - - - - - Source Files - - + + + + + {f71da730-18ec-491e-acbb-924b5ab98211} + + + {6432a61c-963a-4c15-992a-bd1b70e18680} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/Tuple/Tuple_x64_vs90.vcproj b/Data/samples/Tuple/Tuple_x64_vs90.vcproj index c50a74473..c22fd970a 100644 --- a/Data/samples/Tuple/Tuple_x64_vs90.vcproj +++ b/Data/samples/Tuple/Tuple_x64_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/samples/TypeHandler/TypeHandler_CE_vs90.vcproj b/Data/samples/TypeHandler/TypeHandler_CE_vs90.vcproj index 0895b397d..7443252aa 100644 --- a/Data/samples/TypeHandler/TypeHandler_CE_vs90.vcproj +++ b/Data/samples/TypeHandler/TypeHandler_CE_vs90.vcproj @@ -1,468 +1,468 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj b/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj index e61371bee..e579ff9bb 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj +++ b/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TypeHandler - {65A12348-CA20-324E-9F5E-7F82753C2C65} - TypeHandler - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TypeHandlerd - TypeHandlerd - TypeHandlerd - TypeHandler - TypeHandler - TypeHandler - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\TypeHandlerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TypeHandlerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\TypeHandler.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\TypeHandlerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\TypeHandlerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\TypeHandler.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\TypeHandlerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TypeHandlerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\TypeHandler.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TypeHandler + {65A12348-CA20-324E-9F5E-7F82753C2C65} + TypeHandler + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TypeHandlerd + TypeHandlerd + TypeHandlerd + TypeHandler + TypeHandler + TypeHandler + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\TypeHandlerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TypeHandlerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\TypeHandler.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\TypeHandlerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\TypeHandlerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\TypeHandler.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\TypeHandlerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TypeHandlerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\TypeHandler.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj.filters b/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj.filters index 1567eee3b..1b3300ec7 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj.filters +++ b/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {99f0aaaf-7923-4a91-b845-f76721a2815c} - - - {ede8ef05-4769-4dac-9198-5ba2a9224986} - - - - - Source Files - - + + + + + {99f0aaaf-7923-4a91-b845-f76721a2815c} + + + {ede8ef05-4769-4dac-9198-5ba2a9224986} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/TypeHandler/TypeHandler_x64_vs100.vcxproj b/Data/samples/TypeHandler/TypeHandler_x64_vs100.vcxproj index 8573e7895..9c81dd660 100644 --- a/Data/samples/TypeHandler/TypeHandler_x64_vs100.vcxproj +++ b/Data/samples/TypeHandler/TypeHandler_x64_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TypeHandler - {65A12348-CA20-324E-9F5E-7F82753C2C65} - TypeHandler - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TypeHandlerd - TypeHandlerd - TypeHandlerd - TypeHandler - TypeHandler - TypeHandler - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TypeHandlerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TypeHandlerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TypeHandler.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TypeHandlerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\TypeHandlerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TypeHandler.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TypeHandlerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TypeHandlerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TypeHandler.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TypeHandler + {65A12348-CA20-324E-9F5E-7F82753C2C65} + TypeHandler + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TypeHandlerd + TypeHandlerd + TypeHandlerd + TypeHandler + TypeHandler + TypeHandler + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TypeHandlerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TypeHandlerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TypeHandler.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TypeHandlerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\TypeHandlerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TypeHandler.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TypeHandlerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TypeHandlerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TypeHandler.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Data/samples/TypeHandler/TypeHandler_x64_vs100.vcxproj.filters b/Data/samples/TypeHandler/TypeHandler_x64_vs100.vcxproj.filters index 36312ad51..37e016934 100644 --- a/Data/samples/TypeHandler/TypeHandler_x64_vs100.vcxproj.filters +++ b/Data/samples/TypeHandler/TypeHandler_x64_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {bc19ccfc-b779-4090-8599-dcb691e528f2} - - - {0cc060eb-67c7-4082-b148-3197dd6d8ea9} - - - - - Source Files - - + + + + + {bc19ccfc-b779-4090-8599-dcb691e528f2} + + + {0cc060eb-67c7-4082-b148-3197dd6d8ea9} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj b/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj index cdcf7e5db..649723468 100644 --- a/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj +++ b/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TypeHandler - {65A12348-CA20-324E-9F5E-7F82753C2C65} - TypeHandler - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TypeHandlerd - TypeHandlerd - TypeHandlerd - TypeHandler - TypeHandler - TypeHandler - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TypeHandlerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TypeHandlerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TypeHandler.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TypeHandlerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\TypeHandlerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TypeHandler.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TypeHandlerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TypeHandlerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TypeHandler.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TypeHandler + {65A12348-CA20-324E-9F5E-7F82753C2C65} + TypeHandler + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TypeHandlerd + TypeHandlerd + TypeHandlerd + TypeHandler + TypeHandler + TypeHandler + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TypeHandlerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TypeHandlerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TypeHandler.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TypeHandlerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\TypeHandlerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TypeHandler.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TypeHandlerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TypeHandlerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TypeHandler.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj.filters b/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj.filters index 7ba0e2195..c9d71fd8d 100644 --- a/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj.filters +++ b/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {3834966a-b7c0-4298-8e54-aa3fa470a2ee} - - - {7309737d-42bd-4bf4-a04d-00b3e614fe47} - - - - - Source Files - - + + + + + {3834966a-b7c0-4298-8e54-aa3fa470a2ee} + + + {7309737d-42bd-4bf4-a04d-00b3e614fe47} + + + + + Source Files + + \ No newline at end of file diff --git a/Data/samples/TypeHandler/TypeHandler_x64_vs90.vcproj b/Data/samples/TypeHandler/TypeHandler_x64_vs90.vcproj index 3c18354e0..16a1547a4 100644 --- a/Data/samples/TypeHandler/TypeHandler_x64_vs90.vcproj +++ b/Data/samples/TypeHandler/TypeHandler_x64_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/samples/samples_CE_vs90.sln b/Data/samples/samples_CE_vs90.sln index af8dd6ac5..ea907dd1b 100644 --- a/Data/samples/samples_CE_vs90.sln +++ b/Data/samples/samples_CE_vs90.sln @@ -1,117 +1,117 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Binding", "Binding\Binding_CE_vs90.vcproj", "{0F0DF069-83D1-378D-A949-8DF9A883B627}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecordSet", "RecordSet\RecordSet_CE_vs90.vcproj", "{FEE20DCE-B9E3-30AB-A40C-B6A324997328}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RowFormatter", "RowFormatter\RowFormatter_CE_vs90.vcproj", "{133C62C7-3301-3F43-9ABF-14DF094A042F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tuple", "Tuple\Tuple_CE_vs90.vcproj", "{F143DA5A-221A-3737-BCBA-F5BFD977038F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TypeHandler", "TypeHandler\TypeHandler_CE_vs90.vcproj", "{65A12348-CA20-324E-9F5E-7F82753C2C65}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) - release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) - debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) - release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) - debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) - release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Binding", "Binding\Binding_CE_vs90.vcproj", "{0F0DF069-83D1-378D-A949-8DF9A883B627}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecordSet", "RecordSet\RecordSet_CE_vs90.vcproj", "{FEE20DCE-B9E3-30AB-A40C-B6A324997328}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RowFormatter", "RowFormatter\RowFormatter_CE_vs90.vcproj", "{133C62C7-3301-3F43-9ABF-14DF094A042F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tuple", "Tuple\Tuple_CE_vs90.vcproj", "{F143DA5A-221A-3737-BCBA-F5BFD977038F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TypeHandler", "TypeHandler\TypeHandler_CE_vs90.vcproj", "{65A12348-CA20-324E-9F5E-7F82753C2C65}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) + release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) + debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) + release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) + debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) + release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/samples/samples_vs110.sln b/Data/samples/samples_vs110.sln index 2afcbb4ca..27ca82e63 100644 --- a/Data/samples/samples_vs110.sln +++ b/Data/samples/samples_vs110.sln @@ -1,117 +1,117 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Binding", "Binding\Binding_vs110.vcxproj", "{0F0DF069-83D1-378D-A949-8DF9A883B627}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecordSet", "RecordSet\RecordSet_vs110.vcxproj", "{FEE20DCE-B9E3-30AB-A40C-B6A324997328}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RowFormatter", "RowFormatter\RowFormatter_vs110.vcxproj", "{133C62C7-3301-3F43-9ABF-14DF094A042F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tuple", "Tuple\Tuple_vs110.vcxproj", "{F143DA5A-221A-3737-BCBA-F5BFD977038F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TypeHandler", "TypeHandler\TypeHandler_vs110.vcxproj", "{65A12348-CA20-324E-9F5E-7F82753C2C65}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Win32.Build.0 = release_shared|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Win32.Build.0 = release_shared|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Win32.Build.0 = release_shared|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Win32.Build.0 = release_shared|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Win32.Build.0 = release_shared|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Binding", "Binding\Binding_vs110.vcxproj", "{0F0DF069-83D1-378D-A949-8DF9A883B627}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecordSet", "RecordSet\RecordSet_vs110.vcxproj", "{FEE20DCE-B9E3-30AB-A40C-B6A324997328}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RowFormatter", "RowFormatter\RowFormatter_vs110.vcxproj", "{133C62C7-3301-3F43-9ABF-14DF094A042F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tuple", "Tuple\Tuple_vs110.vcxproj", "{F143DA5A-221A-3737-BCBA-F5BFD977038F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TypeHandler", "TypeHandler\TypeHandler_vs110.vcxproj", "{65A12348-CA20-324E-9F5E-7F82753C2C65}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Win32.Build.0 = release_shared|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Win32.Build.0 = release_shared|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Win32.Build.0 = release_shared|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Win32.Build.0 = release_shared|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Win32.Build.0 = release_shared|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/samples/samples_x64_vs100.sln b/Data/samples/samples_x64_vs100.sln index c84440c13..963aeaa7d 100644 --- a/Data/samples/samples_x64_vs100.sln +++ b/Data/samples/samples_x64_vs100.sln @@ -1,117 +1,117 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Binding", "Binding\Binding_x64_vs100.vcxproj", "{0F0DF069-83D1-378D-A949-8DF9A883B627}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecordSet", "RecordSet\RecordSet_x64_vs100.vcxproj", "{FEE20DCE-B9E3-30AB-A40C-B6A324997328}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RowFormatter", "RowFormatter\RowFormatter_x64_vs100.vcxproj", "{133C62C7-3301-3F43-9ABF-14DF094A042F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tuple", "Tuple\Tuple_x64_vs100.vcxproj", "{F143DA5A-221A-3737-BCBA-F5BFD977038F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TypeHandler", "TypeHandler\TypeHandler_x64_vs100.vcxproj", "{65A12348-CA20-324E-9F5E-7F82753C2C65}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Build.0 = debug_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.ActiveCfg = release_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Build.0 = release_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Deploy.0 = release_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Build.0 = release_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Build.0 = debug_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.ActiveCfg = release_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Build.0 = release_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Deploy.0 = release_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Build.0 = release_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Build.0 = debug_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.ActiveCfg = release_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Build.0 = release_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Deploy.0 = release_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Build.0 = release_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Build.0 = debug_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.ActiveCfg = release_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Build.0 = release_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Deploy.0 = release_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Build.0 = release_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Build.0 = debug_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.ActiveCfg = release_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Build.0 = release_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Deploy.0 = release_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Build.0 = release_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Binding", "Binding\Binding_x64_vs100.vcxproj", "{0F0DF069-83D1-378D-A949-8DF9A883B627}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecordSet", "RecordSet\RecordSet_x64_vs100.vcxproj", "{FEE20DCE-B9E3-30AB-A40C-B6A324997328}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RowFormatter", "RowFormatter\RowFormatter_x64_vs100.vcxproj", "{133C62C7-3301-3F43-9ABF-14DF094A042F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tuple", "Tuple\Tuple_x64_vs100.vcxproj", "{F143DA5A-221A-3737-BCBA-F5BFD977038F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TypeHandler", "TypeHandler\TypeHandler_x64_vs100.vcxproj", "{65A12348-CA20-324E-9F5E-7F82753C2C65}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Build.0 = debug_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.ActiveCfg = release_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Build.0 = release_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Deploy.0 = release_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Build.0 = release_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Build.0 = debug_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.ActiveCfg = release_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Build.0 = release_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Deploy.0 = release_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Build.0 = release_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Build.0 = debug_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.ActiveCfg = release_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Build.0 = release_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Deploy.0 = release_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Build.0 = release_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Build.0 = debug_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.ActiveCfg = release_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Build.0 = release_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Deploy.0 = release_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Build.0 = release_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Build.0 = debug_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.ActiveCfg = release_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Build.0 = release_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Deploy.0 = release_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Build.0 = release_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/samples/samples_x64_vs110.sln b/Data/samples/samples_x64_vs110.sln index a60a01939..822f27a0c 100644 --- a/Data/samples/samples_x64_vs110.sln +++ b/Data/samples/samples_x64_vs110.sln @@ -1,117 +1,117 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Binding", "Binding\Binding_x64_vs110.vcxproj", "{0F0DF069-83D1-378D-A949-8DF9A883B627}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecordSet", "RecordSet\RecordSet_x64_vs110.vcxproj", "{FEE20DCE-B9E3-30AB-A40C-B6A324997328}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RowFormatter", "RowFormatter\RowFormatter_x64_vs110.vcxproj", "{133C62C7-3301-3F43-9ABF-14DF094A042F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tuple", "Tuple\Tuple_x64_vs110.vcxproj", "{F143DA5A-221A-3737-BCBA-F5BFD977038F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TypeHandler", "TypeHandler\TypeHandler_x64_vs110.vcxproj", "{65A12348-CA20-324E-9F5E-7F82753C2C65}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Build.0 = debug_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.ActiveCfg = release_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Build.0 = release_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Deploy.0 = release_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Build.0 = release_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Build.0 = debug_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.ActiveCfg = release_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Build.0 = release_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Deploy.0 = release_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Build.0 = release_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Build.0 = debug_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.ActiveCfg = release_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Build.0 = release_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Deploy.0 = release_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Build.0 = release_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Build.0 = debug_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.ActiveCfg = release_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Build.0 = release_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Deploy.0 = release_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Build.0 = release_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Build.0 = debug_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.ActiveCfg = release_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Build.0 = release_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Deploy.0 = release_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Build.0 = release_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Binding", "Binding\Binding_x64_vs110.vcxproj", "{0F0DF069-83D1-378D-A949-8DF9A883B627}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecordSet", "RecordSet\RecordSet_x64_vs110.vcxproj", "{FEE20DCE-B9E3-30AB-A40C-B6A324997328}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RowFormatter", "RowFormatter\RowFormatter_x64_vs110.vcxproj", "{133C62C7-3301-3F43-9ABF-14DF094A042F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tuple", "Tuple\Tuple_x64_vs110.vcxproj", "{F143DA5A-221A-3737-BCBA-F5BFD977038F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TypeHandler", "TypeHandler\TypeHandler_x64_vs110.vcxproj", "{65A12348-CA20-324E-9F5E-7F82753C2C65}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Build.0 = debug_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.ActiveCfg = release_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Build.0 = release_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Deploy.0 = release_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Build.0 = release_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Build.0 = debug_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.ActiveCfg = release_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Build.0 = release_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Deploy.0 = release_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Build.0 = release_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Build.0 = debug_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.ActiveCfg = release_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Build.0 = release_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Deploy.0 = release_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Build.0 = release_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Build.0 = debug_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.ActiveCfg = release_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Build.0 = release_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Deploy.0 = release_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Build.0 = release_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Build.0 = debug_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.ActiveCfg = release_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Build.0 = release_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Deploy.0 = release_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Build.0 = release_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/samples/samples_x64_vs90.sln b/Data/samples/samples_x64_vs90.sln index 17f9e1db1..e70392a75 100644 --- a/Data/samples/samples_x64_vs90.sln +++ b/Data/samples/samples_x64_vs90.sln @@ -1,117 +1,117 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Binding", "Binding\Binding_x64_vs90.vcproj", "{0F0DF069-83D1-378D-A949-8DF9A883B627}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecordSet", "RecordSet\RecordSet_x64_vs90.vcproj", "{FEE20DCE-B9E3-30AB-A40C-B6A324997328}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RowFormatter", "RowFormatter\RowFormatter_x64_vs90.vcproj", "{133C62C7-3301-3F43-9ABF-14DF094A042F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tuple", "Tuple\Tuple_x64_vs90.vcproj", "{F143DA5A-221A-3737-BCBA-F5BFD977038F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TypeHandler", "TypeHandler\TypeHandler_x64_vs90.vcproj", "{65A12348-CA20-324E-9F5E-7F82753C2C65}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Build.0 = debug_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.ActiveCfg = release_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Build.0 = release_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Deploy.0 = release_shared|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Build.0 = release_static_md|x64 - {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Build.0 = debug_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.ActiveCfg = release_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Build.0 = release_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Deploy.0 = release_shared|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Build.0 = release_static_md|x64 - {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Build.0 = debug_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.ActiveCfg = release_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Build.0 = release_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Deploy.0 = release_shared|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Build.0 = release_static_md|x64 - {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Build.0 = debug_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.ActiveCfg = release_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Build.0 = release_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Deploy.0 = release_shared|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Build.0 = release_static_md|x64 - {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Build.0 = debug_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.ActiveCfg = release_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Build.0 = release_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Deploy.0 = release_shared|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Build.0 = release_static_md|x64 - {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Binding", "Binding\Binding_x64_vs90.vcproj", "{0F0DF069-83D1-378D-A949-8DF9A883B627}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecordSet", "RecordSet\RecordSet_x64_vs90.vcproj", "{FEE20DCE-B9E3-30AB-A40C-B6A324997328}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RowFormatter", "RowFormatter\RowFormatter_x64_vs90.vcproj", "{133C62C7-3301-3F43-9ABF-14DF094A042F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tuple", "Tuple\Tuple_x64_vs90.vcproj", "{F143DA5A-221A-3737-BCBA-F5BFD977038F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TypeHandler", "TypeHandler\TypeHandler_x64_vs90.vcproj", "{65A12348-CA20-324E-9F5E-7F82753C2C65}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Build.0 = debug_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.ActiveCfg = release_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Build.0 = release_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|x64.Deploy.0 = release_shared|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Build.0 = release_static_md|x64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Build.0 = debug_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.ActiveCfg = release_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Build.0 = release_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|x64.Deploy.0 = release_shared|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Build.0 = release_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Build.0 = debug_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.ActiveCfg = release_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Build.0 = release_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|x64.Deploy.0 = release_shared|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Build.0 = release_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Build.0 = debug_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.ActiveCfg = release_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Build.0 = release_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|x64.Deploy.0 = release_shared|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Build.0 = release_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Build.0 = debug_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.ActiveCfg = release_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Build.0 = release_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|x64.Deploy.0 = release_shared|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Build.0 = release_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Data/testsuite/TestSuite_CE_vs90.vcproj b/Data/testsuite/TestSuite_CE_vs90.vcproj index 177bcaff9..c55096dfc 100644 --- a/Data/testsuite/TestSuite_CE_vs90.vcproj +++ b/Data/testsuite/TestSuite_CE_vs90.vcproj @@ -1,541 +1,541 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/testsuite/TestSuite_vs110.vcxproj b/Data/testsuite/TestSuite_vs110.vcxproj index ab21029ea..ac69702f5 100644 --- a/Data/testsuite/TestSuite_vs110.vcxproj +++ b/Data/testsuite/TestSuite_vs110.vcxproj @@ -1,333 +1,333 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/testsuite/TestSuite_vs110.vcxproj.filters b/Data/testsuite/TestSuite_vs110.vcxproj.filters index 66e9a7a2b..9a24edbe9 100644 --- a/Data/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,108 +1,108 @@ - - - - - {b6a606b7-d76a-4dd4-8fb8-5bc9977f66c0} - - - {a13a6ee3-b806-4794-b03d-db373da8a792} - - - {4c5bd459-4f5f-40ff-852a-5e4797258f34} - - - {fad528f2-a756-4e43-91af-b8b3a59de3c4} - - - {0fa95b86-f399-4e64-90cb-fd760f252cfd} - - - {c772945c-3320-4752-ae6f-38d332aec63d} - - - {6f86fbc8-60ba-4e59-9081-d6ab5cfd4cfe} - - - {8d84a44e-d9ff-453c-aba0-341a9f20a14b} - - - {7ea5d1b7-bdb1-40e7-b2dc-bc95b6856baa} - - - {96605fcb-65c5-4376-8c64-0a29fa0bbbbf} - - - {ea1f7173-5975-4694-beec-ccdfa498b49e} - - - {98af87e1-2094-4782-a61e-b13f36889602} - - - {c9be4e14-7f22-4b03-8609-000dc4ab62fb} - - - {b2976cee-98cb-47ff-ba1b-68c4f6666c35} - - - - - DataCore\Header Files - - - _Suite\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - SessionPooling\Header Files - - - - - DataCore\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - SessionPooling\Source Files - - + + + + + {b6a606b7-d76a-4dd4-8fb8-5bc9977f66c0} + + + {a13a6ee3-b806-4794-b03d-db373da8a792} + + + {4c5bd459-4f5f-40ff-852a-5e4797258f34} + + + {fad528f2-a756-4e43-91af-b8b3a59de3c4} + + + {0fa95b86-f399-4e64-90cb-fd760f252cfd} + + + {c772945c-3320-4752-ae6f-38d332aec63d} + + + {6f86fbc8-60ba-4e59-9081-d6ab5cfd4cfe} + + + {8d84a44e-d9ff-453c-aba0-341a9f20a14b} + + + {7ea5d1b7-bdb1-40e7-b2dc-bc95b6856baa} + + + {96605fcb-65c5-4376-8c64-0a29fa0bbbbf} + + + {ea1f7173-5975-4694-beec-ccdfa498b49e} + + + {98af87e1-2094-4782-a61e-b13f36889602} + + + {c9be4e14-7f22-4b03-8609-000dc4ab62fb} + + + {b2976cee-98cb-47ff-ba1b-68c4f6666c35} + + + + + DataCore\Header Files + + + _Suite\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + SessionPooling\Header Files + + + + + DataCore\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + SessionPooling\Source Files + + \ No newline at end of file diff --git a/Data/testsuite/TestSuite_x64_vs100.vcxproj b/Data/testsuite/TestSuite_x64_vs100.vcxproj index 6f4fb68d2..820e647d9 100644 --- a/Data/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs100.vcxproj @@ -1,327 +1,327 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - Application - Static - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Static + MultiByte + + + Application + Static + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters index 5cd3104e7..8f85a8220 100644 --- a/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -1,108 +1,108 @@ - - - - - {1129a876-76fa-423a-bb0b-0f6cc78c4c40} - - - {cdaa1b41-fe42-4061-9d79-0aae45c5ece7} - - - {cf7d69f0-719d-48dc-94da-e207221c087f} - - - {6603b5ee-9384-4028-a823-6c7c71836f49} - - - {550f410a-8610-422e-855c-5e5ccfccd3f3} - - - {517e4750-f794-43f8-940b-e183562ff19d} - - - {cf9304f4-3ac1-4a77-905b-33d0b1f5926d} - - - {074b0d40-ce06-46ad-991d-86f2c9b7ad06} - - - {a9c885b8-8ab1-46c2-add0-bea5d28167d8} - - - {524aac38-86f7-4710-a57a-14a4c6655f67} - - - {1932e125-c6c8-4bb4-8dc5-00f676aa9f50} - - - {88c5fc9b-57d4-4536-bbad-b96dc583ad38} - - - {0a40f4da-b80c-4d73-8297-9e36fa6c0923} - - - {c8a552e8-10c7-471f-97a4-96ffb042a9a6} - - - - - DataCore\Header Files - - - _Suite\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - SessionPooling\Header Files - - - - - DataCore\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - SessionPooling\Source Files - - + + + + + {1129a876-76fa-423a-bb0b-0f6cc78c4c40} + + + {cdaa1b41-fe42-4061-9d79-0aae45c5ece7} + + + {cf7d69f0-719d-48dc-94da-e207221c087f} + + + {6603b5ee-9384-4028-a823-6c7c71836f49} + + + {550f410a-8610-422e-855c-5e5ccfccd3f3} + + + {517e4750-f794-43f8-940b-e183562ff19d} + + + {cf9304f4-3ac1-4a77-905b-33d0b1f5926d} + + + {074b0d40-ce06-46ad-991d-86f2c9b7ad06} + + + {a9c885b8-8ab1-46c2-add0-bea5d28167d8} + + + {524aac38-86f7-4710-a57a-14a4c6655f67} + + + {1932e125-c6c8-4bb4-8dc5-00f676aa9f50} + + + {88c5fc9b-57d4-4536-bbad-b96dc583ad38} + + + {0a40f4da-b80c-4d73-8297-9e36fa6c0923} + + + {c8a552e8-10c7-471f-97a4-96ffb042a9a6} + + + + + DataCore\Header Files + + + _Suite\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + SessionPooling\Header Files + + + + + DataCore\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + SessionPooling\Source Files + + \ No newline at end of file diff --git a/Data/testsuite/TestSuite_x64_vs110.vcxproj b/Data/testsuite/TestSuite_x64_vs110.vcxproj index 889f1aee3..ebaa776f3 100644 --- a/Data/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,333 +1,333 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters index 3fdae8a79..1f7b66834 100644 --- a/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,108 +1,108 @@ - - - - - {90062465-3658-42e7-873e-d7526c270e6f} - - - {a227d0aa-ae5d-42b7-9df6-ed84dce2415e} - - - {9ad7a195-9bf4-43b6-8e1d-62325ca7ab5e} - - - {0fd8deef-f352-49ae-9812-59494ff515fd} - - - {90cb4826-b273-485c-b067-a69d9474b8a0} - - - {27742860-d29f-4015-8f23-b454ecf27745} - - - {fe4ffff5-0306-4000-be40-3da1a349dc24} - - - {9ec0498a-0df8-4baa-8fb0-14cb72e9c140} - - - {47ba482b-728d-4ba6-bffd-185546366331} - - - {44672c03-80bc-4325-a23a-814f2667bb41} - - - {1c856e10-8fdf-4c53-bbc1-bf1764d7283e} - - - {dc37ee7b-1e02-4c64-ab33-bc989eb3c047} - - - {062d01b1-7066-48d5-a643-94d28094b354} - - - {88fc1b2f-6be8-4ead-b79b-14ee46f6b8aa} - - - - - DataCore\Header Files - - - _Suite\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - TestSession\Header Files - - - SessionPooling\Header Files - - - - - DataCore\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - TestSession\Source Files - - - SessionPooling\Source Files - - + + + + + {90062465-3658-42e7-873e-d7526c270e6f} + + + {a227d0aa-ae5d-42b7-9df6-ed84dce2415e} + + + {9ad7a195-9bf4-43b6-8e1d-62325ca7ab5e} + + + {0fd8deef-f352-49ae-9812-59494ff515fd} + + + {90cb4826-b273-485c-b067-a69d9474b8a0} + + + {27742860-d29f-4015-8f23-b454ecf27745} + + + {fe4ffff5-0306-4000-be40-3da1a349dc24} + + + {9ec0498a-0df8-4baa-8fb0-14cb72e9c140} + + + {47ba482b-728d-4ba6-bffd-185546366331} + + + {44672c03-80bc-4325-a23a-814f2667bb41} + + + {1c856e10-8fdf-4c53-bbc1-bf1764d7283e} + + + {dc37ee7b-1e02-4c64-ab33-bc989eb3c047} + + + {062d01b1-7066-48d5-a643-94d28094b354} + + + {88fc1b2f-6be8-4ead-b79b-14ee46f6b8aa} + + + + + DataCore\Header Files + + + _Suite\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + TestSession\Header Files + + + SessionPooling\Header Files + + + + + DataCore\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + TestSession\Source Files + + + SessionPooling\Source Files + + \ No newline at end of file diff --git a/Data/testsuite/TestSuite_x64_vs90.vcproj b/Data/testsuite/TestSuite_x64_vs90.vcproj index a65910f4b..03c668506 100644 --- a/Data/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/testsuite/TestSuite_x64_vs90.vcproj @@ -1,516 +1,516 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/testsuite/src/WinCEDriver.cpp b/Data/testsuite/src/WinCEDriver.cpp index f7d82e7c0..295b03a76 100644 --- a/Data/testsuite/src/WinCEDriver.cpp +++ b/Data/testsuite/src/WinCEDriver.cpp @@ -1,52 +1,52 @@ -// -// WinCEDriver.cpp -// -// $Id: //poco/1.3-WinCE/Net/testsuite/src/WinCEDriver.cpp#2 $ -// -// Console-based test driver for Windows CE. -// -// Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "CppUnit/TestRunner.h" -#include "DataTestSuite.h" -#include - - -int _tmain(int argc, wchar_t* argv[]) -{ - std::vector args; - for (int i = 0; i < argc; ++i) - { - char buffer[1024]; - std::wcstombs(buffer, argv[i], sizeof(buffer)); - args.push_back(std::string(buffer)); - } - CppUnit::TestRunner runner; - runner.addTest("DataTestSuite", DataTestSuite::suite()); - return runner.run(args) ? 0 : 1; -} +// +// WinCEDriver.cpp +// +// $Id: //poco/1.3-WinCE/Net/testsuite/src/WinCEDriver.cpp#2 $ +// +// Console-based test driver for Windows CE. +// +// Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "CppUnit/TestRunner.h" +#include "DataTestSuite.h" +#include + + +int _tmain(int argc, wchar_t* argv[]) +{ + std::vector args; + for (int i = 0; i < argc; ++i) + { + char buffer[1024]; + std::wcstombs(buffer, argv[i], sizeof(buffer)); + args.push_back(std::string(buffer)); + } + CppUnit::TestRunner runner; + runner.addTest("DataTestSuite", DataTestSuite::suite()); + return runner.run(args) ? 0 : 1; +} diff --git a/Foundation/Foundation_vs110.sln b/Foundation/Foundation_vs110.sln index 2516a71a9..9d6c8230a 100644 --- a/Foundation/Foundation_vs110.sln +++ b/Foundation/Foundation_vs110.sln @@ -1,83 +1,83 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs110.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs110.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}" - ProjectSection(ProjectDependencies) = postProject - {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs110.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}" - ProjectSection(ProjectDependencies) = postProject - {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}" - ProjectSection(ProjectDependencies) = postProject - {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.ActiveCfg = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.Build.0 = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.ActiveCfg = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.Build.0 = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.ActiveCfg = release_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.Build.0 = release_shared|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.Build.0 = release_shared|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs110.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs110.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}" + ProjectSection(ProjectDependencies) = postProject + {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs110.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}" + ProjectSection(ProjectDependencies) = postProject + {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}" + ProjectSection(ProjectDependencies) = postProject + {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_shared|Win32 = release_shared|Win32 + release_static_md|Win32 = release_static_md|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.ActiveCfg = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.Build.0 = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.ActiveCfg = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.Build.0 = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.ActiveCfg = release_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.Build.0 = release_shared|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.Build.0 = release_shared|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Foundation/Foundation_vs110.vcxproj b/Foundation/Foundation_vs110.vcxproj index 8ce9c728b..5cd999f1e 100644 --- a/Foundation/Foundation_vs110.vcxproj +++ b/Foundation/Foundation_vs110.vcxproj @@ -1,1328 +1,1328 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Foundation - {8164D41D-B053-405B-826C-CF37AC0EF176} - Foundation - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoFoundationd - PocoFoundationmdd - PocoFoundationmtd - PocoFoundation - PocoFoundationmd - PocoFoundationmt - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - EditAndContinue - Default - - - iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoFoundationd.dll - true - true - ..\bin\PocoFoundationd.pdb - Console - ..\lib\PocoFoundationd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - Default - - - iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoFoundation.dll - true - false - - - Console - true - true - ..\lib\PocoFoundation.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - Default - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmd.lib - /ignore:4221 %(AdditionalOptions) - - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - EditAndContinue - Default - ..\lib\PocoFoundationmdd.pdb - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmdd.lib - /ignore:4221 %(AdditionalOptions) - - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - Level3 - EditAndContinue - Default - ..\lib\PocoFoundationmtd.pdb - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmtd.lib - /ignore:4221 %(AdditionalOptions) - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreaded - false - true - true - true - - - Level3 - - - Default - /ignore:4221 %(AdditionalOptions) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmt.lib - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Foundation + {8164D41D-B053-405B-826C-CF37AC0EF176} + Foundation + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoFoundationd + PocoFoundationmdd + PocoFoundationmtd + PocoFoundation + PocoFoundationmd + PocoFoundationmt + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + EditAndContinue + Default + + + iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoFoundationd.dll + true + true + ..\bin\PocoFoundationd.pdb + Console + ..\lib\PocoFoundationd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) + false + false + false + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + Default + + + iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoFoundation.dll + true + false + + + Console + true + true + ..\lib\PocoFoundation.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + false + false + false + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + Default + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationmd.lib + /ignore:4221 %(AdditionalOptions) + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + EditAndContinue + Default + ..\lib\PocoFoundationmdd.pdb + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationmdd.lib + /ignore:4221 %(AdditionalOptions) + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + Level3 + EditAndContinue + Default + ..\lib\PocoFoundationmtd.pdb + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationmtd.lib + /ignore:4221 %(AdditionalOptions) + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + false + false + false + true + MultiThreaded + false + true + true + true + + + Level3 + + + Default + /ignore:4221 %(AdditionalOptions) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationmt.lib + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + true + true + true + true + true + true + + + + + + + + + true + true + true + true + true + true + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - - - - - true - true - true - true - - - - - - + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + + + + true + true + true + true + + + + + + \ No newline at end of file diff --git a/Foundation/Foundation_vs110.vcxproj.filters b/Foundation/Foundation_vs110.vcxproj.filters index c120249d5..13c94e4a0 100644 --- a/Foundation/Foundation_vs110.vcxproj.filters +++ b/Foundation/Foundation_vs110.vcxproj.filters @@ -1,1844 +1,1844 @@ - - - - - {185c1200-1c1b-4fc7-9da0-b650d0c1bf77} - - - {e4438cfb-753c-4882-b6a7-37f1b2eb7924} - - - {5fef2634-dac7-4251-8cc6-685a55fb6b69} - - - {27c4af78-bbb6-41df-a186-f2a592f6dd7e} - - - {faa6333e-8acd-42d3-b72c-37cd0e19d162} - - - {d5c0096d-097d-40c2-ac9e-c52501bca586} - - - {341c25b8-2c02-4356-98af-e9cdc028d65d} - - - {dcfb473d-2dc0-419b-82e5-49a02e866436} - - - {82d7f0b3-7dcc-44f9-8982-ab3afbcc8cd8} - - - {2cf5d5b6-8945-4a08-8382-b1ae4760d23c} - - - {d7d8f3d7-1f4d-40b3-b2be-69b169947e81} - - - {4eac0cd3-fa98-44f0-ba4b-126eea40690d} - - - {641198e1-de95-4b94-8f88-740c2b199cf7} - - - {69ead8e2-e830-4352-b858-3b7fa83c6f69} - - - {86878c35-6789-4bed-96b4-27ddf9c57acd} - - - {7de594c4-642c-4ac5-b236-7056ccaa6191} - - - {74d499e8-5aec-4f63-9522-26bc8b2e4e1e} - - - {aad0de07-cbb7-4cf9-acbb-46b3c529ef72} - - - {59eea661-94fe-4cfa-a84a-3ed55d6fc6c2} - - - {0b1828a5-18ba-4155-a8f9-2c488e582c0d} - - - {ddc6a944-851d-4fae-9ae2-58c7abb800ae} - - - {96f5ad60-2335-463a-8e23-da1476ed46f2} - - - {06229b8b-13a0-43b1-8f11-53373321e5cd} - - - {5274aca5-2472-4212-a11a-7d23ff583083} - - - {c9340af5-5ac1-4082-8fee-f6343b9ab2e2} - - - {d723209d-84d0-4890-ac64-4949699f6e3a} - - - {44de33ce-ef79-4671-8258-65dc5ef863b8} - - - {39e651e5-e5c8-454d-b1f9-456c809dcf92} - - - {732e2c8f-a8af-4318-9ab9-0d8d62afae54} - - - {5d4bc826-9b0a-4014-9302-cc9f88646ff6} - - - {b8210208-8698-4cda-94fd-3e906f9ca78f} - - - {af751147-0509-4d3c-9ab3-b20c20974341} - - - {359ad015-e38e-423e-877e-c827eed229f2} - - - {3a817f74-6edb-4098-a29b-8347840a09ae} - - - {a07318ae-554f-44ec-bdfd-6fe0929c3dd3} - - - {ece427ab-b6ef-4700-9a42-312b8507a010} - - - {eb8ddeab-7b2f-4537-aa4a-939268a1a9a4} - - - {4bcbbcd9-3409-4bcc-b999-f9e360d45a09} - - - {48f74d8c-d6a2-4e5a-a322-55702b35b221} - - - {6c702a6b-e1d8-4d6e-9c48-dab631371287} - - - {e3e8d759-a950-40ed-9271-17bf7e9baa8e} - - - {3ef3d3a4-84a1-4026-85dd-53e71f3f820f} - - - {665d566f-5f8f-45d0-b883-a43185dc8ab8} - - - {51e1620d-85e0-493d-819f-960bc0957f0f} - - - {ee3f4314-64e7-420c-88d5-df016f15dd4f} - - - {bc06eae9-3602-448d-8290-4a9a68adbe8b} - - - {1a21c5ef-d4a6-42dc-94be-5a0a791ba589} - - - {dafee4e1-a8e0-4af9-bd00-378430a364ea} - - - {cb46df12-6010-4ef6-9f85-937585263f3e} - - - {50d1f7a3-d675-41b8-8370-2718b2e95c2f} - - - {f2886094-2ba3-402c-b5a8-dbfa0500e3d3} - - - {7237275f-8924-4f26-96de-066ba722f9c6} - - - {cdb9c09a-2a19-4203-a6f4-87455a799508} - - - {040f6767-8762-4b80-9db2-45a2b18c1d86} - - - {3fd772e7-f8cf-42fb-8b1b-5c49b9f79562} - - - {6e184876-2a72-4dd8-87e0-a42022d17513} - - - {251118a8-6f5b-4f8f-b19f-b953058b3820} - - - {20c16777-1fc6-4272-bf38-fef730596f73} - - - {da88549e-329c-444c-85bb-b2339bc09505} - - - {1ad862ca-df95-43f5-a87b-a714b9b84303} - - - {918536bd-29fb-4b4f-a706-629925dbb66c} - - - {4d00a3d6-7a50-4553-a62a-8eee081c9fb1} - - - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - RegularExpression\Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - UUID\Source Files - - - UUID\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - URI\Source Files - - - URI\Source Files - - - URI\Source Files - - - URI\Source Files - - - Tasks\Source Files - - - Tasks\Source Files - - - Tasks\Source Files - - - Events\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Filesystem\Source Files - - - Dynamic\Source Files - - - Dynamic\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Streams\Source Files - - - Text\Source Files - - - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - RegularExpression\PCRE Header Files - - - RegularExpression\PCRE Header Files - - - RegularExpression\PCRE Header Files - - - RegularExpression\PCRE Header Files - - - RegularExpression\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - UUID\Header Files - - - UUID\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - URI\Header Files - - - URI\Header Files - - - URI\Header Files - - - URI\Header Files - - - Tasks\Header Files - - - Tasks\Header Files - - - Tasks\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Cache\Header Files - - - Events\Header Files - - - Filesystem\Header Files - - - Dynamic\Header Files - - - Dynamic\Header Files - - - Dynamic\Header Files - - - Dynamic\Header Files - - - Text\Header Files - - - Text\Header Files - - - Core\Header Files - - - Core\Header Files - - - Streams\Header Files - - - Text\Header Files - - - Text\Header Files - - - Core\Header Files - - - - - Logging\Resource Files - - - - - - Logging\Message Files - - + + + + + {185c1200-1c1b-4fc7-9da0-b650d0c1bf77} + + + {e4438cfb-753c-4882-b6a7-37f1b2eb7924} + + + {5fef2634-dac7-4251-8cc6-685a55fb6b69} + + + {27c4af78-bbb6-41df-a186-f2a592f6dd7e} + + + {faa6333e-8acd-42d3-b72c-37cd0e19d162} + + + {d5c0096d-097d-40c2-ac9e-c52501bca586} + + + {341c25b8-2c02-4356-98af-e9cdc028d65d} + + + {dcfb473d-2dc0-419b-82e5-49a02e866436} + + + {82d7f0b3-7dcc-44f9-8982-ab3afbcc8cd8} + + + {2cf5d5b6-8945-4a08-8382-b1ae4760d23c} + + + {d7d8f3d7-1f4d-40b3-b2be-69b169947e81} + + + {4eac0cd3-fa98-44f0-ba4b-126eea40690d} + + + {641198e1-de95-4b94-8f88-740c2b199cf7} + + + {69ead8e2-e830-4352-b858-3b7fa83c6f69} + + + {86878c35-6789-4bed-96b4-27ddf9c57acd} + + + {7de594c4-642c-4ac5-b236-7056ccaa6191} + + + {74d499e8-5aec-4f63-9522-26bc8b2e4e1e} + + + {aad0de07-cbb7-4cf9-acbb-46b3c529ef72} + + + {59eea661-94fe-4cfa-a84a-3ed55d6fc6c2} + + + {0b1828a5-18ba-4155-a8f9-2c488e582c0d} + + + {ddc6a944-851d-4fae-9ae2-58c7abb800ae} + + + {96f5ad60-2335-463a-8e23-da1476ed46f2} + + + {06229b8b-13a0-43b1-8f11-53373321e5cd} + + + {5274aca5-2472-4212-a11a-7d23ff583083} + + + {c9340af5-5ac1-4082-8fee-f6343b9ab2e2} + + + {d723209d-84d0-4890-ac64-4949699f6e3a} + + + {44de33ce-ef79-4671-8258-65dc5ef863b8} + + + {39e651e5-e5c8-454d-b1f9-456c809dcf92} + + + {732e2c8f-a8af-4318-9ab9-0d8d62afae54} + + + {5d4bc826-9b0a-4014-9302-cc9f88646ff6} + + + {b8210208-8698-4cda-94fd-3e906f9ca78f} + + + {af751147-0509-4d3c-9ab3-b20c20974341} + + + {359ad015-e38e-423e-877e-c827eed229f2} + + + {3a817f74-6edb-4098-a29b-8347840a09ae} + + + {a07318ae-554f-44ec-bdfd-6fe0929c3dd3} + + + {ece427ab-b6ef-4700-9a42-312b8507a010} + + + {eb8ddeab-7b2f-4537-aa4a-939268a1a9a4} + + + {4bcbbcd9-3409-4bcc-b999-f9e360d45a09} + + + {48f74d8c-d6a2-4e5a-a322-55702b35b221} + + + {6c702a6b-e1d8-4d6e-9c48-dab631371287} + + + {e3e8d759-a950-40ed-9271-17bf7e9baa8e} + + + {3ef3d3a4-84a1-4026-85dd-53e71f3f820f} + + + {665d566f-5f8f-45d0-b883-a43185dc8ab8} + + + {51e1620d-85e0-493d-819f-960bc0957f0f} + + + {ee3f4314-64e7-420c-88d5-df016f15dd4f} + + + {bc06eae9-3602-448d-8290-4a9a68adbe8b} + + + {1a21c5ef-d4a6-42dc-94be-5a0a791ba589} + + + {dafee4e1-a8e0-4af9-bd00-378430a364ea} + + + {cb46df12-6010-4ef6-9f85-937585263f3e} + + + {50d1f7a3-d675-41b8-8370-2718b2e95c2f} + + + {f2886094-2ba3-402c-b5a8-dbfa0500e3d3} + + + {7237275f-8924-4f26-96de-066ba722f9c6} + + + {cdb9c09a-2a19-4203-a6f4-87455a799508} + + + {040f6767-8762-4b80-9db2-45a2b18c1d86} + + + {3fd772e7-f8cf-42fb-8b1b-5c49b9f79562} + + + {6e184876-2a72-4dd8-87e0-a42022d17513} + + + {251118a8-6f5b-4f8f-b19f-b953058b3820} + + + {20c16777-1fc6-4272-bf38-fef730596f73} + + + {da88549e-329c-444c-85bb-b2339bc09505} + + + {1ad862ca-df95-43f5-a87b-a714b9b84303} + + + {918536bd-29fb-4b4f-a706-629925dbb66c} + + + {4d00a3d6-7a50-4553-a62a-8eee081c9fb1} + + + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + RegularExpression\Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + UUID\Source Files + + + UUID\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + URI\Source Files + + + URI\Source Files + + + URI\Source Files + + + URI\Source Files + + + Tasks\Source Files + + + Tasks\Source Files + + + Tasks\Source Files + + + Events\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Filesystem\Source Files + + + Dynamic\Source Files + + + Dynamic\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Streams\Source Files + + + Text\Source Files + + + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + RegularExpression\PCRE Header Files + + + RegularExpression\PCRE Header Files + + + RegularExpression\PCRE Header Files + + + RegularExpression\PCRE Header Files + + + RegularExpression\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + UUID\Header Files + + + UUID\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + URI\Header Files + + + URI\Header Files + + + URI\Header Files + + + URI\Header Files + + + Tasks\Header Files + + + Tasks\Header Files + + + Tasks\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Cache\Header Files + + + Events\Header Files + + + Filesystem\Header Files + + + Dynamic\Header Files + + + Dynamic\Header Files + + + Dynamic\Header Files + + + Dynamic\Header Files + + + Text\Header Files + + + Text\Header Files + + + Core\Header Files + + + Core\Header Files + + + Streams\Header Files + + + Text\Header Files + + + Text\Header Files + + + Core\Header Files + + + + + Logging\Resource Files + + + + + + Logging\Message Files + + \ No newline at end of file diff --git a/Foundation/Foundation_x64_vs110.sln b/Foundation/Foundation_x64_vs110.sln index 8f0b1ab53..fa5c2a531 100644 --- a/Foundation/Foundation_x64_vs110.sln +++ b/Foundation/Foundation_x64_vs110.sln @@ -1,85 +1,85 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_x64_vs110.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_x64_vs110.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}" - ProjectSection(ProjectDependencies) = postProject - {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_x64_vs110.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}" - ProjectSection(ProjectDependencies) = postProject - {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}" - ProjectSection(ProjectDependencies) = postProject - {0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F} - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} - {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 - release_static_mt|x64 = release_static_mt|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.Build.0 = debug_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.ActiveCfg = debug_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.Build.0 = debug_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|x64.ActiveCfg = debug_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|x64.Build.0 = debug_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|x64.ActiveCfg = release_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|x64.Build.0 = release_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.ActiveCfg = release_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.Build.0 = release_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.ActiveCfg = release_shared|x64 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.Build.0 = release_shared|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.Build.0 = debug_shared|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|x64.ActiveCfg = release_shared|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|x64.Build.0 = release_shared|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|x64.Build.0 = release_static_md|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.Build.0 = debug_shared|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.ActiveCfg = release_shared|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.Build.0 = release_shared|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.Build.0 = release_static_md|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Build.0 = debug_shared|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.ActiveCfg = release_shared|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Build.0 = release_shared|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Build.0 = release_static_md|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Build.0 = release_static_mt|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_x64_vs110.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_x64_vs110.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}" + ProjectSection(ProjectDependencies) = postProject + {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_x64_vs110.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}" + ProjectSection(ProjectDependencies) = postProject + {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}" + ProjectSection(ProjectDependencies) = postProject + {0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F} + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} + {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + debug_static_md|x64 = debug_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_shared|x64 = release_shared|x64 + release_static_md|x64 = release_static_md|x64 + release_static_mt|x64 = release_static_mt|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.Build.0 = debug_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.ActiveCfg = debug_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.Build.0 = debug_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|x64.ActiveCfg = debug_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|x64.Build.0 = debug_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|x64.ActiveCfg = release_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|x64.Build.0 = release_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.ActiveCfg = release_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.Build.0 = release_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.ActiveCfg = release_shared|x64 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.Build.0 = release_shared|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.Build.0 = debug_shared|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|x64.ActiveCfg = release_shared|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|x64.Build.0 = release_shared|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|x64.Build.0 = release_static_md|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.Build.0 = debug_shared|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.ActiveCfg = release_shared|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.Build.0 = release_shared|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.Build.0 = release_static_md|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Build.0 = debug_shared|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.ActiveCfg = release_shared|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Build.0 = release_shared|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Build.0 = release_static_md|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Build.0 = release_static_mt|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Foundation/Foundation_x64_vs110.vcxproj b/Foundation/Foundation_x64_vs110.vcxproj index c179e1ad3..ed1ad3eac 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj +++ b/Foundation/Foundation_x64_vs110.vcxproj @@ -1,1332 +1,1332 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Foundation - {8164D41D-B053-405B-826C-CF37AC0EF176} - Foundation - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoFoundation64d - PocoFoundationmdd - PocoFoundationmtd - PocoFoundation64 - PocoFoundationmd - PocoFoundationmt - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - ProgramDatabase - Default - 4244;%(DisableSpecificWarnings) - - - iphlpapi.lib;%(AdditionalDependencies) - ..\bin64\PocoFoundation64d.dll - true - true - ..\bin64\PocoFoundation64d.pdb - Console - ..\lib64\PocoFoundationd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - Default - 4244;%(DisableSpecificWarnings) - - - iphlpapi.lib;%(AdditionalDependencies) - ..\bin64\PocoFoundation64.dll - true - false - - - Console - true - true - ..\lib64\PocoFoundation.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - Default - 4244;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib64\PocoFoundationmd.lib - MachineX64 - - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - ProgramDatabase - Default - 4244;%(DisableSpecificWarnings) - ..\lib64\PocoFoundationmdd.pdb - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib64\PocoFoundationmdd.lib - MachineX64 - - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - Level3 - ProgramDatabase - Default - 4244;%(DisableSpecificWarnings) - ..\lib64\PocoFoundationmtd.pdb - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib64\PocoFoundationmtd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreaded - false - true - true - true - - - Level3 - - - Default - 4244;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib64\PocoFoundationmt.lib - MachineX64 - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - - - - - true - true - true - true - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Foundation + {8164D41D-B053-405B-826C-CF37AC0EF176} + Foundation + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoFoundation64d + PocoFoundationmdd + PocoFoundationmtd + PocoFoundation64 + PocoFoundationmd + PocoFoundationmt + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + ProgramDatabase + Default + 4244;%(DisableSpecificWarnings) + + + iphlpapi.lib;%(AdditionalDependencies) + ..\bin64\PocoFoundation64d.dll + true + true + ..\bin64\PocoFoundation64d.pdb + Console + ..\lib64\PocoFoundationd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) + false + false + false + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + Default + 4244;%(DisableSpecificWarnings) + + + iphlpapi.lib;%(AdditionalDependencies) + ..\bin64\PocoFoundation64.dll + true + false + + + Console + true + true + ..\lib64\PocoFoundation.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + false + false + false + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + Default + 4244;%(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoFoundationmd.lib + MachineX64 + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + ProgramDatabase + Default + 4244;%(DisableSpecificWarnings) + ..\lib64\PocoFoundationmdd.pdb + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoFoundationmdd.lib + MachineX64 + + + + + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + Level3 + ProgramDatabase + Default + 4244;%(DisableSpecificWarnings) + ..\lib64\PocoFoundationmtd.pdb + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoFoundationmtd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) + false + false + false + true + MultiThreaded + false + true + true + true + + + Level3 + + + Default + 4244;%(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoFoundationmt.lib + MachineX64 + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + true + true + true + true + true + true + + + + + + + + + true + true + true + true + true + true + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) + + %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) + + + + + true + true + true + true + + + + + + \ No newline at end of file diff --git a/Foundation/Foundation_x64_vs110.vcxproj.filters b/Foundation/Foundation_x64_vs110.vcxproj.filters index 1b4a48f69..d91d36795 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj.filters +++ b/Foundation/Foundation_x64_vs110.vcxproj.filters @@ -1,1835 +1,1835 @@ - - - - - {eed22eb8-615d-47c6-9148-bf4b06dcba89} - - - {e4b65ef2-2d99-41ac-8fce-ecce748757fe} - - - {15b1d37c-f762-444f-943f-c1886dd9510c} - - - {9e3b59da-7f2c-4e28-8b35-7c3e8abf2ec3} - - - {faa35c18-be02-43c4-8d4d-7e63c97447f0} - - - {642a8ece-5f25-439e-aebc-f0aabc17a24d} - - - {873a6a3d-b159-495f-b307-908be9d0ca39} - - - {243ce5c9-276b-41e0-b226-d2e8c4eb399d} - - - {171bf60e-c5e8-41a6-a8c4-4e5035ac40e4} - - - {897efa40-8fd5-48ea-951f-5025e7bf316d} - - - {5449ee1f-18c8-46f2-ba3b-4851c2bed9be} - - - {ed334c78-ef4a-42a2-b164-842b035b2891} - - - {cea4c790-2034-4779-a543-bb578ccb1950} - - - {69675fb8-11fe-4ac9-b434-5fbfde370465} - - - {7adff1e1-d832-49d7-80fe-0c84b92932f4} - - - {d16afff9-2b9b-4afc-9417-fc60165a4820} - - - {27e4e676-acfb-4bdb-a9f5-1efd2d0b1e0e} - - - {15ad7723-f5d6-4b0c-adb8-4d1cf5f47476} - - - {88f53776-2079-4215-babb-230b3d06bd58} - - - {d241990d-d11f-4929-8ffa-a2c060cb18cb} - - - {abf63bab-bd68-407d-87dd-7b49eb167dd1} - - - {cf605dfb-6591-4203-8b65-244a90cf5766} - - - {7ce7dd5c-bf1a-441c-83cd-ff01664514ff} - - - {ddb92b9f-2791-4041-8669-7cbb7db75308} - - - {e96537d4-d193-4b36-8259-0f00191ed830} - - - {3822dfb8-f1d9-483b-8669-692755d5f989} - - - {0d24bd5b-b5b0-408a-816b-2debac7c8161} - - - {d61210ea-a9c7-4f70-9fc4-c78bfa4287d3} - - - {ef783201-716d-4b64-b84d-4f214d2ed377} - - - {13721cc0-4976-4884-8b33-d2929ccad127} - - - {b1219e5a-7cd3-4250-9a9f-48047a814621} - - - {0d0d9117-9915-4251-a7e7-aa65a323166b} - - - {e579e608-e12e-42be-8c49-cc9a9581bedd} - - - {c0302ef2-2ddd-4ab6-859c-f9d838083207} - - - {902f59de-5b3b-4fa9-81fb-400142cf8ce8} - - - {c8bb647e-3992-4e61-8574-c58262745a52} - - - {af0928d0-f150-4d35-bde2-6312ea9d5953} - - - {a9e6090f-3b21-437d-9a93-50f6c3d6bd29} - - - {3d02f5d0-b1b5-4b93-9a47-063ad3f08e61} - - - {18c6c8e3-0b20-4afb-bf19-c4558e3568a9} - - - {0dbde655-aa5c-4dce-9880-3993a89efde5} - - - {fdbf3495-96a6-4254-9f4c-8e420f5c568b} - - - {02e6ad4a-26c8-4ab2-af6c-4a39ee850242} - - - {08fcdce9-22a1-4336-b1b7-abf97d9a541a} - - - {fb3b5c0e-07cb-460f-bbf2-c3836bc22692} - - - {82260cc1-f20d-4647-829a-3f213e88a388} - - - {dbd582a0-df3b-4475-abb5-043be9a79a7c} - - - {41f46e9d-8090-426b-8562-e4d22fd2937b} - - - {1ccf0703-d483-4a72-8abb-f601911839cc} - - - {ea621b2c-cdcf-4710-adb4-90265b48d2ca} - - - {dc06be98-7865-469a-a0c6-f01fe2ebeeb8} - - - {c179291d-1823-4297-9710-6af7123f8a91} - - - {8831307b-6f33-460f-9069-51ee7563995d} - - - {0aab1e27-6341-4b50-8795-404c518d783e} - - - {5cbbf1df-2a1b-47e3-a217-addab713c565} - - - {0f008454-6d63-4c65-9b75-7717a897a428} - - - {fb2c3d90-efdb-434a-a011-3097b35373e4} - - - {8db03882-c794-4ba9-b65e-e5765939e973} - - - {4c9c3a5f-93fa-4852-96a3-c2159bd98556} - - - {52837383-e5d2-4f5e-bd44-eac0b06f79e0} - - - {4a82831e-73af-4f45-9096-d5a82f5f2052} - - - {db8200c1-46f0-4fff-90ca-db388f450539} - - - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - RegularExpression\Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - UUID\Source Files - - - UUID\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - URI\Source Files - - - URI\Source Files - - - URI\Source Files - - - URI\Source Files - - - Tasks\Source Files - - - Tasks\Source Files - - - Tasks\Source Files - - - Events\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Filesystem\Source Files - - - Streams\Source Files - - - Dynamic\Source Files - - - Dynamic\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Streams\zlib - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - RegularExpression\PCRE Header Files - - - RegularExpression\PCRE Header Files - - - RegularExpression\PCRE Header Files - - - RegularExpression\PCRE Header Files - - - RegularExpression\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - UUID\Header Files - - - UUID\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - URI\Header Files - - - URI\Header Files - - - URI\Header Files - - - URI\Header Files - - - Tasks\Header Files - - - Tasks\Header Files - - - Tasks\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Events\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Cache\Header Files - - - Events\Header Files - - - Streams\Header Files - - - Dynamic\Header Files - - - Dynamic\Header Files - - - Dynamic\Header Files - - - Dynamic\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Filesystem\Header Files - - - Text\Header Files - - - - - Logging\Resource Files - - - - - - Logging\Message Files - - + + + + + {eed22eb8-615d-47c6-9148-bf4b06dcba89} + + + {e4b65ef2-2d99-41ac-8fce-ecce748757fe} + + + {15b1d37c-f762-444f-943f-c1886dd9510c} + + + {9e3b59da-7f2c-4e28-8b35-7c3e8abf2ec3} + + + {faa35c18-be02-43c4-8d4d-7e63c97447f0} + + + {642a8ece-5f25-439e-aebc-f0aabc17a24d} + + + {873a6a3d-b159-495f-b307-908be9d0ca39} + + + {243ce5c9-276b-41e0-b226-d2e8c4eb399d} + + + {171bf60e-c5e8-41a6-a8c4-4e5035ac40e4} + + + {897efa40-8fd5-48ea-951f-5025e7bf316d} + + + {5449ee1f-18c8-46f2-ba3b-4851c2bed9be} + + + {ed334c78-ef4a-42a2-b164-842b035b2891} + + + {cea4c790-2034-4779-a543-bb578ccb1950} + + + {69675fb8-11fe-4ac9-b434-5fbfde370465} + + + {7adff1e1-d832-49d7-80fe-0c84b92932f4} + + + {d16afff9-2b9b-4afc-9417-fc60165a4820} + + + {27e4e676-acfb-4bdb-a9f5-1efd2d0b1e0e} + + + {15ad7723-f5d6-4b0c-adb8-4d1cf5f47476} + + + {88f53776-2079-4215-babb-230b3d06bd58} + + + {d241990d-d11f-4929-8ffa-a2c060cb18cb} + + + {abf63bab-bd68-407d-87dd-7b49eb167dd1} + + + {cf605dfb-6591-4203-8b65-244a90cf5766} + + + {7ce7dd5c-bf1a-441c-83cd-ff01664514ff} + + + {ddb92b9f-2791-4041-8669-7cbb7db75308} + + + {e96537d4-d193-4b36-8259-0f00191ed830} + + + {3822dfb8-f1d9-483b-8669-692755d5f989} + + + {0d24bd5b-b5b0-408a-816b-2debac7c8161} + + + {d61210ea-a9c7-4f70-9fc4-c78bfa4287d3} + + + {ef783201-716d-4b64-b84d-4f214d2ed377} + + + {13721cc0-4976-4884-8b33-d2929ccad127} + + + {b1219e5a-7cd3-4250-9a9f-48047a814621} + + + {0d0d9117-9915-4251-a7e7-aa65a323166b} + + + {e579e608-e12e-42be-8c49-cc9a9581bedd} + + + {c0302ef2-2ddd-4ab6-859c-f9d838083207} + + + {902f59de-5b3b-4fa9-81fb-400142cf8ce8} + + + {c8bb647e-3992-4e61-8574-c58262745a52} + + + {af0928d0-f150-4d35-bde2-6312ea9d5953} + + + {a9e6090f-3b21-437d-9a93-50f6c3d6bd29} + + + {3d02f5d0-b1b5-4b93-9a47-063ad3f08e61} + + + {18c6c8e3-0b20-4afb-bf19-c4558e3568a9} + + + {0dbde655-aa5c-4dce-9880-3993a89efde5} + + + {fdbf3495-96a6-4254-9f4c-8e420f5c568b} + + + {02e6ad4a-26c8-4ab2-af6c-4a39ee850242} + + + {08fcdce9-22a1-4336-b1b7-abf97d9a541a} + + + {fb3b5c0e-07cb-460f-bbf2-c3836bc22692} + + + {82260cc1-f20d-4647-829a-3f213e88a388} + + + {dbd582a0-df3b-4475-abb5-043be9a79a7c} + + + {41f46e9d-8090-426b-8562-e4d22fd2937b} + + + {1ccf0703-d483-4a72-8abb-f601911839cc} + + + {ea621b2c-cdcf-4710-adb4-90265b48d2ca} + + + {dc06be98-7865-469a-a0c6-f01fe2ebeeb8} + + + {c179291d-1823-4297-9710-6af7123f8a91} + + + {8831307b-6f33-460f-9069-51ee7563995d} + + + {0aab1e27-6341-4b50-8795-404c518d783e} + + + {5cbbf1df-2a1b-47e3-a217-addab713c565} + + + {0f008454-6d63-4c65-9b75-7717a897a428} + + + {fb2c3d90-efdb-434a-a011-3097b35373e4} + + + {8db03882-c794-4ba9-b65e-e5765939e973} + + + {4c9c3a5f-93fa-4852-96a3-c2159bd98556} + + + {52837383-e5d2-4f5e-bd44-eac0b06f79e0} + + + {4a82831e-73af-4f45-9096-d5a82f5f2052} + + + {db8200c1-46f0-4fff-90ca-db388f450539} + + + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + RegularExpression\Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + RegularExpression\PCRE Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + UUID\Source Files + + + UUID\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + URI\Source Files + + + URI\Source Files + + + URI\Source Files + + + URI\Source Files + + + Tasks\Source Files + + + Tasks\Source Files + + + Tasks\Source Files + + + Events\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Filesystem\Source Files + + + Streams\Source Files + + + Dynamic\Source Files + + + Dynamic\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Streams\zlib + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + RegularExpression\PCRE Header Files + + + RegularExpression\PCRE Header Files + + + RegularExpression\PCRE Header Files + + + RegularExpression\PCRE Header Files + + + RegularExpression\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + UUID\Header Files + + + UUID\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + URI\Header Files + + + URI\Header Files + + + URI\Header Files + + + URI\Header Files + + + Tasks\Header Files + + + Tasks\Header Files + + + Tasks\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Cache\Header Files + + + Events\Header Files + + + Streams\Header Files + + + Dynamic\Header Files + + + Dynamic\Header Files + + + Dynamic\Header Files + + + Dynamic\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Filesystem\Header Files + + + Text\Header Files + + + + + Logging\Resource Files + + + + + + Logging\Message Files + + \ No newline at end of file diff --git a/Foundation/include/Poco/DirectoryWatcher.h b/Foundation/include/Poco/DirectoryWatcher.h index c9880e792..baa4b7e87 100644 --- a/Foundation/include/Poco/DirectoryWatcher.h +++ b/Foundation/include/Poco/DirectoryWatcher.h @@ -1,245 +1,245 @@ -// -// DirectoryWatcher.h -// -// $Id: //poco/1.4/Foundation/include/Poco/DirectoryWatcher.h#2 $ -// -// Library: Foundation -// Package: Filesystem -// Module: DirectoryWatcher -// -// Definition of the DirectoryWatcher class. -// -// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef Foundation_DirectoryWatcher_INCLUDED -#define Foundation_DirectoryWatcher_INCLUDED - - -#include "Poco/Foundation.h" -#include "Poco/File.h" -#include "Poco/BasicEvent.h" -#include "Poco/Runnable.h" -#include "Poco/Thread.h" -#include "Poco/AtomicCounter.h" - - -namespace Poco { - - -class DirectoryWatcherStrategy; - - -class Foundation_API DirectoryWatcher: protected Runnable - /// This class is used to get notifications about changes - /// to the filesystem, more specifically, to a specific - /// directory. Changes to a directory are reported via - /// events. - /// - /// A thread will be created that watches the specified - /// directory for changes. Events are reported in the context - /// of this thread. - /// - /// Note that changes to files in subdirectories of the watched - /// directory are not reported. Separate DirectoryWatcher objects - /// must be created for these directories if they should be watched. - /// - /// Changes to file attributes are not reported. - /// - /// On Windows, this class is implemented using FindFirstChangeNotification()/FindNextChangeNotification(). - /// On Linux, this class is implemented using inotify. - /// On FreeBSD and Darwin (Mac OS X, iOS), this class uses kevent/kqueue. - /// On all other platforms, the watched directory is periodically scanned - /// for changes. This can negatively affect performance if done too often. - /// Therefore, the interval in which scans are done can be specified in - /// the constructor. Note that periodic scanning will also be done on FreeBSD - /// and Darwin if events for changes to files (DW_ITEM_MODIFIED) are enabled. - /// - /// DW_ITEM_MOVED_FROM and DW_ITEM_MOVED_TO events will only be reported - /// on Linux. On other platforms, a file rename or move operation - /// will be reported via a DW_ITEM_REMOVED and a DW_ITEM_ADDED event. - /// The order of these two events is not defined. - /// - /// An event mask can be specified to enable only certain events. -{ -public: - enum DirectoryEventType - { - DW_ITEM_ADDED = 1, - /// A new item has been created and added to the directory. - - DW_ITEM_REMOVED = 2, - /// An item has been removed from the directory. - - DW_ITEM_MODIFIED = 4, - /// An item has been modified. - - DW_ITEM_MOVED_FROM = 8, - /// An item has been renamed or moved. This event delivers the old name. - - DW_ITEM_MOVED_TO = 16, - /// An item has been renamed or moved. This event delivers the new name. - }; - - enum DirectoryEventMask - { - DW_FILTER_ENABLE_ALL = 31, - /// Enables all event types. - - DW_FILTER_DISABLE_ALL = 0 - /// Disables all event types. - }; - - enum - { - DW_DEFAULT_SCAN_INTERVAL = 5 /// Default scan interval for platforms that don't provide a native notification mechanism. - }; - - struct DirectoryEvent - { - DirectoryEvent(const File& f, DirectoryEventType ev): - item(f), - event(ev) - { - } - - const File& item; /// The directory or file that has been changed. - DirectoryEventType event; /// The kind of event. - }; - - BasicEvent itemAdded; - /// Fired when a file or directory has been created or added to the directory. - - BasicEvent itemRemoved; - /// Fired when a file or directory has been removed from the directory. - - BasicEvent itemModified; - /// Fired when a file or directory has been modified. - - BasicEvent itemMovedFrom; - /// Fired when a file or directory has been renamed. This event delivers the old name. - - BasicEvent itemMovedTo; - /// Fired when a file or directory has been moved. This event delivers the new name. - - BasicEvent scanError; - /// Fired when an error occurs while scanning for changes. - - DirectoryWatcher(const std::string& path, int eventMask = DW_FILTER_ENABLE_ALL, int scanInterval = DW_DEFAULT_SCAN_INTERVAL); - /// Creates a DirectoryWatcher for the directory given in path. - /// To enable only specific events, an eventMask can be specified by - /// OR-ing the desired event IDs (e.g., DW_ITEM_ADDED | DW_ITEM_MODIFIED). - /// On platforms where no native filesystem notifications are available, - /// scanInterval specifies the interval in seconds between scans - /// of the directory. - - DirectoryWatcher(const File& directory, int eventMask = DW_FILTER_ENABLE_ALL, int scanInterval = DW_DEFAULT_SCAN_INTERVAL); - /// Creates a DirectoryWatcher for the specified directory - /// To enable only specific events, an eventMask can be specified by - /// OR-ing the desired event IDs (e.g., DW_ITEM_ADDED | DW_ITEM_MODIFIED). - /// On platforms where no native filesystem notifications are available, - /// scanInterval specifies the interval in seconds between scans - /// of the directory. - - ~DirectoryWatcher(); - /// Destroys the DirectoryWatcher. - - void suspendEvents(); - /// Suspends sending of events. Can be called multiple times, but every - /// call to suspendEvent() must be matched by a call to resumeEvents(). - - void resumeEvents(); - /// Resumes events, after they have been suspended with a call to suspendEvents(). - - bool eventsSuspended() const; - /// Returns true iff events are suspended. - - int eventMask() const; - /// Returns the value of the eventMask passed to the constructor. - - int scanInterval() const; - /// Returns the scan interval in seconds. - - const File& directory() const; - /// Returns the directory being watched. - - bool supportsMoveEvents() const; - /// Returns true iff the platform supports DW_ITEM_MOVED_FROM/itemMovedFrom and - /// DW_ITEM_MOVED_TO/itemMovedTo events. - -protected: - void init(); - void stop(); - void run(); - -private: - DirectoryWatcher(); - DirectoryWatcher(const DirectoryWatcher&); - DirectoryWatcher& operator = (const DirectoryWatcher&); - - Thread _thread; - File _directory; - int _eventMask; - AtomicCounter _eventsSuspended; - int _scanInterval; - DirectoryWatcherStrategy* _pStrategy; -}; - - -// -// inlines -// - - -inline bool DirectoryWatcher::eventsSuspended() const -{ - return _eventsSuspended.value() > 0; -} - - -inline int DirectoryWatcher::eventMask() const -{ - return _eventMask; -} - - -inline int DirectoryWatcher::scanInterval() const -{ - return _scanInterval; -} - - -inline const File& DirectoryWatcher::directory() const -{ - return _directory; -} - - -} // namespace Poco - - -#endif // Foundation_DirectoryWatcher_INCLUDED +// +// DirectoryWatcher.h +// +// $Id: //poco/1.4/Foundation/include/Poco/DirectoryWatcher.h#2 $ +// +// Library: Foundation +// Package: Filesystem +// Module: DirectoryWatcher +// +// Definition of the DirectoryWatcher class. +// +// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Foundation_DirectoryWatcher_INCLUDED +#define Foundation_DirectoryWatcher_INCLUDED + + +#include "Poco/Foundation.h" +#include "Poco/File.h" +#include "Poco/BasicEvent.h" +#include "Poco/Runnable.h" +#include "Poco/Thread.h" +#include "Poco/AtomicCounter.h" + + +namespace Poco { + + +class DirectoryWatcherStrategy; + + +class Foundation_API DirectoryWatcher: protected Runnable + /// This class is used to get notifications about changes + /// to the filesystem, more specifically, to a specific + /// directory. Changes to a directory are reported via + /// events. + /// + /// A thread will be created that watches the specified + /// directory for changes. Events are reported in the context + /// of this thread. + /// + /// Note that changes to files in subdirectories of the watched + /// directory are not reported. Separate DirectoryWatcher objects + /// must be created for these directories if they should be watched. + /// + /// Changes to file attributes are not reported. + /// + /// On Windows, this class is implemented using FindFirstChangeNotification()/FindNextChangeNotification(). + /// On Linux, this class is implemented using inotify. + /// On FreeBSD and Darwin (Mac OS X, iOS), this class uses kevent/kqueue. + /// On all other platforms, the watched directory is periodically scanned + /// for changes. This can negatively affect performance if done too often. + /// Therefore, the interval in which scans are done can be specified in + /// the constructor. Note that periodic scanning will also be done on FreeBSD + /// and Darwin if events for changes to files (DW_ITEM_MODIFIED) are enabled. + /// + /// DW_ITEM_MOVED_FROM and DW_ITEM_MOVED_TO events will only be reported + /// on Linux. On other platforms, a file rename or move operation + /// will be reported via a DW_ITEM_REMOVED and a DW_ITEM_ADDED event. + /// The order of these two events is not defined. + /// + /// An event mask can be specified to enable only certain events. +{ +public: + enum DirectoryEventType + { + DW_ITEM_ADDED = 1, + /// A new item has been created and added to the directory. + + DW_ITEM_REMOVED = 2, + /// An item has been removed from the directory. + + DW_ITEM_MODIFIED = 4, + /// An item has been modified. + + DW_ITEM_MOVED_FROM = 8, + /// An item has been renamed or moved. This event delivers the old name. + + DW_ITEM_MOVED_TO = 16, + /// An item has been renamed or moved. This event delivers the new name. + }; + + enum DirectoryEventMask + { + DW_FILTER_ENABLE_ALL = 31, + /// Enables all event types. + + DW_FILTER_DISABLE_ALL = 0 + /// Disables all event types. + }; + + enum + { + DW_DEFAULT_SCAN_INTERVAL = 5 /// Default scan interval for platforms that don't provide a native notification mechanism. + }; + + struct DirectoryEvent + { + DirectoryEvent(const File& f, DirectoryEventType ev): + item(f), + event(ev) + { + } + + const File& item; /// The directory or file that has been changed. + DirectoryEventType event; /// The kind of event. + }; + + BasicEvent itemAdded; + /// Fired when a file or directory has been created or added to the directory. + + BasicEvent itemRemoved; + /// Fired when a file or directory has been removed from the directory. + + BasicEvent itemModified; + /// Fired when a file or directory has been modified. + + BasicEvent itemMovedFrom; + /// Fired when a file or directory has been renamed. This event delivers the old name. + + BasicEvent itemMovedTo; + /// Fired when a file or directory has been moved. This event delivers the new name. + + BasicEvent scanError; + /// Fired when an error occurs while scanning for changes. + + DirectoryWatcher(const std::string& path, int eventMask = DW_FILTER_ENABLE_ALL, int scanInterval = DW_DEFAULT_SCAN_INTERVAL); + /// Creates a DirectoryWatcher for the directory given in path. + /// To enable only specific events, an eventMask can be specified by + /// OR-ing the desired event IDs (e.g., DW_ITEM_ADDED | DW_ITEM_MODIFIED). + /// On platforms where no native filesystem notifications are available, + /// scanInterval specifies the interval in seconds between scans + /// of the directory. + + DirectoryWatcher(const File& directory, int eventMask = DW_FILTER_ENABLE_ALL, int scanInterval = DW_DEFAULT_SCAN_INTERVAL); + /// Creates a DirectoryWatcher for the specified directory + /// To enable only specific events, an eventMask can be specified by + /// OR-ing the desired event IDs (e.g., DW_ITEM_ADDED | DW_ITEM_MODIFIED). + /// On platforms where no native filesystem notifications are available, + /// scanInterval specifies the interval in seconds between scans + /// of the directory. + + ~DirectoryWatcher(); + /// Destroys the DirectoryWatcher. + + void suspendEvents(); + /// Suspends sending of events. Can be called multiple times, but every + /// call to suspendEvent() must be matched by a call to resumeEvents(). + + void resumeEvents(); + /// Resumes events, after they have been suspended with a call to suspendEvents(). + + bool eventsSuspended() const; + /// Returns true iff events are suspended. + + int eventMask() const; + /// Returns the value of the eventMask passed to the constructor. + + int scanInterval() const; + /// Returns the scan interval in seconds. + + const File& directory() const; + /// Returns the directory being watched. + + bool supportsMoveEvents() const; + /// Returns true iff the platform supports DW_ITEM_MOVED_FROM/itemMovedFrom and + /// DW_ITEM_MOVED_TO/itemMovedTo events. + +protected: + void init(); + void stop(); + void run(); + +private: + DirectoryWatcher(); + DirectoryWatcher(const DirectoryWatcher&); + DirectoryWatcher& operator = (const DirectoryWatcher&); + + Thread _thread; + File _directory; + int _eventMask; + AtomicCounter _eventsSuspended; + int _scanInterval; + DirectoryWatcherStrategy* _pStrategy; +}; + + +// +// inlines +// + + +inline bool DirectoryWatcher::eventsSuspended() const +{ + return _eventsSuspended.value() > 0; +} + + +inline int DirectoryWatcher::eventMask() const +{ + return _eventMask; +} + + +inline int DirectoryWatcher::scanInterval() const +{ + return _scanInterval; +} + + +inline const File& DirectoryWatcher::directory() const +{ + return _directory; +} + + +} // namespace Poco + + +#endif // Foundation_DirectoryWatcher_INCLUDED diff --git a/Foundation/include/Poco/Dynamic/Pair.h b/Foundation/include/Poco/Dynamic/Pair.h index b3fa54688..a119bdaae 100644 --- a/Foundation/include/Poco/Dynamic/Pair.h +++ b/Foundation/include/Poco/Dynamic/Pair.h @@ -89,11 +89,16 @@ public: { } - Pair& swap(Pair& other) - /// Swaps the content of the two Pairs. - { - std::swap(_data, other._data); - return *this; + Pair& swap(Pair& other) + + /// Swaps the content of the two Pairs. + + { + + std::swap(_data, other._data); + + return *this; + } Pair& operator = (const Pair& other) diff --git a/Foundation/include/Poco/FIFOBufferStream.h b/Foundation/include/Poco/FIFOBufferStream.h index 80ad359ca..f36d9c3bf 100644 --- a/Foundation/include/Poco/FIFOBufferStream.h +++ b/Foundation/include/Poco/FIFOBufferStream.h @@ -1,176 +1,176 @@ -// -// FIFOBufferStream.h -// -// $Id: //poco/1.4/Foundation/include/Poco/FIFOBufferStream.h#1 $ -// -// Library: Foundation -// Package: Streams -// Module: FIFOBufferStream -// -// Definition of the FIFOBufferStream class. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef Foundation_FIFOBufferStream_INCLUDED -#define Foundation_FIFOBufferStream_INCLUDED - - -#include "Poco/Foundation.h" -#include "Poco/FIFOBuffer.h" -#include "Poco/BufferedBidirectionalStreamBuf.h" -#include -#include - - -namespace Poco { - - -class Foundation_API FIFOBufferStreamBuf: public BufferedBidirectionalStreamBuf - /// This is the streambuf class used for reading from and writing to a FIFOBuffer. - /// FIFOBuffer is enabled for emtpy/non-empty/full state transitions notifications. -{ -public: - - FIFOBufferStreamBuf(); - /// Creates a FIFOBufferStreamBuf. - - explicit FIFOBufferStreamBuf(FIFOBuffer& fifoBuffer); - /// Creates a FIFOBufferStreamBuf and assigns the given buffer to it. - - explicit FIFOBufferStreamBuf(char* pBuffer, std::size_t length); - /// Creates a FIFOBufferStreamBuf and assigns the given buffer to it. - - explicit FIFOBufferStreamBuf(const char* pBuffer, std::size_t length); - /// Creates a FIFOBufferStreamBuf and assigns the given buffer to it. - - explicit FIFOBufferStreamBuf(std::size_t length); - /// Creates a FIFOBufferStreamBuf of the given length. - - ~FIFOBufferStreamBuf(); - /// Destroys the FIFOBufferStreamBuf. - - FIFOBuffer& fifoBuffer(); - /// Returns the underlying FIFO buffer reference. - -protected: - int readFromDevice(char* buffer, std::streamsize length); - int writeToDevice(const char* buffer, std::streamsize length); - -private: - enum - { - STREAM_BUFFER_SIZE = 1024 - }; - - FIFOBuffer* _pFIFOBuffer; - FIFOBuffer& _fifoBuffer; -}; - - -class Foundation_API FIFOIOS: public virtual std::ios - /// The base class for FIFOBufferInputStream and - /// FIFOBufferStream. - /// - /// This class is needed to ensure the correct initialization - /// order of the stream buffer and base classes. -{ -public: - explicit FIFOIOS(FIFOBuffer& buffer); - /// Creates a FIFOIOS and assigns the given buffer to it. - - explicit FIFOIOS(char* pBuffer, std::size_t length); - /// Creates a FIFOIOS and assigns the given buffer to it. - - explicit FIFOIOS(const char* pBuffer, std::size_t length); - /// Creates a FIFOIOS and assigns the given buffer to it. - - explicit FIFOIOS(std::size_t length); - /// Creates a FIFOIOS of the given length. - - ~FIFOIOS(); - /// Destroys the FIFOIOS. - /// - /// Flushes the buffer. - - FIFOBufferStreamBuf* rdbuf(); - /// Returns a pointer to the internal FIFOBufferStreamBuf. - - void close(); - /// Flushes the stream. - -protected: - FIFOBufferStreamBuf _buf; -}; - - -class Foundation_API FIFOBufferStream: public FIFOIOS, public std::iostream - /// An output stream for writing to a FIFO. -{ -public: - Poco::BasicEvent& readable; - Poco::BasicEvent& writable; - - explicit FIFOBufferStream(FIFOBuffer& buffer); - /// Creates the FIFOBufferStream with supplied buffer as initial value. - - explicit FIFOBufferStream(char* pBuffer, std::size_t length); - /// Creates a FIFOBufferStream and assigns the given buffer to it. - - explicit FIFOBufferStream(const char* pBuffer, std::size_t length); - /// Creates a FIFOBufferStream and assigns the given buffer to it. - - explicit FIFOBufferStream(std::size_t length); - /// Creates a FIFOBufferStream of the given length. - - ~FIFOBufferStream(); - /// Destroys the FIFOBufferStream. - /// - /// Flushes the buffer. - -private: - FIFOBufferStream(); - FIFOBufferStream(const FIFOBufferStream& other); - FIFOBufferStream& operator =(const FIFOBufferStream& other); -}; - - -/// -/// inlines -/// - - -inline FIFOBuffer& FIFOBufferStreamBuf::fifoBuffer() -{ - return _fifoBuffer; -} - - -} // namespace Poco - - -#endif // Foundation_FIFOBufferStream_INCLUDED +// +// FIFOBufferStream.h +// +// $Id: //poco/1.4/Foundation/include/Poco/FIFOBufferStream.h#1 $ +// +// Library: Foundation +// Package: Streams +// Module: FIFOBufferStream +// +// Definition of the FIFOBufferStream class. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Foundation_FIFOBufferStream_INCLUDED +#define Foundation_FIFOBufferStream_INCLUDED + + +#include "Poco/Foundation.h" +#include "Poco/FIFOBuffer.h" +#include "Poco/BufferedBidirectionalStreamBuf.h" +#include +#include + + +namespace Poco { + + +class Foundation_API FIFOBufferStreamBuf: public BufferedBidirectionalStreamBuf + /// This is the streambuf class used for reading from and writing to a FIFOBuffer. + /// FIFOBuffer is enabled for emtpy/non-empty/full state transitions notifications. +{ +public: + + FIFOBufferStreamBuf(); + /// Creates a FIFOBufferStreamBuf. + + explicit FIFOBufferStreamBuf(FIFOBuffer& fifoBuffer); + /// Creates a FIFOBufferStreamBuf and assigns the given buffer to it. + + explicit FIFOBufferStreamBuf(char* pBuffer, std::size_t length); + /// Creates a FIFOBufferStreamBuf and assigns the given buffer to it. + + explicit FIFOBufferStreamBuf(const char* pBuffer, std::size_t length); + /// Creates a FIFOBufferStreamBuf and assigns the given buffer to it. + + explicit FIFOBufferStreamBuf(std::size_t length); + /// Creates a FIFOBufferStreamBuf of the given length. + + ~FIFOBufferStreamBuf(); + /// Destroys the FIFOBufferStreamBuf. + + FIFOBuffer& fifoBuffer(); + /// Returns the underlying FIFO buffer reference. + +protected: + int readFromDevice(char* buffer, std::streamsize length); + int writeToDevice(const char* buffer, std::streamsize length); + +private: + enum + { + STREAM_BUFFER_SIZE = 1024 + }; + + FIFOBuffer* _pFIFOBuffer; + FIFOBuffer& _fifoBuffer; +}; + + +class Foundation_API FIFOIOS: public virtual std::ios + /// The base class for FIFOBufferInputStream and + /// FIFOBufferStream. + /// + /// This class is needed to ensure the correct initialization + /// order of the stream buffer and base classes. +{ +public: + explicit FIFOIOS(FIFOBuffer& buffer); + /// Creates a FIFOIOS and assigns the given buffer to it. + + explicit FIFOIOS(char* pBuffer, std::size_t length); + /// Creates a FIFOIOS and assigns the given buffer to it. + + explicit FIFOIOS(const char* pBuffer, std::size_t length); + /// Creates a FIFOIOS and assigns the given buffer to it. + + explicit FIFOIOS(std::size_t length); + /// Creates a FIFOIOS of the given length. + + ~FIFOIOS(); + /// Destroys the FIFOIOS. + /// + /// Flushes the buffer. + + FIFOBufferStreamBuf* rdbuf(); + /// Returns a pointer to the internal FIFOBufferStreamBuf. + + void close(); + /// Flushes the stream. + +protected: + FIFOBufferStreamBuf _buf; +}; + + +class Foundation_API FIFOBufferStream: public FIFOIOS, public std::iostream + /// An output stream for writing to a FIFO. +{ +public: + Poco::BasicEvent& readable; + Poco::BasicEvent& writable; + + explicit FIFOBufferStream(FIFOBuffer& buffer); + /// Creates the FIFOBufferStream with supplied buffer as initial value. + + explicit FIFOBufferStream(char* pBuffer, std::size_t length); + /// Creates a FIFOBufferStream and assigns the given buffer to it. + + explicit FIFOBufferStream(const char* pBuffer, std::size_t length); + /// Creates a FIFOBufferStream and assigns the given buffer to it. + + explicit FIFOBufferStream(std::size_t length); + /// Creates a FIFOBufferStream of the given length. + + ~FIFOBufferStream(); + /// Destroys the FIFOBufferStream. + /// + /// Flushes the buffer. + +private: + FIFOBufferStream(); + FIFOBufferStream(const FIFOBufferStream& other); + FIFOBufferStream& operator =(const FIFOBufferStream& other); +}; + + +/// +/// inlines +/// + + +inline FIFOBuffer& FIFOBufferStreamBuf::fifoBuffer() +{ + return _fifoBuffer; +} + + +} // namespace Poco + + +#endif // Foundation_FIFOBufferStream_INCLUDED diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h index 9729a9813..dac2f87e6 100644 --- a/Foundation/include/Poco/NumericString.h +++ b/Foundation/include/Poco/NumericString.h @@ -1,363 +1,363 @@ -// -// NumericString.h -// -// $Id: //poco/1.4/Foundation/include/Poco/NumericString.h#1 $ -// -// Library: Foundation -// Package: Core -// Module: NumericString -// -// Numeric string utility functions. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef Foundation_NumericString_INCLUDED -#define Foundation_NumericString_INCLUDED - - -#include "Poco/Foundation.h" -#include "Poco/FPEnvironment.h" -#ifdef min - #undef min -#endif -#ifdef max - #undef max -#endif -#include -#include -#if !defined(POCO_NO_LOCALE) -#include -#endif - - -namespace Poco { - - -inline char decimalSeparator() - /// Returns decimal separator from global locale or - /// default '.' for platforms where locale is unavailable. -{ -#if !defined(POCO_NO_LOCALE) - return std::use_facet >(std::locale()).decimal_point(); -#else - return '.'; -#endif -} - - -inline char thousandSeparator() - /// Returns thousand separator from global locale or - /// default ',' for platforms where locale is unavailable. -{ -#if !defined(POCO_NO_LOCALE) - return std::use_facet >(std::locale()).thousands_sep(); -#else - return ','; -#endif -} - - -template -bool strToInt(const char* pStr, I& result, short base, char thSep = ',') - /// Converts zero-terminated character array to integer number; - /// Thousand separators are recognized for base10 and current locale; - /// it is silently skipped but not verified for correct positioning. - /// Function returns true if succesful. If parsing was unsuccesful, - /// the return value is false with the result value undetermined. -{ - if (!pStr) return false; - while (isspace(*pStr)) ++pStr; - if (*pStr == '\0') return false; - char sign = 1; - if ((base == 10) && (*pStr == '-')) - { - sign = -1; - ++pStr; - } - else if (*pStr == '+') ++pStr; - - // parser states: - const char STATE_SIGNIFICANT_DIGITS = 1; - char state = 0; - - result = 0; - I limitCheck = std::numeric_limits::max() / base; - for (; *pStr != '\0'; ++pStr) - { - switch (*pStr) - { - case 'x': case 'X': - if (base != 0x10) return false; - - case '0': - if (state < STATE_SIGNIFICANT_DIGITS) break; - - case '1': case '2': case '3': case '4': - case '5': case '6': case '7': - if (state < STATE_SIGNIFICANT_DIGITS) state = STATE_SIGNIFICANT_DIGITS; - if (result > limitCheck) return false; - result = result * base + (*pStr - '0'); - - break; - - case '8': case '9': - if ((base == 10) || (base == 0x10)) - { - if (state < STATE_SIGNIFICANT_DIGITS) state = STATE_SIGNIFICANT_DIGITS; - if (result > limitCheck) return false; - result = result * base + (*pStr - '0'); - } - else return false; - - break; - - case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': - if (base != 0x10) return false; - if (state < STATE_SIGNIFICANT_DIGITS) state = STATE_SIGNIFICANT_DIGITS; - if (result > limitCheck) return false; - result = result * base + (10 + *pStr - 'a'); - - break; - - case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': - if (base != 0x10) return false; - - if (state < STATE_SIGNIFICANT_DIGITS) state = STATE_SIGNIFICANT_DIGITS; - if (result > limitCheck) return false; - result = result * base + (10 + *pStr - 'A'); - - break; - - case 'U': - case 'u': - case 'L': - case 'l': - goto done; - - case '.': - if ((base == 10) && (thSep == '.')) break; - else return false; - - case ',': - if ((base == 10) && (thSep == ',')) break; - else return false; - - case ' ': - if ((base == 10) && (thSep == ' ')) break; - case '\t': - case '\n': - case '\v': - case '\f': - case '\r': - goto done; - - default: - return false; - } - } - -done: - if ((sign < 0) && (base == 10)) result *= sign; - - return true; -} - - -template -bool strToInt(const std::string& str, I& result, short base, char thSep = ',') - /// Converts string to integer number; - /// This is a wrapper function, for details see see the - /// bool strToInt(const char*, I&, short, char) implementation. -{ - return strToInt(str.c_str(), result, base, thSep); -} - - -namespace Impl { - -static char DUMMY_EXP_UNDERFLOW = 0; // dummy default val - -} - -template -bool strToFloat (const char* pStr, F& result, char& eu = Impl::DUMMY_EXP_UNDERFLOW, char decSep = '.', char thSep = ',') - /// Converts zero-terminated array to floating-point number; - /// Returns true if succesful. Exponent underflow (i.e. loss of precision) - /// is signalled in eu. Thousand separators are recognized for the locale - /// and silently skipped but not verified for correct positioning. - /// - /// If parsing was unsuccesful, the return value is false with - /// result and eu values undetermined. -{ - poco_assert (decSep != thSep); - - if (pStr == 0 || *pStr == '\0') return false; - - // parser states: - const char STATE_LEADING_SPACES = 0; - const char STATE_DIGITS_BEFORE_DEC_POINT = 1; - const char STATE_DIGITS_AFTER_DEC_POINT = 2; - const char STATE_EXP_CHAR = 3; - const char STATE_EXP_DIGITS = 4; - const char STATE_SUFFIX = 5; // 'f' suffix - - char numSign = 1, expSign = 1; - char state = STATE_LEADING_SPACES; - F mantissa = 0.0, exponent = 0.0; - F pow10 = 1.; - result = 0.0; - eu = 0; - for (; *pStr != '\0'; ++pStr) - { - switch (*pStr) - { - case '.': - if (decSep == '.') - { - if (state >= STATE_DIGITS_AFTER_DEC_POINT) return false; - state = STATE_DIGITS_AFTER_DEC_POINT; - break; - } - else if ((thSep == '.') && (state == STATE_DIGITS_BEFORE_DEC_POINT)) - break; - else - return false; - - case ',': - if (decSep == ',') - { - if (state >= STATE_DIGITS_AFTER_DEC_POINT) return false; - state = STATE_DIGITS_AFTER_DEC_POINT; - break; - } - else if ((thSep == ',') && (state == STATE_DIGITS_BEFORE_DEC_POINT)) - break; - else - return false; - - case ' ': // space (SPC) - if ((thSep == ' ') && (state == STATE_DIGITS_BEFORE_DEC_POINT)) break; - case '\t': // horizontal tab (TAB) - case '\n': // line feed (LF) - case '\v': // vertical tab (VT) - case '\f': // form feed (FF) - case '\r': // carriage return (CR) - if ((state >= STATE_DIGITS_AFTER_DEC_POINT) || (state >= STATE_EXP_DIGITS)) - break; - else if ((state > STATE_LEADING_SPACES) && (state < STATE_DIGITS_AFTER_DEC_POINT)) - return false; - break; - - case '-': - if (state == STATE_LEADING_SPACES) - numSign = -1; - else if (state == STATE_EXP_CHAR) // exponential char - expSign = -1; - else return false; - case '+': - break; - - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (state >= STATE_SUFFIX) return false; // constant suffix - if (state <= STATE_DIGITS_BEFORE_DEC_POINT) // integral part digits - { - result = result * 10 + (*pStr - '0'); - state = STATE_DIGITS_BEFORE_DEC_POINT; - } - else if (state <= STATE_DIGITS_AFTER_DEC_POINT) // fractional part digits - { - mantissa += (*pStr - '0') / (pow10 *= 10.); - state = STATE_DIGITS_AFTER_DEC_POINT; - } - else if (state <= STATE_EXP_DIGITS) // exponent digits - { - exponent = exponent * 10 + (*pStr - '0'); - state = STATE_EXP_DIGITS; - } - else return false; - break; - - case 'E': - case 'e': - if (state > STATE_DIGITS_AFTER_DEC_POINT) return false; - state = STATE_EXP_CHAR; - break; - - case 'F': - case 'f': - state = STATE_SUFFIX; - break; - - default: - return false; - } - } - - if (exponent > std::numeric_limits::max_exponent10) - { - eu = expSign; - exponent = std::numeric_limits::max_exponent10; - } - - result += mantissa; - if (numSign != 1) result *= numSign; - if (exponent > 1.0) - { - F scale = std::pow(10., exponent); - result = (expSign < 0) ? (result / scale) : (result * scale); - } - - return (state != STATE_LEADING_SPACES) && // empty/zero-length string - !FPEnvironment::isInfinite(result) && - !FPEnvironment::isNaN(result); -} - - -template -bool strToFloat (const std::string& s, F& result, char& eu = Impl::DUMMY_EXP_UNDERFLOW, char decSep = '.', char thSep = ',') - /// Converts string to floating-point number; - /// This is a wrapper function, for details see see the - /// bool strToFloat(const char*, F&, char&, char, char) implementation. -{ - return strToFloat(s.c_str(), result, eu, decSep, thSep); -} - - -} // namespace Poco - - -#endif // Foundation_NumericString_INCLUDED +// +// NumericString.h +// +// $Id: //poco/1.4/Foundation/include/Poco/NumericString.h#1 $ +// +// Library: Foundation +// Package: Core +// Module: NumericString +// +// Numeric string utility functions. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Foundation_NumericString_INCLUDED +#define Foundation_NumericString_INCLUDED + + +#include "Poco/Foundation.h" +#include "Poco/FPEnvironment.h" +#ifdef min + #undef min +#endif +#ifdef max + #undef max +#endif +#include +#include +#if !defined(POCO_NO_LOCALE) +#include +#endif + + +namespace Poco { + + +inline char decimalSeparator() + /// Returns decimal separator from global locale or + /// default '.' for platforms where locale is unavailable. +{ +#if !defined(POCO_NO_LOCALE) + return std::use_facet >(std::locale()).decimal_point(); +#else + return '.'; +#endif +} + + +inline char thousandSeparator() + /// Returns thousand separator from global locale or + /// default ',' for platforms where locale is unavailable. +{ +#if !defined(POCO_NO_LOCALE) + return std::use_facet >(std::locale()).thousands_sep(); +#else + return ','; +#endif +} + + +template +bool strToInt(const char* pStr, I& result, short base, char thSep = ',') + /// Converts zero-terminated character array to integer number; + /// Thousand separators are recognized for base10 and current locale; + /// it is silently skipped but not verified for correct positioning. + /// Function returns true if succesful. If parsing was unsuccesful, + /// the return value is false with the result value undetermined. +{ + if (!pStr) return false; + while (isspace(*pStr)) ++pStr; + if (*pStr == '\0') return false; + char sign = 1; + if ((base == 10) && (*pStr == '-')) + { + sign = -1; + ++pStr; + } + else if (*pStr == '+') ++pStr; + + // parser states: + const char STATE_SIGNIFICANT_DIGITS = 1; + char state = 0; + + result = 0; + I limitCheck = std::numeric_limits::max() / base; + for (; *pStr != '\0'; ++pStr) + { + switch (*pStr) + { + case 'x': case 'X': + if (base != 0x10) return false; + + case '0': + if (state < STATE_SIGNIFICANT_DIGITS) break; + + case '1': case '2': case '3': case '4': + case '5': case '6': case '7': + if (state < STATE_SIGNIFICANT_DIGITS) state = STATE_SIGNIFICANT_DIGITS; + if (result > limitCheck) return false; + result = result * base + (*pStr - '0'); + + break; + + case '8': case '9': + if ((base == 10) || (base == 0x10)) + { + if (state < STATE_SIGNIFICANT_DIGITS) state = STATE_SIGNIFICANT_DIGITS; + if (result > limitCheck) return false; + result = result * base + (*pStr - '0'); + } + else return false; + + break; + + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': + if (base != 0x10) return false; + if (state < STATE_SIGNIFICANT_DIGITS) state = STATE_SIGNIFICANT_DIGITS; + if (result > limitCheck) return false; + result = result * base + (10 + *pStr - 'a'); + + break; + + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + if (base != 0x10) return false; + + if (state < STATE_SIGNIFICANT_DIGITS) state = STATE_SIGNIFICANT_DIGITS; + if (result > limitCheck) return false; + result = result * base + (10 + *pStr - 'A'); + + break; + + case 'U': + case 'u': + case 'L': + case 'l': + goto done; + + case '.': + if ((base == 10) && (thSep == '.')) break; + else return false; + + case ',': + if ((base == 10) && (thSep == ',')) break; + else return false; + + case ' ': + if ((base == 10) && (thSep == ' ')) break; + case '\t': + case '\n': + case '\v': + case '\f': + case '\r': + goto done; + + default: + return false; + } + } + +done: + if ((sign < 0) && (base == 10)) result *= sign; + + return true; +} + + +template +bool strToInt(const std::string& str, I& result, short base, char thSep = ',') + /// Converts string to integer number; + /// This is a wrapper function, for details see see the + /// bool strToInt(const char*, I&, short, char) implementation. +{ + return strToInt(str.c_str(), result, base, thSep); +} + + +namespace Impl { + +static char DUMMY_EXP_UNDERFLOW = 0; // dummy default val + +} + +template +bool strToFloat (const char* pStr, F& result, char& eu = Impl::DUMMY_EXP_UNDERFLOW, char decSep = '.', char thSep = ',') + /// Converts zero-terminated array to floating-point number; + /// Returns true if succesful. Exponent underflow (i.e. loss of precision) + /// is signalled in eu. Thousand separators are recognized for the locale + /// and silently skipped but not verified for correct positioning. + /// + /// If parsing was unsuccesful, the return value is false with + /// result and eu values undetermined. +{ + poco_assert (decSep != thSep); + + if (pStr == 0 || *pStr == '\0') return false; + + // parser states: + const char STATE_LEADING_SPACES = 0; + const char STATE_DIGITS_BEFORE_DEC_POINT = 1; + const char STATE_DIGITS_AFTER_DEC_POINT = 2; + const char STATE_EXP_CHAR = 3; + const char STATE_EXP_DIGITS = 4; + const char STATE_SUFFIX = 5; // 'f' suffix + + char numSign = 1, expSign = 1; + char state = STATE_LEADING_SPACES; + F mantissa = 0.0, exponent = 0.0; + F pow10 = 1.; + result = 0.0; + eu = 0; + for (; *pStr != '\0'; ++pStr) + { + switch (*pStr) + { + case '.': + if (decSep == '.') + { + if (state >= STATE_DIGITS_AFTER_DEC_POINT) return false; + state = STATE_DIGITS_AFTER_DEC_POINT; + break; + } + else if ((thSep == '.') && (state == STATE_DIGITS_BEFORE_DEC_POINT)) + break; + else + return false; + + case ',': + if (decSep == ',') + { + if (state >= STATE_DIGITS_AFTER_DEC_POINT) return false; + state = STATE_DIGITS_AFTER_DEC_POINT; + break; + } + else if ((thSep == ',') && (state == STATE_DIGITS_BEFORE_DEC_POINT)) + break; + else + return false; + + case ' ': // space (SPC) + if ((thSep == ' ') && (state == STATE_DIGITS_BEFORE_DEC_POINT)) break; + case '\t': // horizontal tab (TAB) + case '\n': // line feed (LF) + case '\v': // vertical tab (VT) + case '\f': // form feed (FF) + case '\r': // carriage return (CR) + if ((state >= STATE_DIGITS_AFTER_DEC_POINT) || (state >= STATE_EXP_DIGITS)) + break; + else if ((state > STATE_LEADING_SPACES) && (state < STATE_DIGITS_AFTER_DEC_POINT)) + return false; + break; + + case '-': + if (state == STATE_LEADING_SPACES) + numSign = -1; + else if (state == STATE_EXP_CHAR) // exponential char + expSign = -1; + else return false; + case '+': + break; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (state >= STATE_SUFFIX) return false; // constant suffix + if (state <= STATE_DIGITS_BEFORE_DEC_POINT) // integral part digits + { + result = result * 10 + (*pStr - '0'); + state = STATE_DIGITS_BEFORE_DEC_POINT; + } + else if (state <= STATE_DIGITS_AFTER_DEC_POINT) // fractional part digits + { + mantissa += (*pStr - '0') / (pow10 *= 10.); + state = STATE_DIGITS_AFTER_DEC_POINT; + } + else if (state <= STATE_EXP_DIGITS) // exponent digits + { + exponent = exponent * 10 + (*pStr - '0'); + state = STATE_EXP_DIGITS; + } + else return false; + break; + + case 'E': + case 'e': + if (state > STATE_DIGITS_AFTER_DEC_POINT) return false; + state = STATE_EXP_CHAR; + break; + + case 'F': + case 'f': + state = STATE_SUFFIX; + break; + + default: + return false; + } + } + + if (exponent > std::numeric_limits::max_exponent10) + { + eu = expSign; + exponent = std::numeric_limits::max_exponent10; + } + + result += mantissa; + if (numSign != 1) result *= numSign; + if (exponent > 1.0) + { + F scale = std::pow(10., exponent); + result = (expSign < 0) ? (result / scale) : (result * scale); + } + + return (state != STATE_LEADING_SPACES) && // empty/zero-length string + !FPEnvironment::isInfinite(result) && + !FPEnvironment::isNaN(result); +} + + +template +bool strToFloat (const std::string& s, F& result, char& eu = Impl::DUMMY_EXP_UNDERFLOW, char decSep = '.', char thSep = ',') + /// Converts string to floating-point number; + /// This is a wrapper function, for details see see the + /// bool strToFloat(const char*, F&, char&, char, char) implementation. +{ + return strToFloat(s.c_str(), result, eu, decSep, thSep); +} + + +} // namespace Poco + + +#endif // Foundation_NumericString_INCLUDED diff --git a/Foundation/include/Poco/UTFString.h b/Foundation/include/Poco/UTFString.h index e11f48969..2b61b4dd0 100644 --- a/Foundation/include/Poco/UTFString.h +++ b/Foundation/include/Poco/UTFString.h @@ -1,93 +1,94 @@ -// -// Types.h -// -// $Id: //poco/1.4/Foundation/include/Poco/UTFString.h#2 $ -// -// Library: Foundation -// Package: Text -// Module: UTFString -// -// Definitions of strings for UTF encodings. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef Foundation_UTFString_INCLUDED -#define Foundation_UTFString_INCLUDED - - -#include "Poco/Foundation.h" -#include - - -namespace Poco { - - -// UTF string types - -//#if defined(POCO_ENABLE_CPP11) //TODO - // typedef char16_t UTF16Char; - // typedef std::u16string UTF16String; - // typedef char32_t UTF32Char; - // typedef std::u32string UTF32String; -//#else - #ifdef POCO_NO_WSTRING - typedef Poco::UInt16 UTF16Char; - typedef std::basic_string UTF16String; - typedef UInt32 UTF32Char; - typedef std::basic_string UTF32String; - #else // POCO_NO_WSTRING - #if defined(POCO_OS_FAMILY_WINDOWS) - typedef wchar_t UTF16Char; - typedef std::wstring UTF16String; - typedef UInt32 UTF32Char; - typedef std::basic_string UTF32String; - #elif defined(__SIZEOF_WCHAR_T__) //gcc - #if (__SIZEOF_WCHAR_T__ == 2) - typedef wchar_t UTF16Char; - typedef std::wstring UTF16String; - typedef UInt32 UTF32Char; - typedef std::basic_string UTF32String; - #elif (__SIZEOF_WCHAR_T__ == 4) - typedef Poco::UInt16 UTF16Char; - typedef std::basic_string UTF16String; - typedef wchar_t UTF32Char; - typedef std::wstring UTF32String; - #endif - #else // default to 32-bit wchar_t - typedef Poco::UInt16 UTF16Char; - typedef std::basic_string UTF16String; - typedef wchar_t UTF32Char; - typedef std::wstring UTF32String; - #endif //POCO_OS_FAMILY_WINDOWS - #endif //POCO_NO_WSTRING -//#endif // POCO_ENABLE_CPP11 - -} // namespace Poco - - -#endif // Foundation_UTFString_INCLUDED +// +// Types.h +// +// $Id: //poco/1.4/Foundation/include/Poco/UTFString.h#2 $ +// +// Library: Foundation +// Package: Text +// Module: UTFString +// +// Definitions of strings for UTF encodings. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Foundation_UTFString_INCLUDED +#define Foundation_UTFString_INCLUDED + + +#include "Poco/Foundation.h" +#include + + +namespace Poco { + + +// UTF string types + +//#if defined(POCO_ENABLE_CPP11) //TODO + // typedef char16_t UTF16Char; + // typedef std::u16string UTF16String; + // typedef char32_t UTF32Char; + // typedef std::u32string UTF32String; +//#else + #ifdef POCO_NO_WSTRING + typedef Poco::UInt16 UTF16Char; + typedef std::basic_string UTF16String; + typedef UInt32 UTF32Char; + typedef std::basic_string UTF32String; + #else // POCO_NO_WSTRING + #if defined(POCO_OS_FAMILY_WINDOWS) + typedef wchar_t UTF16Char; + typedef std::wstring UTF16String; + typedef UInt32 UTF32Char; + typedef std::basic_string UTF32String; + #elif defined(__SIZEOF_WCHAR_T__) //gcc + #if (__SIZEOF_WCHAR_T__ == 2) + typedef wchar_t UTF16Char; + typedef std::wstring UTF16String; + typedef UInt32 UTF32Char; + typedef std::basic_string UTF32String; + #elif (__SIZEOF_WCHAR_T__ == 4) + typedef Poco::UInt16 UTF16Char; + typedef std::basic_string UTF16String; + typedef wchar_t UTF32Char; + typedef std::wstring UTF32String; + #endif + #else // default to 32-bit wchar_t + typedef Poco::UInt16 UTF16Char; + typedef std::basic_string UTF16String; + typedef wchar_t UTF32Char; + typedef std::wstring UTF32String; + #endif //POCO_OS_FAMILY_WINDOWS + #endif //POCO_NO_WSTRING +//#endif // POCO_ENABLE_CPP11 + + +} // namespace Poco + + +#endif // Foundation_UTFString_INCLUDED diff --git a/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj b/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj index 24b774fa9..2a216edb6 100644 --- a/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj +++ b/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - ActiveMethod - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F} - ActiveMethod - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - ActiveMethodd - ActiveMethodd - ActiveMethodd - ActiveMethod - ActiveMethod - ActiveMethod - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\ActiveMethodd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\ActiveMethodd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\ActiveMethod.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\ActiveMethodd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\ActiveMethodd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\ActiveMethod.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\ActiveMethodd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\ActiveMethodd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\ActiveMethod.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + ActiveMethod + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F} + ActiveMethod + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + ActiveMethodd + ActiveMethodd + ActiveMethodd + ActiveMethod + ActiveMethod + ActiveMethod + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\ActiveMethodd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\ActiveMethodd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\ActiveMethod.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\ActiveMethodd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\ActiveMethodd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\ActiveMethod.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\ActiveMethodd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\ActiveMethodd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\ActiveMethod.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj.filters b/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj.filters index f8deb3f4f..e1549f940 100644 --- a/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj.filters +++ b/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {c902a85a-f127-4d0f-ac2f-8f55fcec4d8b} - - - {27fb7ad6-093a-406c-8712-db94ec9a246f} - - - - - Source Files - - + + + + + {c902a85a-f127-4d0f-ac2f-8f55fcec4d8b} + + + {27fb7ad6-093a-406c-8712-db94ec9a246f} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj b/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj index 732fb8226..118f8170e 100644 --- a/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj +++ b/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - ActiveMethod - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F} - ActiveMethod - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - ActiveMethodd - ActiveMethodd - ActiveMethodd - ActiveMethod - ActiveMethod - ActiveMethod - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\ActiveMethodd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\ActiveMethodd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\ActiveMethod.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\ActiveMethodd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\ActiveMethodd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\ActiveMethod.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\ActiveMethodd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\ActiveMethodd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\ActiveMethod.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + ActiveMethod + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F} + ActiveMethod + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + ActiveMethodd + ActiveMethodd + ActiveMethodd + ActiveMethod + ActiveMethod + ActiveMethod + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\ActiveMethodd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\ActiveMethodd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\ActiveMethod.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\ActiveMethodd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\ActiveMethodd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\ActiveMethod.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\ActiveMethodd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\ActiveMethodd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\ActiveMethod.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj.filters b/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj.filters index ddc6d7c41..d019cbf40 100644 --- a/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj.filters +++ b/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {ff630302-74af-4565-b9e2-3a5acdf034d8} - - - {e8800c7d-04d9-45eb-b9b1-9ec52cf4b6e8} - - - - - Source Files - - + + + + + {ff630302-74af-4565-b9e2-3a5acdf034d8} + + + {e8800c7d-04d9-45eb-b9b1-9ec52cf4b6e8} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/Activity/Activity_vs110.vcxproj b/Foundation/samples/Activity/Activity_vs110.vcxproj index ae7648969..49eb8d195 100644 --- a/Foundation/samples/Activity/Activity_vs110.vcxproj +++ b/Foundation/samples/Activity/Activity_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Activity - {479B938E-57EA-3332-AFD3-E7285DE4EB28} - Activity - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Activityd - Activityd - Activityd - Activity - Activity - Activity - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Activityd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Activityd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Activity.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Activityd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Activityd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Activity.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Activityd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Activityd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Activity.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Activity + {479B938E-57EA-3332-AFD3-E7285DE4EB28} + Activity + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Activityd + Activityd + Activityd + Activity + Activity + Activity + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Activityd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Activityd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Activity.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Activityd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Activityd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Activity.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Activityd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Activityd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Activity.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/Activity/Activity_vs110.vcxproj.filters b/Foundation/samples/Activity/Activity_vs110.vcxproj.filters index dc9ecc69d..725fc679c 100644 --- a/Foundation/samples/Activity/Activity_vs110.vcxproj.filters +++ b/Foundation/samples/Activity/Activity_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {19ace6d0-0d43-4474-a4af-3db3f56f29c5} - - - {6d30d137-5086-4a59-8f44-34f50b11ab15} - - - - - Source Files - - + + + + + {19ace6d0-0d43-4474-a4af-3db3f56f29c5} + + + {6d30d137-5086-4a59-8f44-34f50b11ab15} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/Activity/Activity_x64_vs110.vcxproj b/Foundation/samples/Activity/Activity_x64_vs110.vcxproj index 8d92e9137..5ac5110fd 100644 --- a/Foundation/samples/Activity/Activity_x64_vs110.vcxproj +++ b/Foundation/samples/Activity/Activity_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Activity - {479B938E-57EA-3332-AFD3-E7285DE4EB28} - Activity - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Activityd - Activityd - Activityd - Activity - Activity - Activity - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Activityd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Activityd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Activity.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Activityd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Activityd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Activity.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Activityd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Activityd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Activity.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Activity + {479B938E-57EA-3332-AFD3-E7285DE4EB28} + Activity + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Activityd + Activityd + Activityd + Activity + Activity + Activity + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Activityd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Activityd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Activity.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Activityd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Activityd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Activity.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Activityd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Activityd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Activity.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/Activity/Activity_x64_vs110.vcxproj.filters b/Foundation/samples/Activity/Activity_x64_vs110.vcxproj.filters index df2849e59..ae37bf18e 100644 --- a/Foundation/samples/Activity/Activity_x64_vs110.vcxproj.filters +++ b/Foundation/samples/Activity/Activity_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {fb5e20f9-7186-4a2b-9bd3-83cd379c88ae} - - - {98a0a7cd-f69f-4ec6-aeca-e8fbe1dde55f} - - - - - Source Files - - + + + + + {fb5e20f9-7186-4a2b-9bd3-83cd379c88ae} + + + {98a0a7cd-f69f-4ec6-aeca-e8fbe1dde55f} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj index 0976847ac..6fd118e7b 100644 --- a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj +++ b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - BinaryReaderWriter - {A5639B95-211B-36F1-994E-F05361C18EBF} - BinaryReaderWriter - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - BinaryReaderWriterd - BinaryReaderWriterd - BinaryReaderWriterd - BinaryReaderWriter - BinaryReaderWriter - BinaryReaderWriter - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\BinaryReaderWriterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\BinaryReaderWriterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\BinaryReaderWriter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\BinaryReaderWriterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\BinaryReaderWriterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\BinaryReaderWriter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\BinaryReaderWriterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\BinaryReaderWriterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\BinaryReaderWriter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + BinaryReaderWriter + {A5639B95-211B-36F1-994E-F05361C18EBF} + BinaryReaderWriter + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + BinaryReaderWriterd + BinaryReaderWriterd + BinaryReaderWriterd + BinaryReaderWriter + BinaryReaderWriter + BinaryReaderWriter + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\BinaryReaderWriterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\BinaryReaderWriterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\BinaryReaderWriter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\BinaryReaderWriterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\BinaryReaderWriterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\BinaryReaderWriter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\BinaryReaderWriterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\BinaryReaderWriterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\BinaryReaderWriter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj.filters b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj.filters index 74776a7e1..163627863 100644 --- a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj.filters +++ b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {b2132eb3-6313-4ef6-93d6-ae2a3c64edc2} - - - {46fa54a5-42c5-4eee-b470-a1bea25b3de0} - - - - - Source Files - - + + + + + {b2132eb3-6313-4ef6-93d6-ae2a3c64edc2} + + + {46fa54a5-42c5-4eee-b470-a1bea25b3de0} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj index 6f0e52546..1633dd9f3 100644 --- a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj +++ b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - BinaryReaderWriter - {A5639B95-211B-36F1-994E-F05361C18EBF} - BinaryReaderWriter - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - BinaryReaderWriterd - BinaryReaderWriterd - BinaryReaderWriterd - BinaryReaderWriter - BinaryReaderWriter - BinaryReaderWriter - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\BinaryReaderWriterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\BinaryReaderWriterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\BinaryReaderWriter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\BinaryReaderWriterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\BinaryReaderWriterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\BinaryReaderWriter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\BinaryReaderWriterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\BinaryReaderWriterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\BinaryReaderWriter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + BinaryReaderWriter + {A5639B95-211B-36F1-994E-F05361C18EBF} + BinaryReaderWriter + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + BinaryReaderWriterd + BinaryReaderWriterd + BinaryReaderWriterd + BinaryReaderWriter + BinaryReaderWriter + BinaryReaderWriter + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\BinaryReaderWriterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\BinaryReaderWriterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\BinaryReaderWriter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\BinaryReaderWriterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\BinaryReaderWriterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\BinaryReaderWriter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\BinaryReaderWriterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\BinaryReaderWriterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\BinaryReaderWriter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj.filters b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj.filters index 1c0076c8c..907ac1e58 100644 --- a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj.filters +++ b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {19bad183-12e9-47fb-b2ed-5a5ce4fa41b9} - - - {97c35ad3-23e9-4ef8-b797-780c2b083a2f} - - - - - Source Files - - + + + + + {19bad183-12e9-47fb-b2ed-5a5ce4fa41b9} + + + {97c35ad3-23e9-4ef8-b797-780c2b083a2f} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/DateTime/DateTime_vs110.vcxproj b/Foundation/samples/DateTime/DateTime_vs110.vcxproj index 2854c1f35..9940bab0d 100644 --- a/Foundation/samples/DateTime/DateTime_vs110.vcxproj +++ b/Foundation/samples/DateTime/DateTime_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - DateTime - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF} - DateTime - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - DateTimed - DateTimed - DateTimed - DateTime - DateTime - DateTime - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\DateTimed.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\DateTimed.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\DateTime.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\DateTimed.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\DateTimed.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\DateTime.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\DateTimed.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\DateTimed.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\DateTime.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + DateTime + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF} + DateTime + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + DateTimed + DateTimed + DateTimed + DateTime + DateTime + DateTime + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\DateTimed.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\DateTimed.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\DateTime.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\DateTimed.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\DateTimed.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\DateTime.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\DateTimed.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\DateTimed.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\DateTime.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/DateTime/DateTime_vs110.vcxproj.filters b/Foundation/samples/DateTime/DateTime_vs110.vcxproj.filters index de0777516..675287be2 100644 --- a/Foundation/samples/DateTime/DateTime_vs110.vcxproj.filters +++ b/Foundation/samples/DateTime/DateTime_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {24664851-7a98-4a4f-8ce3-c4130920c39a} - - - {9cdca097-8087-4104-891a-efb776ccd106} - - - - - Source Files - - + + + + + {24664851-7a98-4a4f-8ce3-c4130920c39a} + + + {9cdca097-8087-4104-891a-efb776ccd106} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj b/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj index 1ce31136b..acc0000bc 100644 --- a/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj +++ b/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - DateTime - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF} - DateTime - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - DateTimed - DateTimed - DateTimed - DateTime - DateTime - DateTime - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\DateTimed.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\DateTimed.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\DateTime.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\DateTimed.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\DateTimed.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\DateTime.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\DateTimed.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\DateTimed.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\DateTime.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + DateTime + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF} + DateTime + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + DateTimed + DateTimed + DateTimed + DateTime + DateTime + DateTime + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\DateTimed.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\DateTimed.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\DateTime.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\DateTimed.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\DateTimed.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\DateTime.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\DateTimed.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\DateTimed.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\DateTime.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj.filters b/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj.filters index 66ed3d69a..82e90bafa 100644 --- a/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj.filters +++ b/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {47dcd178-2cdd-457e-b633-83d3b56fd211} - - - {75918116-f4dc-4d2f-a8a0-096112f62511} - - - - - Source Files - - + + + + + {47dcd178-2cdd-457e-b633-83d3b56fd211} + + + {75918116-f4dc-4d2f-a8a0-096112f62511} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj b/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj index 3cb21aaf1..e844dfad4 100644 --- a/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj +++ b/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - LogRotation - {0382A4E1-4461-391B-A8D6-A35251CD7464} - LogRotation - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - LogRotationd - LogRotationd - LogRotationd - LogRotation - LogRotation - LogRotation - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\LogRotationd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\LogRotationd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\LogRotation.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\LogRotationd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\LogRotationd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\LogRotation.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\LogRotationd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\LogRotationd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\LogRotation.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + LogRotation + {0382A4E1-4461-391B-A8D6-A35251CD7464} + LogRotation + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + LogRotationd + LogRotationd + LogRotationd + LogRotation + LogRotation + LogRotation + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\LogRotationd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\LogRotationd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\LogRotation.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\LogRotationd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\LogRotationd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\LogRotation.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\LogRotationd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\LogRotationd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\LogRotation.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj.filters b/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj.filters index 516364ef1..420362633 100644 --- a/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj.filters +++ b/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {111d99c6-8d8c-4326-a4f6-f7c64402349f} - - - {b6856cac-fee9-49da-a368-9822a9ce1c35} - - - - - Source Files - - + + + + + {111d99c6-8d8c-4326-a4f6-f7c64402349f} + + + {b6856cac-fee9-49da-a368-9822a9ce1c35} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj b/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj index 50e4f2242..5ddfd5513 100644 --- a/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj +++ b/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - LogRotation - {0382A4E1-4461-391B-A8D6-A35251CD7464} - LogRotation - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - LogRotationd - LogRotationd - LogRotationd - LogRotation - LogRotation - LogRotation - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\LogRotationd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\LogRotationd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\LogRotation.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\LogRotationd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\LogRotationd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\LogRotation.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\LogRotationd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\LogRotationd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\LogRotation.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + LogRotation + {0382A4E1-4461-391B-A8D6-A35251CD7464} + LogRotation + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + LogRotationd + LogRotationd + LogRotationd + LogRotation + LogRotation + LogRotation + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\LogRotationd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\LogRotationd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\LogRotation.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\LogRotationd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\LogRotationd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\LogRotation.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\LogRotationd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\LogRotationd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\LogRotation.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj.filters b/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj.filters index 8aecf3a0a..1e756d6a5 100644 --- a/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj.filters +++ b/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {cd22bc28-7b73-4ee4-88ed-a5ec2da22bce} - - - {47d04652-d17f-4e86-a04a-5a58ba76c207} - - - - - Source Files - - + + + + + {cd22bc28-7b73-4ee4-88ed-a5ec2da22bce} + + + {47d04652-d17f-4e86-a04a-5a58ba76c207} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/Logger/Logger_vs110.vcxproj b/Foundation/samples/Logger/Logger_vs110.vcxproj index c7628c77a..e03f9d3a6 100644 --- a/Foundation/samples/Logger/Logger_vs110.vcxproj +++ b/Foundation/samples/Logger/Logger_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Logger - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59} - Logger - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Loggerd - Loggerd - Loggerd - Logger - Logger - Logger - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Loggerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Loggerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Logger.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Loggerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Loggerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Logger.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Loggerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Loggerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Logger.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Logger + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59} + Logger + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Loggerd + Loggerd + Loggerd + Logger + Logger + Logger + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Loggerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Loggerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Logger.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Loggerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Loggerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Logger.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Loggerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Loggerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Logger.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/Logger/Logger_vs110.vcxproj.filters b/Foundation/samples/Logger/Logger_vs110.vcxproj.filters index 35046d55d..bb748c14d 100644 --- a/Foundation/samples/Logger/Logger_vs110.vcxproj.filters +++ b/Foundation/samples/Logger/Logger_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {f8095aee-5754-4440-ac04-0893984771ac} - - - {834269be-9c2b-4f25-b61d-f179e1022803} - - - - - Source Files - - + + + + + {f8095aee-5754-4440-ac04-0893984771ac} + + + {834269be-9c2b-4f25-b61d-f179e1022803} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/Logger/Logger_x64_vs110.vcxproj b/Foundation/samples/Logger/Logger_x64_vs110.vcxproj index 7eebfa478..c7a5de5dd 100644 --- a/Foundation/samples/Logger/Logger_x64_vs110.vcxproj +++ b/Foundation/samples/Logger/Logger_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Logger - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59} - Logger - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Loggerd - Loggerd - Loggerd - Logger - Logger - Logger - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Loggerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Loggerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Logger.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Loggerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Loggerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Logger.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Loggerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Loggerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Logger.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Logger + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59} + Logger + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Loggerd + Loggerd + Loggerd + Logger + Logger + Logger + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Loggerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Loggerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Logger.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Loggerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Loggerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Logger.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Loggerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Loggerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Logger.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/Logger/Logger_x64_vs110.vcxproj.filters b/Foundation/samples/Logger/Logger_x64_vs110.vcxproj.filters index dd433d3e4..d39c05e80 100644 --- a/Foundation/samples/Logger/Logger_x64_vs110.vcxproj.filters +++ b/Foundation/samples/Logger/Logger_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {7b8f278f-8e90-443f-b1b3-11bd551b0961} - - - {aa998d7f-760f-4888-b906-a086e1c93d1f} - - - - - Source Files - - + + + + + {7b8f278f-8e90-443f-b1b3-11bd551b0961} + + + {aa998d7f-760f-4888-b906-a086e1c93d1f} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj b/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj index f25821f22..ed35e0a7e 100644 --- a/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj +++ b/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - NotificationQueue - {4238E8B1-08D7-3469-8896-2A643B585A2D} - NotificationQueue - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - NotificationQueued - NotificationQueued - NotificationQueued - NotificationQueue - NotificationQueue - NotificationQueue - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\NotificationQueued.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\NotificationQueued.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\NotificationQueue.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\NotificationQueued.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\NotificationQueued.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\NotificationQueue.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\NotificationQueued.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\NotificationQueued.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\NotificationQueue.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + NotificationQueue + {4238E8B1-08D7-3469-8896-2A643B585A2D} + NotificationQueue + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + NotificationQueued + NotificationQueued + NotificationQueued + NotificationQueue + NotificationQueue + NotificationQueue + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\NotificationQueued.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\NotificationQueued.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\NotificationQueue.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\NotificationQueued.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\NotificationQueued.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\NotificationQueue.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\NotificationQueued.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\NotificationQueued.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\NotificationQueue.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj.filters b/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj.filters index 3ef825b79..b5369857a 100644 --- a/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj.filters +++ b/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {578c0be1-8a5a-43b7-8036-e0d539e45f18} - - - {24dcd269-216e-4db2-b3a4-d723788766bf} - - - - - Source Files - - + + + + + {578c0be1-8a5a-43b7-8036-e0d539e45f18} + + + {24dcd269-216e-4db2-b3a4-d723788766bf} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj b/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj index fb7295d01..d29b8bd7e 100644 --- a/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj +++ b/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - NotificationQueue - {4238E8B1-08D7-3469-8896-2A643B585A2D} - NotificationQueue - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - NotificationQueued - NotificationQueued - NotificationQueued - NotificationQueue - NotificationQueue - NotificationQueue - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\NotificationQueued.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\NotificationQueued.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\NotificationQueue.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\NotificationQueued.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\NotificationQueued.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\NotificationQueue.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\NotificationQueued.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\NotificationQueued.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\NotificationQueue.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + NotificationQueue + {4238E8B1-08D7-3469-8896-2A643B585A2D} + NotificationQueue + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + NotificationQueued + NotificationQueued + NotificationQueued + NotificationQueue + NotificationQueue + NotificationQueue + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\NotificationQueued.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\NotificationQueued.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\NotificationQueue.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\NotificationQueued.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\NotificationQueued.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\NotificationQueue.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\NotificationQueued.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\NotificationQueued.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\NotificationQueue.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj.filters b/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj.filters index f1cd1090e..8eb4c2045 100644 --- a/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj.filters +++ b/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {16aaecf7-7f84-49b8-ac95-d28b7cf450ca} - - - {723a3ed8-65ee-4cf6-a5ab-7fda562caa21} - - - - - Source Files - - + + + + + {16aaecf7-7f84-49b8-ac95-d28b7cf450ca} + + + {723a3ed8-65ee-4cf6-a5ab-7fda562caa21} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj b/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj index 38531701a..c1b60d747 100644 --- a/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj +++ b/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - StringTokenizer - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE} - StringTokenizer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - StringTokenizerd - StringTokenizerd - StringTokenizerd - StringTokenizer - StringTokenizer - StringTokenizer - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\StringTokenizerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\StringTokenizerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\StringTokenizer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\StringTokenizerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\StringTokenizerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\StringTokenizer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\StringTokenizerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\StringTokenizerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\StringTokenizer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + StringTokenizer + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE} + StringTokenizer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + StringTokenizerd + StringTokenizerd + StringTokenizerd + StringTokenizer + StringTokenizer + StringTokenizer + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\StringTokenizerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\StringTokenizerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\StringTokenizer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\StringTokenizerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\StringTokenizerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\StringTokenizer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\StringTokenizerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\StringTokenizerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\StringTokenizer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj.filters b/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj.filters index dc46a1e83..0f1db949a 100644 --- a/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj.filters +++ b/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {872c24e4-2d84-4c0d-99f1-963364f9eb96} - - - {8ca8b5ea-de3b-4188-bb01-929bcb2f0e35} - - - - - Source Files - - + + + + + {872c24e4-2d84-4c0d-99f1-963364f9eb96} + + + {8ca8b5ea-de3b-4188-bb01-929bcb2f0e35} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj b/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj index 6079f052a..81d34d0d4 100644 --- a/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj +++ b/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - StringTokenizer - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE} - StringTokenizer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - StringTokenizerd - StringTokenizerd - StringTokenizerd - StringTokenizer - StringTokenizer - StringTokenizer - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\StringTokenizerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\StringTokenizerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\StringTokenizer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\StringTokenizerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\StringTokenizerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\StringTokenizer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\StringTokenizerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\StringTokenizerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\StringTokenizer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + StringTokenizer + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE} + StringTokenizer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + StringTokenizerd + StringTokenizerd + StringTokenizerd + StringTokenizer + StringTokenizer + StringTokenizer + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\StringTokenizerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\StringTokenizerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\StringTokenizer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\StringTokenizerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\StringTokenizerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\StringTokenizer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\StringTokenizerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\StringTokenizerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\StringTokenizer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj.filters b/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj.filters index c0f55575d..30d4a488d 100644 --- a/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj.filters +++ b/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {8ed696f7-36ad-49d8-8b28-e23b75e75199} - - - {05902943-d794-44f0-a006-b8384376017d} - - - - - Source Files - - + + + + + {8ed696f7-36ad-49d8-8b28-e23b75e75199} + + + {05902943-d794-44f0-a006-b8384376017d} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/Timer/Timer_vs110.vcxproj b/Foundation/samples/Timer/Timer_vs110.vcxproj index 6ddda2806..63a72763f 100644 --- a/Foundation/samples/Timer/Timer_vs110.vcxproj +++ b/Foundation/samples/Timer/Timer_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Timer - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B} - Timer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Timerd - Timerd - Timerd - Timer - Timer - Timer - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Timerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Timerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Timer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Timerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Timerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Timer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Timerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Timerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Timer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Timer + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B} + Timer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Timerd + Timerd + Timerd + Timer + Timer + Timer + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Timerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Timerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Timer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Timerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Timerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Timer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Timerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Timerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Timer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/Timer/Timer_vs110.vcxproj.filters b/Foundation/samples/Timer/Timer_vs110.vcxproj.filters index b4a8c57b6..377bc027c 100644 --- a/Foundation/samples/Timer/Timer_vs110.vcxproj.filters +++ b/Foundation/samples/Timer/Timer_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {22bc7c13-f7cb-4dab-aa8c-33b4a14cf738} - - - {f5b0f8e0-cdae-4e2e-9694-4b9e349d14b7} - - - - - Source Files - - + + + + + {22bc7c13-f7cb-4dab-aa8c-33b4a14cf738} + + + {f5b0f8e0-cdae-4e2e-9694-4b9e349d14b7} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/Timer/Timer_x64_vs110.vcxproj b/Foundation/samples/Timer/Timer_x64_vs110.vcxproj index 962720e28..e4248f54a 100644 --- a/Foundation/samples/Timer/Timer_x64_vs110.vcxproj +++ b/Foundation/samples/Timer/Timer_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Timer - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B} - Timer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Timerd - Timerd - Timerd - Timer - Timer - Timer - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Timerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Timerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Timer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Timerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Timerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Timer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Timerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Timerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Timer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Timer + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B} + Timer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Timerd + Timerd + Timerd + Timer + Timer + Timer + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Timerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Timerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Timer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Timerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Timerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Timer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Timerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Timerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Timer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/Timer/Timer_x64_vs110.vcxproj.filters b/Foundation/samples/Timer/Timer_x64_vs110.vcxproj.filters index fcb840860..e150f1d8f 100644 --- a/Foundation/samples/Timer/Timer_x64_vs110.vcxproj.filters +++ b/Foundation/samples/Timer/Timer_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {9eb6404c-0cf8-43af-b39e-44e02097cbce} - - - {db8afee4-f082-41e8-9bff-98db6c9e87d8} - - - - - Source Files - - + + + + + {9eb6404c-0cf8-43af-b39e-44e02097cbce} + + + {db8afee4-f082-41e8-9bff-98db6c9e87d8} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/URI/URI_vs110.vcxproj b/Foundation/samples/URI/URI_vs110.vcxproj index 6d80a21af..62afff31c 100644 --- a/Foundation/samples/URI/URI_vs110.vcxproj +++ b/Foundation/samples/URI/URI_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - URI - {7D649DAD-3849-3E23-9BB4-802AC60E4E98} - URI - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - URId - URId - URId - URI - URI - URI - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\URId.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\URId.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\URI.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\URId.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\URId.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\URI.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\URId.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\URId.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\URI.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + URI + {7D649DAD-3849-3E23-9BB4-802AC60E4E98} + URI + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + URId + URId + URId + URI + URI + URI + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\URId.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\URId.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\URI.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\URId.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\URId.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\URI.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\URId.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\URId.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\URI.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/URI/URI_vs110.vcxproj.filters b/Foundation/samples/URI/URI_vs110.vcxproj.filters index 08c430ff6..dfe662d5b 100644 --- a/Foundation/samples/URI/URI_vs110.vcxproj.filters +++ b/Foundation/samples/URI/URI_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {2c990979-20d2-43da-ad84-ccc59bf25baf} - - - {735cbf23-e1a1-48f4-ac7d-2aa168e57f70} - - - - - Source Files - - + + + + + {2c990979-20d2-43da-ad84-ccc59bf25baf} + + + {735cbf23-e1a1-48f4-ac7d-2aa168e57f70} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/URI/URI_x64_vs110.vcxproj b/Foundation/samples/URI/URI_x64_vs110.vcxproj index 1cc0560fc..4ddb395d2 100644 --- a/Foundation/samples/URI/URI_x64_vs110.vcxproj +++ b/Foundation/samples/URI/URI_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - URI - {7D649DAD-3849-3E23-9BB4-802AC60E4E98} - URI - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - URId - URId - URId - URI - URI - URI - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\URId.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\URId.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\URI.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\URId.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\URId.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\URI.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\URId.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\URId.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\URI.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + URI + {7D649DAD-3849-3E23-9BB4-802AC60E4E98} + URI + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + URId + URId + URId + URI + URI + URI + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\URId.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\URId.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\URI.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\URId.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\URId.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\URI.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\URId.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\URId.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\URI.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/URI/URI_x64_vs110.vcxproj.filters b/Foundation/samples/URI/URI_x64_vs110.vcxproj.filters index ccc4ef768..54b87b6d1 100644 --- a/Foundation/samples/URI/URI_x64_vs110.vcxproj.filters +++ b/Foundation/samples/URI/URI_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {af9ef064-1328-42fd-8548-51bbfb20b3e6} - - - {d8b00ff9-93c6-4133-9831-a40dd118936d} - - - - - Source Files - - + + + + + {af9ef064-1328-42fd-8548-51bbfb20b3e6} + + + {d8b00ff9-93c6-4133-9831-a40dd118936d} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/base64decode/base64decode_vs110.vcxproj b/Foundation/samples/base64decode/base64decode_vs110.vcxproj index 40944a9a1..9815c4806 100644 --- a/Foundation/samples/base64decode/base64decode_vs110.vcxproj +++ b/Foundation/samples/base64decode/base64decode_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - base64decode - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8} - base64decode - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - base64decoded - base64decoded - base64decoded - base64decode - base64decode - base64decode - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\base64decoded.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\base64decoded.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\base64decode.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\base64decoded.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\base64decoded.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\base64decode.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\base64decoded.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\base64decoded.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\base64decode.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + base64decode + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8} + base64decode + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + base64decoded + base64decoded + base64decoded + base64decode + base64decode + base64decode + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\base64decoded.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\base64decoded.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\base64decode.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\base64decoded.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\base64decoded.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\base64decode.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\base64decoded.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\base64decoded.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\base64decode.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/base64decode/base64decode_vs110.vcxproj.filters b/Foundation/samples/base64decode/base64decode_vs110.vcxproj.filters index 1b3d8fb0f..b41f85d42 100644 --- a/Foundation/samples/base64decode/base64decode_vs110.vcxproj.filters +++ b/Foundation/samples/base64decode/base64decode_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {87e362c0-5369-48d1-85df-1861d23f294b} - - - {a09fb005-e2f8-4186-812a-3d4477433b58} - - - - - Source Files - - + + + + + {87e362c0-5369-48d1-85df-1861d23f294b} + + + {a09fb005-e2f8-4186-812a-3d4477433b58} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj b/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj index 3f317535d..20befbfcc 100644 --- a/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj +++ b/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - base64decode - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8} - base64decode - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - base64decoded - base64decoded - base64decoded - base64decode - base64decode - base64decode - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\base64decoded.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\base64decoded.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\base64decode.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\base64decoded.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\base64decoded.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\base64decode.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\base64decoded.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\base64decoded.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\base64decode.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + base64decode + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8} + base64decode + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + base64decoded + base64decoded + base64decoded + base64decode + base64decode + base64decode + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\base64decoded.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\base64decoded.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\base64decode.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\base64decoded.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\base64decoded.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\base64decode.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\base64decoded.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\base64decoded.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\base64decode.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj.filters b/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj.filters index c18a41ccd..c84e12f1d 100644 --- a/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj.filters +++ b/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {98beda37-cde7-4199-8f38-79102d0f1ab9} - - - {06affaa7-68aa-49ef-8fbc-578f18355c9f} - - - - - Source Files - - + + + + + {98beda37-cde7-4199-8f38-79102d0f1ab9} + + + {06affaa7-68aa-49ef-8fbc-578f18355c9f} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/base64encode/base64encode_vs110.vcxproj b/Foundation/samples/base64encode/base64encode_vs110.vcxproj index 0d46237d7..788cfc45c 100644 --- a/Foundation/samples/base64encode/base64encode_vs110.vcxproj +++ b/Foundation/samples/base64encode/base64encode_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - base64encode - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0} - base64encode - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - base64encoded - base64encoded - base64encoded - base64encode - base64encode - base64encode - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\base64encoded.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\base64encoded.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\base64encode.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\base64encoded.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\base64encoded.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\base64encode.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\base64encoded.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\base64encoded.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\base64encode.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + base64encode + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0} + base64encode + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + base64encoded + base64encoded + base64encoded + base64encode + base64encode + base64encode + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\base64encoded.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\base64encoded.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\base64encode.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\base64encoded.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\base64encoded.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\base64encode.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\base64encoded.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\base64encoded.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\base64encode.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/base64encode/base64encode_vs110.vcxproj.filters b/Foundation/samples/base64encode/base64encode_vs110.vcxproj.filters index 1b8c38b59..e236102ec 100644 --- a/Foundation/samples/base64encode/base64encode_vs110.vcxproj.filters +++ b/Foundation/samples/base64encode/base64encode_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {a9f360ca-e778-47dd-a4fb-ad367e0d4420} - - - {29a6d1ff-f44b-4dee-be3e-64b42b7bc9a2} - - - - - Source Files - - + + + + + {a9f360ca-e778-47dd-a4fb-ad367e0d4420} + + + {29a6d1ff-f44b-4dee-be3e-64b42b7bc9a2} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj b/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj index 103770bb6..856655288 100644 --- a/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj +++ b/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - base64encode - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0} - base64encode - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - base64encoded - base64encoded - base64encoded - base64encode - base64encode - base64encode - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\base64encoded.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\base64encoded.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\base64encode.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\base64encoded.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\base64encoded.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\base64encode.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\base64encoded.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\base64encoded.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\base64encode.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + base64encode + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0} + base64encode + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + base64encoded + base64encoded + base64encoded + base64encode + base64encode + base64encode + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\base64encoded.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\base64encoded.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\base64encode.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\base64encoded.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\base64encoded.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\base64encode.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\base64encoded.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\base64encoded.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\base64encode.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj.filters b/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj.filters index 75dea544e..5d95122c0 100644 --- a/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj.filters +++ b/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {ee2edf11-0ed9-4c58-8e02-27ae4b183d30} - - - {a607ccbc-1cd9-4cc9-b83d-54d37f09f904} - - - - - Source Files - - + + + + + {ee2edf11-0ed9-4c58-8e02-27ae4b183d30} + + + {a607ccbc-1cd9-4cc9-b83d-54d37f09f904} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/deflate/deflate_vs110.vcxproj b/Foundation/samples/deflate/deflate_vs110.vcxproj index 65d91c3d5..93d1e04bc 100644 --- a/Foundation/samples/deflate/deflate_vs110.vcxproj +++ b/Foundation/samples/deflate/deflate_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - deflate - {6D323430-D9E1-3173-A087-7A6E084B63CD} - deflate - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - deflated - deflated - deflated - deflate - deflate - deflate - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\deflated.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\deflated.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\deflate.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\deflated.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\deflated.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\deflate.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\deflated.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\deflated.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\deflate.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + deflate + {6D323430-D9E1-3173-A087-7A6E084B63CD} + deflate + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + deflated + deflated + deflated + deflate + deflate + deflate + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\deflated.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\deflated.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\deflate.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\deflated.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\deflated.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\deflate.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\deflated.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\deflated.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\deflate.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/deflate/deflate_vs110.vcxproj.filters b/Foundation/samples/deflate/deflate_vs110.vcxproj.filters index 8d92f730c..d6ea2e423 100644 --- a/Foundation/samples/deflate/deflate_vs110.vcxproj.filters +++ b/Foundation/samples/deflate/deflate_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {b671ae0c-85a2-460d-bc28-c0e00f92c459} - - - {5491d7fc-67d8-4991-b0cc-34b388a2157b} - - - - - Source Files - - + + + + + {b671ae0c-85a2-460d-bc28-c0e00f92c459} + + + {5491d7fc-67d8-4991-b0cc-34b388a2157b} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/deflate/deflate_x64_vs110.vcxproj b/Foundation/samples/deflate/deflate_x64_vs110.vcxproj index 1c43f6287..9d7ee83d9 100644 --- a/Foundation/samples/deflate/deflate_x64_vs110.vcxproj +++ b/Foundation/samples/deflate/deflate_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - deflate - {6D323430-D9E1-3173-A087-7A6E084B63CD} - deflate - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - deflated - deflated - deflated - deflate - deflate - deflate - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\deflated.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\deflated.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\deflate.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\deflated.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\deflated.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\deflate.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\deflated.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\deflated.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\deflate.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + deflate + {6D323430-D9E1-3173-A087-7A6E084B63CD} + deflate + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + deflated + deflated + deflated + deflate + deflate + deflate + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\deflated.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\deflated.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\deflate.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\deflated.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\deflated.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\deflate.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\deflated.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\deflated.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\deflate.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/deflate/deflate_x64_vs110.vcxproj.filters b/Foundation/samples/deflate/deflate_x64_vs110.vcxproj.filters index 42ec70cd9..8f1bfe8f3 100644 --- a/Foundation/samples/deflate/deflate_x64_vs110.vcxproj.filters +++ b/Foundation/samples/deflate/deflate_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {c0109da4-503a-4ab3-93fe-863df27f5b94} - - - {57cb2fe2-35e2-4217-a4a4-d439b938ac59} - - - - - Source Files - - + + + + + {c0109da4-503a-4ab3-93fe-863df27f5b94} + + + {57cb2fe2-35e2-4217-a4a4-d439b938ac59} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/dir/dir_vs110.vcxproj b/Foundation/samples/dir/dir_vs110.vcxproj index 58177de29..7628d3cbf 100644 --- a/Foundation/samples/dir/dir_vs110.vcxproj +++ b/Foundation/samples/dir/dir_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - dir - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A} - dir - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - dird - dird - dird - dir - dir - dir - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\dird.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\dird.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\dir.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\dird.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\dird.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\dir.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\dird.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\dird.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\dir.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + dir + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A} + dir + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + dird + dird + dird + dir + dir + dir + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\dird.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\dird.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\dir.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\dird.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\dird.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\dir.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\dird.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\dird.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\dir.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/dir/dir_vs110.vcxproj.filters b/Foundation/samples/dir/dir_vs110.vcxproj.filters index 8d442777f..11fd746af 100644 --- a/Foundation/samples/dir/dir_vs110.vcxproj.filters +++ b/Foundation/samples/dir/dir_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {32c2c2ce-66fd-4756-bb43-ad17871e2e59} - - - {8a239fdd-ccc2-4510-aa78-80c969410431} - - - - - Source Files - - + + + + + {32c2c2ce-66fd-4756-bb43-ad17871e2e59} + + + {8a239fdd-ccc2-4510-aa78-80c969410431} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/dir/dir_x64_vs110.vcxproj b/Foundation/samples/dir/dir_x64_vs110.vcxproj index 6a7bc2b50..d1260bc4e 100644 --- a/Foundation/samples/dir/dir_x64_vs110.vcxproj +++ b/Foundation/samples/dir/dir_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - dir - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A} - dir - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - dird - dird - dird - dir - dir - dir - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\dird.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\dird.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\dir.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\dird.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\dird.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\dir.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\dird.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\dird.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\dir.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + dir + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A} + dir + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + dird + dird + dird + dir + dir + dir + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\dird.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\dird.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\dir.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\dird.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\dird.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\dir.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\dird.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\dird.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\dir.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/dir/dir_x64_vs110.vcxproj.filters b/Foundation/samples/dir/dir_x64_vs110.vcxproj.filters index 1c7c0107f..cb07b4db7 100644 --- a/Foundation/samples/dir/dir_x64_vs110.vcxproj.filters +++ b/Foundation/samples/dir/dir_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {0f9afb97-81c2-40d6-ae32-1f370e1998a6} - - - {47707546-a667-4662-ae59-b5dcbf41f179} - - - - - Source Files - - + + + + + {0f9afb97-81c2-40d6-ae32-1f370e1998a6} + + + {47707546-a667-4662-ae59-b5dcbf41f179} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/grep/grep_vs110.vcxproj b/Foundation/samples/grep/grep_vs110.vcxproj index 2d2011cc3..7b86412e9 100644 --- a/Foundation/samples/grep/grep_vs110.vcxproj +++ b/Foundation/samples/grep/grep_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - grep - {C743C479-4D47-37FE-A2EB-59CDD7A627FE} - grep - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - grepd - grepd - grepd - grep - grep - grep - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\grepd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\grepd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\grep.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\grepd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\grepd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\grep.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\grepd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\grepd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\grep.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + grep + {C743C479-4D47-37FE-A2EB-59CDD7A627FE} + grep + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + grepd + grepd + grepd + grep + grep + grep + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\grepd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\grepd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\grep.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\grepd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\grepd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\grep.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\grepd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\grepd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\grep.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/grep/grep_vs110.vcxproj.filters b/Foundation/samples/grep/grep_vs110.vcxproj.filters index 1a657cd9c..29ba4fda6 100644 --- a/Foundation/samples/grep/grep_vs110.vcxproj.filters +++ b/Foundation/samples/grep/grep_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {5ade1455-b2ad-4c75-b103-ca68281181a4} - - - {4ce4c08e-b7d3-41a2-9d7f-65633b088bb4} - - - - - Source Files - - + + + + + {5ade1455-b2ad-4c75-b103-ca68281181a4} + + + {4ce4c08e-b7d3-41a2-9d7f-65633b088bb4} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/grep/grep_x64_vs110.vcxproj b/Foundation/samples/grep/grep_x64_vs110.vcxproj index c2ebf3c17..08117b635 100644 --- a/Foundation/samples/grep/grep_x64_vs110.vcxproj +++ b/Foundation/samples/grep/grep_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - grep - {C743C479-4D47-37FE-A2EB-59CDD7A627FE} - grep - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - grepd - grepd - grepd - grep - grep - grep - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\grepd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\grepd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\grep.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\grepd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\grepd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\grep.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\grepd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\grepd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\grep.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + grep + {C743C479-4D47-37FE-A2EB-59CDD7A627FE} + grep + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + grepd + grepd + grepd + grep + grep + grep + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\grepd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\grepd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\grep.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\grepd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\grepd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\grep.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\grepd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\grepd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\grep.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/grep/grep_x64_vs110.vcxproj.filters b/Foundation/samples/grep/grep_x64_vs110.vcxproj.filters index 63699b4ee..34b2a566c 100644 --- a/Foundation/samples/grep/grep_x64_vs110.vcxproj.filters +++ b/Foundation/samples/grep/grep_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {68844475-4d45-4508-a759-4a93d30939fa} - - - {f88adbbc-e8ba-44b9-b6fd-1f962268c6e0} - - - - - Source Files - - + + + + + {68844475-4d45-4508-a759-4a93d30939fa} + + + {f88adbbc-e8ba-44b9-b6fd-1f962268c6e0} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj b/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj index d8e57c99a..de182ffe9 100644 --- a/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj +++ b/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - hmacmd5 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359} - hmacmd5 - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - hmacmd5d - hmacmd5d - hmacmd5d - hmacmd5 - hmacmd5 - hmacmd5 - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\hmacmd5d.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\hmacmd5d.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\hmacmd5.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\hmacmd5d.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\hmacmd5d.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\hmacmd5.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\hmacmd5d.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\hmacmd5d.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\hmacmd5.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + hmacmd5 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359} + hmacmd5 + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + hmacmd5d + hmacmd5d + hmacmd5d + hmacmd5 + hmacmd5 + hmacmd5 + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\hmacmd5d.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\hmacmd5d.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\hmacmd5.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\hmacmd5d.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\hmacmd5d.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\hmacmd5.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\hmacmd5d.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\hmacmd5d.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\hmacmd5.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj.filters b/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj.filters index 8b6ab555e..a584ca155 100644 --- a/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj.filters +++ b/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {31f52845-3e3c-4a6d-9d9d-d46e2b627019} - - - {48554054-a3df-42cf-91dd-03839805a06a} - - - - - Source Files - - + + + + + {31f52845-3e3c-4a6d-9d9d-d46e2b627019} + + + {48554054-a3df-42cf-91dd-03839805a06a} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj b/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj index fca7963fe..fc78aa028 100644 --- a/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj +++ b/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - hmacmd5 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359} - hmacmd5 - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - hmacmd5d - hmacmd5d - hmacmd5d - hmacmd5 - hmacmd5 - hmacmd5 - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\hmacmd5d.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\hmacmd5d.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\hmacmd5.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\hmacmd5d.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\hmacmd5d.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\hmacmd5.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\hmacmd5d.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\hmacmd5d.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\hmacmd5.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + hmacmd5 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359} + hmacmd5 + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + hmacmd5d + hmacmd5d + hmacmd5d + hmacmd5 + hmacmd5 + hmacmd5 + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\hmacmd5d.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\hmacmd5d.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\hmacmd5.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\hmacmd5d.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\hmacmd5d.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\hmacmd5.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\hmacmd5d.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\hmacmd5d.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\hmacmd5.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj.filters b/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj.filters index 760dfed3d..e22b9a540 100644 --- a/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj.filters +++ b/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {d58aa996-af64-4a61-bf84-19d7a9d4dedb} - - - {7f9c9178-b314-4c05-b5b5-82d53193e8c6} - - - - - Source Files - - + + + + + {d58aa996-af64-4a61-bf84-19d7a9d4dedb} + + + {7f9c9178-b314-4c05-b5b5-82d53193e8c6} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/inflate/inflate_vs110.vcxproj b/Foundation/samples/inflate/inflate_vs110.vcxproj index 90b8d7bdf..87aebcb8a 100644 --- a/Foundation/samples/inflate/inflate_vs110.vcxproj +++ b/Foundation/samples/inflate/inflate_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - inflate - {9F489D6A-175F-3754-B4E4-2B0E795D2857} - inflate - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - inflated - inflated - inflated - inflate - inflate - inflate - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\inflated.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\inflated.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\inflate.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\inflated.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\inflated.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\inflate.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\inflated.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\inflated.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\inflate.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + inflate + {9F489D6A-175F-3754-B4E4-2B0E795D2857} + inflate + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + inflated + inflated + inflated + inflate + inflate + inflate + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\inflated.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\inflated.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\inflate.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\inflated.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\inflated.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\inflate.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\inflated.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\inflated.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\inflate.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/inflate/inflate_vs110.vcxproj.filters b/Foundation/samples/inflate/inflate_vs110.vcxproj.filters index b0f78f888..5f1e86727 100644 --- a/Foundation/samples/inflate/inflate_vs110.vcxproj.filters +++ b/Foundation/samples/inflate/inflate_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {442c0cc3-7f64-417a-bd61-ec5cab184aa9} - - - {07c7c7ec-9aa0-43b1-91ec-610d4073d6b8} - - - - - Source Files - - + + + + + {442c0cc3-7f64-417a-bd61-ec5cab184aa9} + + + {07c7c7ec-9aa0-43b1-91ec-610d4073d6b8} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/inflate/inflate_x64_vs110.vcxproj b/Foundation/samples/inflate/inflate_x64_vs110.vcxproj index 4db8d70a5..1c616181c 100644 --- a/Foundation/samples/inflate/inflate_x64_vs110.vcxproj +++ b/Foundation/samples/inflate/inflate_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - inflate - {9F489D6A-175F-3754-B4E4-2B0E795D2857} - inflate - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - inflated - inflated - inflated - inflate - inflate - inflate - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\inflated.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\inflated.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\inflate.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\inflated.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\inflated.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\inflate.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\inflated.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\inflated.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\inflate.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + inflate + {9F489D6A-175F-3754-B4E4-2B0E795D2857} + inflate + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + inflated + inflated + inflated + inflate + inflate + inflate + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\inflated.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\inflated.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\inflate.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\inflated.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\inflated.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\inflate.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\inflated.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\inflated.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\inflate.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/inflate/inflate_x64_vs110.vcxproj.filters b/Foundation/samples/inflate/inflate_x64_vs110.vcxproj.filters index f5c04d5bb..07156f4d9 100644 --- a/Foundation/samples/inflate/inflate_x64_vs110.vcxproj.filters +++ b/Foundation/samples/inflate/inflate_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {23abf4a5-ecf3-415c-9f6b-928d732f67a3} - - - {289aee9d-b672-4b55-b06e-8ff9ba5e8b6c} - - - - - Source Files - - + + + + + {23abf4a5-ecf3-415c-9f6b-928d732f67a3} + + + {289aee9d-b672-4b55-b06e-8ff9ba5e8b6c} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/md5/md5_vs110.vcxproj b/Foundation/samples/md5/md5_vs110.vcxproj index 6e2e7d93d..6bc850c44 100644 --- a/Foundation/samples/md5/md5_vs110.vcxproj +++ b/Foundation/samples/md5/md5_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - md5 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C} - md5 - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - md5d - md5d - md5d - md5 - md5 - md5 - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\md5d.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\md5d.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\md5.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\md5d.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\md5d.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\md5.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\md5d.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\md5d.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\md5.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + md5 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C} + md5 + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + md5d + md5d + md5d + md5 + md5 + md5 + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\md5d.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\md5d.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\md5.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\md5d.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\md5d.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\md5.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\md5d.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\md5d.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\md5.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/md5/md5_vs110.vcxproj.filters b/Foundation/samples/md5/md5_vs110.vcxproj.filters index 2a543f957..b259ade94 100644 --- a/Foundation/samples/md5/md5_vs110.vcxproj.filters +++ b/Foundation/samples/md5/md5_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {bc709184-5e05-4c5a-a600-ccf941b99d67} - - - {c16350f6-3396-4dbf-a2db-d4f90f0c0839} - - - - - Source Files - - + + + + + {bc709184-5e05-4c5a-a600-ccf941b99d67} + + + {c16350f6-3396-4dbf-a2db-d4f90f0c0839} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/md5/md5_x64_vs110.vcxproj b/Foundation/samples/md5/md5_x64_vs110.vcxproj index e0f47b56c..e32c93808 100644 --- a/Foundation/samples/md5/md5_x64_vs110.vcxproj +++ b/Foundation/samples/md5/md5_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - md5 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C} - md5 - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - md5d - md5d - md5d - md5 - md5 - md5 - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\md5d.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\md5d.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\md5.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\md5d.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\md5d.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\md5.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\md5d.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\md5d.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\md5.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + md5 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C} + md5 + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + md5d + md5d + md5d + md5 + md5 + md5 + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\md5d.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\md5d.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\md5.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\md5d.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\md5d.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\md5.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\md5d.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\md5d.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\md5.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/md5/md5_x64_vs110.vcxproj.filters b/Foundation/samples/md5/md5_x64_vs110.vcxproj.filters index c72bee8f0..ef84fa343 100644 --- a/Foundation/samples/md5/md5_x64_vs110.vcxproj.filters +++ b/Foundation/samples/md5/md5_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {bfc08b11-a5d3-439b-a01e-5cd0f6667157} - - - {448e9d94-00ff-43e8-8a06-2d864394ea19} - - - - - Source Files - - + + + + + {bfc08b11-a5d3-439b-a01e-5cd0f6667157} + + + {448e9d94-00ff-43e8-8a06-2d864394ea19} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/samples_vs110.sln b/Foundation/samples/samples_vs110.sln index 6d3074d5c..d7265d329 100644 --- a/Foundation/samples/samples_vs110.sln +++ b/Foundation/samples/samples_vs110.sln @@ -1,397 +1,397 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActiveMethod", "ActiveMethod\ActiveMethod_vs110.vcxproj", "{F8B51F16-52AE-3D43-B55B-BD62ED422C2F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Activity", "Activity\Activity_vs110.vcxproj", "{479B938E-57EA-3332-AFD3-E7285DE4EB28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64decode", "base64decode\base64decode_vs110.vcxproj", "{A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64encode", "base64encode\base64encode_vs110.vcxproj", "{6CCDAF5F-4AD1-3F87-8052-B99952B203E0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BinaryReaderWriter", "BinaryReaderWriter\BinaryReaderWriter_vs110.vcxproj", "{A5639B95-211B-36F1-994E-F05361C18EBF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DateTime", "DateTime\DateTime_vs110.vcxproj", "{9549D36E-CB01-3BA4-916D-0BCEA078A8AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deflate", "deflate\deflate_vs110.vcxproj", "{6D323430-D9E1-3173-A087-7A6E084B63CD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dir", "dir\dir_vs110.vcxproj", "{39E0E21B-10A6-3D5A-9B68-70F20C05D80A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grep", "grep\grep_vs110.vcxproj", "{C743C479-4D47-37FE-A2EB-59CDD7A627FE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hmacmd5", "hmacmd5\hmacmd5_vs110.vcxproj", "{0CC4CA42-4EEF-36C8-A426-5A047C1A2359}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inflate", "inflate\inflate_vs110.vcxproj", "{9F489D6A-175F-3754-B4E4-2B0E795D2857}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Logger", "Logger\Logger_vs110.vcxproj", "{49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LogRotation", "LogRotation\LogRotation_vs110.vcxproj", "{0382A4E1-4461-391B-A8D6-A35251CD7464}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "md5", "md5\md5_vs110.vcxproj", "{2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotificationQueue", "NotificationQueue\NotificationQueue_vs110.vcxproj", "{4238E8B1-08D7-3469-8896-2A643B585A2D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StringTokenizer", "StringTokenizer\StringTokenizer_vs110.vcxproj", "{1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Timer", "Timer\Timer_vs110.vcxproj", "{84150D4A-0A5A-30D5-8140-24B0F61CAF9B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "URI", "URI\URI_vs110.vcxproj", "{7D649DAD-3849-3E23-9BB4-802AC60E4E98}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuidgen", "uuidgen\uuidgen_vs110.vcxproj", "{5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|Win32.Build.0 = release_shared|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|Win32.Build.0 = release_shared|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|Win32.Build.0 = release_shared|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|Win32.Build.0 = release_shared|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|Win32.Build.0 = release_shared|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|Win32.Build.0 = release_shared|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|Win32.Build.0 = release_shared|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|Win32.Build.0 = release_shared|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|Win32.Build.0 = release_shared|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|Win32.Build.0 = release_shared|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|Win32.Build.0 = release_shared|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|Win32.Build.0 = release_shared|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|Win32.Build.0 = release_shared|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|Win32.Build.0 = release_shared|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|Win32.Build.0 = release_shared|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|Win32.Build.0 = release_shared|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|Win32.Build.0 = release_shared|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|Win32.Build.0 = release_shared|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|Win32.Build.0 = release_shared|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActiveMethod", "ActiveMethod\ActiveMethod_vs110.vcxproj", "{F8B51F16-52AE-3D43-B55B-BD62ED422C2F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Activity", "Activity\Activity_vs110.vcxproj", "{479B938E-57EA-3332-AFD3-E7285DE4EB28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64decode", "base64decode\base64decode_vs110.vcxproj", "{A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64encode", "base64encode\base64encode_vs110.vcxproj", "{6CCDAF5F-4AD1-3F87-8052-B99952B203E0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BinaryReaderWriter", "BinaryReaderWriter\BinaryReaderWriter_vs110.vcxproj", "{A5639B95-211B-36F1-994E-F05361C18EBF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DateTime", "DateTime\DateTime_vs110.vcxproj", "{9549D36E-CB01-3BA4-916D-0BCEA078A8AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deflate", "deflate\deflate_vs110.vcxproj", "{6D323430-D9E1-3173-A087-7A6E084B63CD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dir", "dir\dir_vs110.vcxproj", "{39E0E21B-10A6-3D5A-9B68-70F20C05D80A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grep", "grep\grep_vs110.vcxproj", "{C743C479-4D47-37FE-A2EB-59CDD7A627FE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hmacmd5", "hmacmd5\hmacmd5_vs110.vcxproj", "{0CC4CA42-4EEF-36C8-A426-5A047C1A2359}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inflate", "inflate\inflate_vs110.vcxproj", "{9F489D6A-175F-3754-B4E4-2B0E795D2857}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Logger", "Logger\Logger_vs110.vcxproj", "{49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LogRotation", "LogRotation\LogRotation_vs110.vcxproj", "{0382A4E1-4461-391B-A8D6-A35251CD7464}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "md5", "md5\md5_vs110.vcxproj", "{2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotificationQueue", "NotificationQueue\NotificationQueue_vs110.vcxproj", "{4238E8B1-08D7-3469-8896-2A643B585A2D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StringTokenizer", "StringTokenizer\StringTokenizer_vs110.vcxproj", "{1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Timer", "Timer\Timer_vs110.vcxproj", "{84150D4A-0A5A-30D5-8140-24B0F61CAF9B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "URI", "URI\URI_vs110.vcxproj", "{7D649DAD-3849-3E23-9BB4-802AC60E4E98}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuidgen", "uuidgen\uuidgen_vs110.vcxproj", "{5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|Win32.Build.0 = release_shared|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|Win32.Build.0 = release_shared|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|Win32.Build.0 = release_shared|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|Win32.Build.0 = release_shared|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|Win32.Build.0 = release_shared|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|Win32.Build.0 = release_shared|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|Win32.Build.0 = release_shared|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|Win32.Build.0 = release_shared|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|Win32.Build.0 = release_shared|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|Win32.Build.0 = release_shared|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|Win32.Build.0 = release_shared|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|Win32.Build.0 = release_shared|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|Win32.Build.0 = release_shared|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|Win32.Build.0 = release_shared|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|Win32.Build.0 = release_shared|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|Win32.Build.0 = release_shared|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|Win32.Build.0 = release_shared|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|Win32.Build.0 = release_shared|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|Win32.Build.0 = release_shared|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Foundation/samples/samples_x64_vs110.sln b/Foundation/samples/samples_x64_vs110.sln index 996d97e56..c964dc137 100644 --- a/Foundation/samples/samples_x64_vs110.sln +++ b/Foundation/samples/samples_x64_vs110.sln @@ -1,397 +1,397 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActiveMethod", "ActiveMethod\ActiveMethod_x64_vs110.vcxproj", "{F8B51F16-52AE-3D43-B55B-BD62ED422C2F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Activity", "Activity\Activity_x64_vs110.vcxproj", "{479B938E-57EA-3332-AFD3-E7285DE4EB28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64decode", "base64decode\base64decode_x64_vs110.vcxproj", "{A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64encode", "base64encode\base64encode_x64_vs110.vcxproj", "{6CCDAF5F-4AD1-3F87-8052-B99952B203E0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BinaryReaderWriter", "BinaryReaderWriter\BinaryReaderWriter_x64_vs110.vcxproj", "{A5639B95-211B-36F1-994E-F05361C18EBF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DateTime", "DateTime\DateTime_x64_vs110.vcxproj", "{9549D36E-CB01-3BA4-916D-0BCEA078A8AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deflate", "deflate\deflate_x64_vs110.vcxproj", "{6D323430-D9E1-3173-A087-7A6E084B63CD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dir", "dir\dir_x64_vs110.vcxproj", "{39E0E21B-10A6-3D5A-9B68-70F20C05D80A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grep", "grep\grep_x64_vs110.vcxproj", "{C743C479-4D47-37FE-A2EB-59CDD7A627FE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hmacmd5", "hmacmd5\hmacmd5_x64_vs110.vcxproj", "{0CC4CA42-4EEF-36C8-A426-5A047C1A2359}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inflate", "inflate\inflate_x64_vs110.vcxproj", "{9F489D6A-175F-3754-B4E4-2B0E795D2857}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Logger", "Logger\Logger_x64_vs110.vcxproj", "{49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LogRotation", "LogRotation\LogRotation_x64_vs110.vcxproj", "{0382A4E1-4461-391B-A8D6-A35251CD7464}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "md5", "md5\md5_x64_vs110.vcxproj", "{2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotificationQueue", "NotificationQueue\NotificationQueue_x64_vs110.vcxproj", "{4238E8B1-08D7-3469-8896-2A643B585A2D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StringTokenizer", "StringTokenizer\StringTokenizer_x64_vs110.vcxproj", "{1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Timer", "Timer\Timer_x64_vs110.vcxproj", "{84150D4A-0A5A-30D5-8140-24B0F61CAF9B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "URI", "URI\URI_x64_vs110.vcxproj", "{7D649DAD-3849-3E23-9BB4-802AC60E4E98}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuidgen", "uuidgen\uuidgen_x64_vs110.vcxproj", "{5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|x64.Build.0 = debug_shared|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|x64.ActiveCfg = release_shared|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|x64.Build.0 = release_shared|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|x64.Deploy.0 = release_shared|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|x64.Build.0 = release_static_md|x64 - {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|x64.Build.0 = debug_shared|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|x64.ActiveCfg = release_shared|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|x64.Build.0 = release_shared|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|x64.Deploy.0 = release_shared|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|x64.Build.0 = release_static_md|x64 - {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|x64.Build.0 = debug_shared|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|x64.ActiveCfg = release_shared|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|x64.Build.0 = release_shared|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|x64.Deploy.0 = release_shared|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|x64.Build.0 = release_static_md|x64 - {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|x64.Build.0 = debug_shared|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|x64.ActiveCfg = release_shared|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|x64.Build.0 = release_shared|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|x64.Deploy.0 = release_shared|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|x64.Build.0 = release_static_md|x64 - {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|x64.Build.0 = debug_shared|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|x64.ActiveCfg = release_shared|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|x64.Build.0 = release_shared|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|x64.Deploy.0 = release_shared|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|x64.Build.0 = release_static_md|x64 - {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|x64.Build.0 = debug_shared|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|x64.ActiveCfg = release_shared|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|x64.Build.0 = release_shared|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|x64.Deploy.0 = release_shared|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|x64.Build.0 = release_static_md|x64 - {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|x64.Build.0 = debug_shared|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|x64.ActiveCfg = release_shared|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|x64.Build.0 = release_shared|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|x64.Deploy.0 = release_shared|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|x64.Build.0 = release_static_md|x64 - {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|x64.Build.0 = debug_shared|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|x64.ActiveCfg = release_shared|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|x64.Build.0 = release_shared|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|x64.Deploy.0 = release_shared|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|x64.Build.0 = release_static_md|x64 - {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|x64.Build.0 = debug_shared|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|x64.ActiveCfg = release_shared|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|x64.Build.0 = release_shared|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|x64.Deploy.0 = release_shared|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|x64.Build.0 = release_static_md|x64 - {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|x64.Build.0 = debug_shared|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|x64.ActiveCfg = release_shared|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|x64.Build.0 = release_shared|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|x64.Deploy.0 = release_shared|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|x64.Build.0 = release_static_md|x64 - {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|x64.Build.0 = debug_shared|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|x64.ActiveCfg = release_shared|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|x64.Build.0 = release_shared|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|x64.Deploy.0 = release_shared|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|x64.Build.0 = release_static_md|x64 - {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|x64.Build.0 = debug_shared|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|x64.ActiveCfg = release_shared|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|x64.Build.0 = release_shared|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|x64.Deploy.0 = release_shared|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|x64.Build.0 = release_static_md|x64 - {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|x64.Build.0 = debug_shared|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|x64.ActiveCfg = release_shared|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|x64.Build.0 = release_shared|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|x64.Deploy.0 = release_shared|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|x64.Build.0 = release_static_md|x64 - {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|x64.Build.0 = debug_shared|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|x64.ActiveCfg = release_shared|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|x64.Build.0 = release_shared|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|x64.Deploy.0 = release_shared|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|x64.Build.0 = release_static_md|x64 - {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|x64.Build.0 = debug_shared|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|x64.ActiveCfg = release_shared|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|x64.Build.0 = release_shared|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|x64.Deploy.0 = release_shared|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|x64.Build.0 = release_static_md|x64 - {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|x64.Build.0 = debug_shared|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|x64.ActiveCfg = release_shared|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|x64.Build.0 = release_shared|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|x64.Deploy.0 = release_shared|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|x64.Build.0 = release_static_md|x64 - {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|x64.Build.0 = debug_shared|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|x64.ActiveCfg = release_shared|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|x64.Build.0 = release_shared|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|x64.Deploy.0 = release_shared|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|x64.Build.0 = release_static_md|x64 - {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|x64.Build.0 = debug_shared|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|x64.ActiveCfg = release_shared|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|x64.Build.0 = release_shared|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|x64.Deploy.0 = release_shared|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|x64.Build.0 = release_static_md|x64 - {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|x64.Build.0 = debug_shared|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|x64.ActiveCfg = release_shared|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|x64.Build.0 = release_shared|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|x64.Deploy.0 = release_shared|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|x64.Build.0 = release_static_md|x64 - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActiveMethod", "ActiveMethod\ActiveMethod_x64_vs110.vcxproj", "{F8B51F16-52AE-3D43-B55B-BD62ED422C2F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Activity", "Activity\Activity_x64_vs110.vcxproj", "{479B938E-57EA-3332-AFD3-E7285DE4EB28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64decode", "base64decode\base64decode_x64_vs110.vcxproj", "{A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64encode", "base64encode\base64encode_x64_vs110.vcxproj", "{6CCDAF5F-4AD1-3F87-8052-B99952B203E0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BinaryReaderWriter", "BinaryReaderWriter\BinaryReaderWriter_x64_vs110.vcxproj", "{A5639B95-211B-36F1-994E-F05361C18EBF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DateTime", "DateTime\DateTime_x64_vs110.vcxproj", "{9549D36E-CB01-3BA4-916D-0BCEA078A8AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deflate", "deflate\deflate_x64_vs110.vcxproj", "{6D323430-D9E1-3173-A087-7A6E084B63CD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dir", "dir\dir_x64_vs110.vcxproj", "{39E0E21B-10A6-3D5A-9B68-70F20C05D80A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grep", "grep\grep_x64_vs110.vcxproj", "{C743C479-4D47-37FE-A2EB-59CDD7A627FE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hmacmd5", "hmacmd5\hmacmd5_x64_vs110.vcxproj", "{0CC4CA42-4EEF-36C8-A426-5A047C1A2359}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inflate", "inflate\inflate_x64_vs110.vcxproj", "{9F489D6A-175F-3754-B4E4-2B0E795D2857}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Logger", "Logger\Logger_x64_vs110.vcxproj", "{49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LogRotation", "LogRotation\LogRotation_x64_vs110.vcxproj", "{0382A4E1-4461-391B-A8D6-A35251CD7464}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "md5", "md5\md5_x64_vs110.vcxproj", "{2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotificationQueue", "NotificationQueue\NotificationQueue_x64_vs110.vcxproj", "{4238E8B1-08D7-3469-8896-2A643B585A2D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StringTokenizer", "StringTokenizer\StringTokenizer_x64_vs110.vcxproj", "{1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Timer", "Timer\Timer_x64_vs110.vcxproj", "{84150D4A-0A5A-30D5-8140-24B0F61CAF9B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "URI", "URI\URI_x64_vs110.vcxproj", "{7D649DAD-3849-3E23-9BB4-802AC60E4E98}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuidgen", "uuidgen\uuidgen_x64_vs110.vcxproj", "{5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|x64.Build.0 = debug_shared|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|x64.ActiveCfg = release_shared|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|x64.Build.0 = release_shared|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_shared|x64.Deploy.0 = release_shared|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|x64.Build.0 = release_static_md|x64 + {F8B51F16-52AE-3D43-B55B-BD62ED422C2F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|x64.Build.0 = debug_shared|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|x64.ActiveCfg = release_shared|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|x64.Build.0 = release_shared|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_shared|x64.Deploy.0 = release_shared|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|x64.Build.0 = release_static_md|x64 + {479B938E-57EA-3332-AFD3-E7285DE4EB28}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|x64.Build.0 = debug_shared|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|x64.ActiveCfg = release_shared|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|x64.Build.0 = release_shared|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_shared|x64.Deploy.0 = release_shared|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|x64.Build.0 = release_static_md|x64 + {A1623462-1A5C-3CC2-8DCB-7E85D4EA56E8}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|x64.Build.0 = debug_shared|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|x64.ActiveCfg = release_shared|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|x64.Build.0 = release_shared|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_shared|x64.Deploy.0 = release_shared|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|x64.Build.0 = release_static_md|x64 + {6CCDAF5F-4AD1-3F87-8052-B99952B203E0}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|x64.Build.0 = debug_shared|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|x64.ActiveCfg = release_shared|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|x64.Build.0 = release_shared|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_shared|x64.Deploy.0 = release_shared|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|x64.Build.0 = release_static_md|x64 + {A5639B95-211B-36F1-994E-F05361C18EBF}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|x64.Build.0 = debug_shared|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|x64.ActiveCfg = release_shared|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|x64.Build.0 = release_shared|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_shared|x64.Deploy.0 = release_shared|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|x64.Build.0 = release_static_md|x64 + {9549D36E-CB01-3BA4-916D-0BCEA078A8AF}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|x64.Build.0 = debug_shared|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|x64.ActiveCfg = release_shared|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|x64.Build.0 = release_shared|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_shared|x64.Deploy.0 = release_shared|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|x64.Build.0 = release_static_md|x64 + {6D323430-D9E1-3173-A087-7A6E084B63CD}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|x64.Build.0 = debug_shared|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|x64.ActiveCfg = release_shared|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|x64.Build.0 = release_shared|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_shared|x64.Deploy.0 = release_shared|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|x64.Build.0 = release_static_md|x64 + {39E0E21B-10A6-3D5A-9B68-70F20C05D80A}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|x64.Build.0 = debug_shared|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|x64.ActiveCfg = release_shared|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|x64.Build.0 = release_shared|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_shared|x64.Deploy.0 = release_shared|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|x64.Build.0 = release_static_md|x64 + {C743C479-4D47-37FE-A2EB-59CDD7A627FE}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|x64.Build.0 = debug_shared|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|x64.ActiveCfg = release_shared|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|x64.Build.0 = release_shared|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_shared|x64.Deploy.0 = release_shared|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|x64.Build.0 = release_static_md|x64 + {0CC4CA42-4EEF-36C8-A426-5A047C1A2359}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|x64.Build.0 = debug_shared|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|x64.ActiveCfg = release_shared|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|x64.Build.0 = release_shared|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_shared|x64.Deploy.0 = release_shared|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|x64.Build.0 = release_static_md|x64 + {9F489D6A-175F-3754-B4E4-2B0E795D2857}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|x64.Build.0 = debug_shared|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|x64.ActiveCfg = release_shared|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|x64.Build.0 = release_shared|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_shared|x64.Deploy.0 = release_shared|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|x64.Build.0 = release_static_md|x64 + {49C1FE51-9FDB-3FA3-864F-BBE3A171BE59}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|x64.Build.0 = debug_shared|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|x64.ActiveCfg = release_shared|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|x64.Build.0 = release_shared|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_shared|x64.Deploy.0 = release_shared|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|x64.Build.0 = release_static_md|x64 + {0382A4E1-4461-391B-A8D6-A35251CD7464}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|x64.Build.0 = debug_shared|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|x64.ActiveCfg = release_shared|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|x64.Build.0 = release_shared|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_shared|x64.Deploy.0 = release_shared|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|x64.Build.0 = release_static_md|x64 + {2B9717FB-D1A8-39C2-9699-6BEF37D7DA9C}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|x64.Build.0 = debug_shared|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|x64.ActiveCfg = release_shared|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|x64.Build.0 = release_shared|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_shared|x64.Deploy.0 = release_shared|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|x64.Build.0 = release_static_md|x64 + {4238E8B1-08D7-3469-8896-2A643B585A2D}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|x64.Build.0 = debug_shared|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|x64.ActiveCfg = release_shared|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|x64.Build.0 = release_shared|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_shared|x64.Deploy.0 = release_shared|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|x64.Build.0 = release_static_md|x64 + {1F31BE50-3475-372C-ADE3-D1B97D9BA7BE}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|x64.Build.0 = debug_shared|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|x64.ActiveCfg = release_shared|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|x64.Build.0 = release_shared|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_shared|x64.Deploy.0 = release_shared|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|x64.Build.0 = release_static_md|x64 + {84150D4A-0A5A-30D5-8140-24B0F61CAF9B}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|x64.Build.0 = debug_shared|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|x64.ActiveCfg = release_shared|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|x64.Build.0 = release_shared|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_shared|x64.Deploy.0 = release_shared|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|x64.Build.0 = release_static_md|x64 + {7D649DAD-3849-3E23-9BB4-802AC60E4E98}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|x64.Build.0 = debug_shared|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|x64.ActiveCfg = release_shared|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|x64.Build.0 = release_shared|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_shared|x64.Deploy.0 = release_shared|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|x64.Build.0 = release_static_md|x64 + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj b/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj index 3b981c874..5fdfae94e 100644 --- a/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj +++ b/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - uuidgen - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862} - uuidgen - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - uuidgend - uuidgend - uuidgend - uuidgen - uuidgen - uuidgen - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\uuidgend.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\uuidgend.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\uuidgen.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\uuidgend.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\uuidgend.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\uuidgen.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\uuidgend.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\uuidgend.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\uuidgen.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + uuidgen + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862} + uuidgen + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + uuidgend + uuidgend + uuidgend + uuidgen + uuidgen + uuidgen + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\uuidgend.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\uuidgend.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\uuidgen.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\uuidgend.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\uuidgend.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\uuidgen.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\uuidgend.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\uuidgend.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\uuidgen.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj.filters b/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj.filters index 673299a2b..1b08ab0dc 100644 --- a/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj.filters +++ b/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {79645128-98fe-42a6-9cf5-e299a7f358ad} - - - {60753008-48eb-4d95-bc9f-0026da98edec} - - - - - Source Files - - + + + + + {79645128-98fe-42a6-9cf5-e299a7f358ad} + + + {60753008-48eb-4d95-bc9f-0026da98edec} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj b/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj index e8a2ca55c..eb1a0b8e1 100644 --- a/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj +++ b/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - uuidgen - {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862} - uuidgen - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - uuidgend - uuidgend - uuidgend - uuidgen - uuidgen - uuidgen - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\uuidgend.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\uuidgend.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\uuidgen.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\uuidgend.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\uuidgend.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\uuidgen.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\uuidgend.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\uuidgend.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\uuidgen.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + uuidgen + {5E26603C-CAE2-3AA1-8DBD-AA70BB88A862} + uuidgen + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + uuidgend + uuidgend + uuidgend + uuidgen + uuidgen + uuidgen + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\uuidgend.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\uuidgend.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\uuidgen.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\uuidgend.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\uuidgend.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\uuidgen.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\uuidgend.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\uuidgend.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\uuidgen.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj.filters b/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj.filters index 796479a68..4788335d3 100644 --- a/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj.filters +++ b/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {db64f4ca-cf4d-406f-8371-3151b228bad6} - - - {0d79ad07-2223-44c0-bb04-f47c71e22fbf} - - - - - Source Files - - + + + + + {db64f4ca-cf4d-406f-8371-3151b228bad6} + + + {0d79ad07-2223-44c0-bb04-f47c71e22fbf} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/src/FIFOBufferStream.cpp b/Foundation/src/FIFOBufferStream.cpp index 9c8126954..212c2b22c 100644 --- a/Foundation/src/FIFOBufferStream.cpp +++ b/Foundation/src/FIFOBufferStream.cpp @@ -1,208 +1,208 @@ -// -// FIFOBufferStream.cpp -// -// $Id: //poco/1.4/Foundation/src/FIFOBufferStream.cpp#1 $ -// -// Library: Foundation -// Package: Streams -// Module: FIFOBufferStream -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/FIFOBufferStream.h" - - -namespace Poco { - - -// -// FIFOBufferStreamBuf -// - - -FIFOBufferStreamBuf::FIFOBufferStreamBuf(): - BufferedBidirectionalStreamBuf(STREAM_BUFFER_SIZE + 4, std::ios::in | std::ios::out), - _pFIFOBuffer(new FIFOBuffer(STREAM_BUFFER_SIZE, true)), - _fifoBuffer(*_pFIFOBuffer) -{ -} - - -FIFOBufferStreamBuf::FIFOBufferStreamBuf(FIFOBuffer& fifoBuffer): - BufferedBidirectionalStreamBuf(fifoBuffer.size() + 4, std::ios::in | std::ios::out), - _pFIFOBuffer(0), - _fifoBuffer(fifoBuffer) -{ - fifoBuffer.setNotify(true); -} - - -FIFOBufferStreamBuf::FIFOBufferStreamBuf(char* pBuffer, std::size_t length): - BufferedBidirectionalStreamBuf(length + 4, std::ios::in | std::ios::out), - _pFIFOBuffer(new FIFOBuffer(pBuffer, length, true)), - _fifoBuffer(*_pFIFOBuffer) -{ -} - - -FIFOBufferStreamBuf::FIFOBufferStreamBuf(const char* pBuffer, std::size_t length): - BufferedBidirectionalStreamBuf(length + 4, std::ios::in | std::ios::out), - _pFIFOBuffer(new FIFOBuffer(pBuffer, length, true)), - _fifoBuffer(*_pFIFOBuffer) -{ -} - - -FIFOBufferStreamBuf::FIFOBufferStreamBuf(std::size_t length): - BufferedBidirectionalStreamBuf(length + 4, std::ios::in | std::ios::out), - _pFIFOBuffer(new FIFOBuffer(length, true)), - _fifoBuffer(*_pFIFOBuffer) -{ -} - - -FIFOBufferStreamBuf::~FIFOBufferStreamBuf() -{ - delete _pFIFOBuffer; -} - - -int FIFOBufferStreamBuf::readFromDevice(char* buffer, std::streamsize length) -{ - poco_assert (length > 0); - return _fifoBuffer.read(buffer, static_cast(length)); -} - - -int FIFOBufferStreamBuf::writeToDevice(const char* buffer, std::streamsize length) -{ - poco_assert (length > 0); - return _fifoBuffer.write(buffer, static_cast(length)); -} - - -// -// FIFOIOS -// - - -FIFOIOS::FIFOIOS(FIFOBuffer& fifoBuffer): _buf(fifoBuffer) -{ - poco_ios_init(&_buf); -} - - -FIFOIOS::FIFOIOS(char* pBuffer, std::size_t length): _buf(pBuffer, length) -{ - poco_ios_init(&_buf); -} - - -FIFOIOS::FIFOIOS(const char* pBuffer, std::size_t length): _buf(pBuffer, length) -{ - poco_ios_init(&_buf); -} - - -FIFOIOS::FIFOIOS(std::size_t length): _buf(length) -{ - poco_ios_init(&_buf); -} - - -FIFOIOS::~FIFOIOS() -{ - try - { - _buf.sync(); - } - catch (...) - { - } -} - - -FIFOBufferStreamBuf* FIFOIOS::rdbuf() -{ - return &_buf; -} - - -void FIFOIOS::close() -{ - _buf.sync(); -} - - -// -// FIFOBufferStream -// - - -FIFOBufferStream::FIFOBufferStream(FIFOBuffer& fifoBuffer): - FIFOIOS(fifoBuffer), - std::iostream(&_buf), - readable(_buf.fifoBuffer().readable), - writable(_buf.fifoBuffer().writable) -{ -} - - -FIFOBufferStream::FIFOBufferStream(char* pBuffer, std::size_t length): - FIFOIOS(pBuffer, length), - std::iostream(&_buf), - readable(_buf.fifoBuffer().readable), - writable(_buf.fifoBuffer().writable) -{ -} - - -FIFOBufferStream::FIFOBufferStream(const char* pBuffer, std::size_t length): - FIFOIOS(pBuffer, length), - std::iostream(&_buf), - readable(_buf.fifoBuffer().readable), - writable(_buf.fifoBuffer().writable) -{ -} - - -FIFOBufferStream::FIFOBufferStream(std::size_t length): - FIFOIOS(length), - std::iostream(&_buf), - readable(_buf.fifoBuffer().readable), - writable(_buf.fifoBuffer().writable) -{ -} - - -FIFOBufferStream::~FIFOBufferStream() -{ -} - - -} // namespace Poco +// +// FIFOBufferStream.cpp +// +// $Id: //poco/1.4/Foundation/src/FIFOBufferStream.cpp#1 $ +// +// Library: Foundation +// Package: Streams +// Module: FIFOBufferStream +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/FIFOBufferStream.h" + + +namespace Poco { + + +// +// FIFOBufferStreamBuf +// + + +FIFOBufferStreamBuf::FIFOBufferStreamBuf(): + BufferedBidirectionalStreamBuf(STREAM_BUFFER_SIZE + 4, std::ios::in | std::ios::out), + _pFIFOBuffer(new FIFOBuffer(STREAM_BUFFER_SIZE, true)), + _fifoBuffer(*_pFIFOBuffer) +{ +} + + +FIFOBufferStreamBuf::FIFOBufferStreamBuf(FIFOBuffer& fifoBuffer): + BufferedBidirectionalStreamBuf(fifoBuffer.size() + 4, std::ios::in | std::ios::out), + _pFIFOBuffer(0), + _fifoBuffer(fifoBuffer) +{ + fifoBuffer.setNotify(true); +} + + +FIFOBufferStreamBuf::FIFOBufferStreamBuf(char* pBuffer, std::size_t length): + BufferedBidirectionalStreamBuf(length + 4, std::ios::in | std::ios::out), + _pFIFOBuffer(new FIFOBuffer(pBuffer, length, true)), + _fifoBuffer(*_pFIFOBuffer) +{ +} + + +FIFOBufferStreamBuf::FIFOBufferStreamBuf(const char* pBuffer, std::size_t length): + BufferedBidirectionalStreamBuf(length + 4, std::ios::in | std::ios::out), + _pFIFOBuffer(new FIFOBuffer(pBuffer, length, true)), + _fifoBuffer(*_pFIFOBuffer) +{ +} + + +FIFOBufferStreamBuf::FIFOBufferStreamBuf(std::size_t length): + BufferedBidirectionalStreamBuf(length + 4, std::ios::in | std::ios::out), + _pFIFOBuffer(new FIFOBuffer(length, true)), + _fifoBuffer(*_pFIFOBuffer) +{ +} + + +FIFOBufferStreamBuf::~FIFOBufferStreamBuf() +{ + delete _pFIFOBuffer; +} + + +int FIFOBufferStreamBuf::readFromDevice(char* buffer, std::streamsize length) +{ + poco_assert (length > 0); + return _fifoBuffer.read(buffer, static_cast(length)); +} + + +int FIFOBufferStreamBuf::writeToDevice(const char* buffer, std::streamsize length) +{ + poco_assert (length > 0); + return _fifoBuffer.write(buffer, static_cast(length)); +} + + +// +// FIFOIOS +// + + +FIFOIOS::FIFOIOS(FIFOBuffer& fifoBuffer): _buf(fifoBuffer) +{ + poco_ios_init(&_buf); +} + + +FIFOIOS::FIFOIOS(char* pBuffer, std::size_t length): _buf(pBuffer, length) +{ + poco_ios_init(&_buf); +} + + +FIFOIOS::FIFOIOS(const char* pBuffer, std::size_t length): _buf(pBuffer, length) +{ + poco_ios_init(&_buf); +} + + +FIFOIOS::FIFOIOS(std::size_t length): _buf(length) +{ + poco_ios_init(&_buf); +} + + +FIFOIOS::~FIFOIOS() +{ + try + { + _buf.sync(); + } + catch (...) + { + } +} + + +FIFOBufferStreamBuf* FIFOIOS::rdbuf() +{ + return &_buf; +} + + +void FIFOIOS::close() +{ + _buf.sync(); +} + + +// +// FIFOBufferStream +// + + +FIFOBufferStream::FIFOBufferStream(FIFOBuffer& fifoBuffer): + FIFOIOS(fifoBuffer), + std::iostream(&_buf), + readable(_buf.fifoBuffer().readable), + writable(_buf.fifoBuffer().writable) +{ +} + + +FIFOBufferStream::FIFOBufferStream(char* pBuffer, std::size_t length): + FIFOIOS(pBuffer, length), + std::iostream(&_buf), + readable(_buf.fifoBuffer().readable), + writable(_buf.fifoBuffer().writable) +{ +} + + +FIFOBufferStream::FIFOBufferStream(const char* pBuffer, std::size_t length): + FIFOIOS(pBuffer, length), + std::iostream(&_buf), + readable(_buf.fifoBuffer().readable), + writable(_buf.fifoBuffer().writable) +{ +} + + +FIFOBufferStream::FIFOBufferStream(std::size_t length): + FIFOIOS(length), + std::iostream(&_buf), + readable(_buf.fifoBuffer().readable), + writable(_buf.fifoBuffer().writable) +{ +} + + +FIFOBufferStream::~FIFOBufferStream() +{ +} + + +} // namespace Poco diff --git a/Foundation/testsuite/TestApp_vs110.vcxproj b/Foundation/testsuite/TestApp_vs110.vcxproj index 4045746b9..3a0f1e1e3 100644 --- a/Foundation/testsuite/TestApp_vs110.vcxproj +++ b/Foundation/testsuite/TestApp_vs110.vcxproj @@ -1,310 +1,310 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestApp - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} - TestApp - Win32Proj - - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - TestApp - TestAppd - TestAppd - TestAppd - TestApp - TestApp - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - EditAndContinue - - - bin\TestAppd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - bin\TestAppd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - - - bin\TestApp.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - - - Console - true - true - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - - - bin\static_md\TestApp.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - - - Console - true - true - MachineX86 - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - EditAndContinue - - - bin\static_md\TestAppd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - bin\static_md\TestAppd.pdb - Console - MachineX86 - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - Level3 - EditAndContinue - - - bin\static_mt\TestAppd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - bin\static_mt\TestAppd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - - Level3 - - - - - bin\static_mt\TestApp.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - - - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestApp + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} + TestApp + Win32Proj + + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + TestApp + TestAppd + TestAppd + TestAppd + TestApp + TestApp + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + EditAndContinue + + + bin\TestAppd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + bin\TestAppd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + + + bin\TestApp.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + + + Console + true + true + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + + + bin\static_md\TestApp.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + + + Console + true + true + MachineX86 + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + EditAndContinue + + + bin\static_md\TestAppd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + bin\static_md\TestAppd.pdb + Console + MachineX86 + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + Level3 + EditAndContinue + + + bin\static_mt\TestAppd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + bin\static_mt\TestAppd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + + Level3 + + + + + bin\static_mt\TestApp.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + + + Console + true + true + MachineX86 + + + + + + + + \ No newline at end of file diff --git a/Foundation/testsuite/TestApp_vs110.vcxproj.filters b/Foundation/testsuite/TestApp_vs110.vcxproj.filters index 026523891..bc7566f79 100644 --- a/Foundation/testsuite/TestApp_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestApp_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {64a104ed-fb69-4821-b11c-494d063d19f5} - - - - - Source Files - - + + + + + {64a104ed-fb69-4821-b11c-494d063d19f5} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/testsuite/TestApp_x64_vs110.vcxproj b/Foundation/testsuite/TestApp_x64_vs110.vcxproj index 3e23d0795..f430a8388 100644 --- a/Foundation/testsuite/TestApp_x64_vs110.vcxproj +++ b/Foundation/testsuite/TestApp_x64_vs110.vcxproj @@ -1,310 +1,310 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestApp - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} - TestApp - Win32Proj - - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - Application - false - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - TestAppd - TestAppd - TestAppd - TestApp - TestApp - TestApp - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - ProgramDatabase - - - bin64\TestAppd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - bin64\TestAppd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - - - bin64\TestApp.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - - - Console - true - true - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - - - bin64\static_md\TestApp.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - - - Console - true - true - MachineX64 - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - ProgramDatabase - - - bin64\static_md\TestAppd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - bin64\static_md\TestAppd.pdb - Console - MachineX64 - - - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - Level3 - ProgramDatabase - - - bin64\static_mt\TestAppd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - bin64\static_mt\TestAppd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - %(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - - Level3 - - - - - bin64\static_mt\TestApp.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - - - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestApp + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} + TestApp + Win32Proj + + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + TestAppd + TestAppd + TestAppd + TestApp + TestApp + TestApp + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + ProgramDatabase + + + bin64\TestAppd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + bin64\TestAppd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + + + bin64\TestApp.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + + + Console + true + true + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + + + bin64\static_md\TestApp.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + + + Console + true + true + MachineX64 + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + ProgramDatabase + + + bin64\static_md\TestAppd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + bin64\static_md\TestAppd.pdb + Console + MachineX64 + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + Level3 + ProgramDatabase + + + bin64\static_mt\TestAppd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + bin64\static_mt\TestAppd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + + Level3 + + + + + bin64\static_mt\TestApp.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + + + Console + true + true + MachineX64 + + + + + + + + \ No newline at end of file diff --git a/Foundation/testsuite/TestApp_x64_vs110.vcxproj.filters b/Foundation/testsuite/TestApp_x64_vs110.vcxproj.filters index 1da7e9bf7..ad08522a0 100644 --- a/Foundation/testsuite/TestApp_x64_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestApp_x64_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {2e04e7d1-6561-4794-afb4-c7d56110c8ac} - - - - - Source Files - - + + + + + {2e04e7d1-6561-4794-afb4-c7d56110c8ac} + + + + + Source Files + + \ No newline at end of file diff --git a/Foundation/testsuite/TestLibrary_vs110.vcxproj b/Foundation/testsuite/TestLibrary_vs110.vcxproj index b0d316c22..5c86d4bff 100644 --- a/Foundation/testsuite/TestLibrary_vs110.vcxproj +++ b/Foundation/testsuite/TestLibrary_vs110.vcxproj @@ -1,128 +1,128 @@ - - - - - debug_shared - Win32 - - - release_shared - Win32 - - - - TestLibrary - {0955EB03-544B-4BD4-9C10-89CF38078F5F} - Win32Proj - - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - bin\ - obj\$(Configuration)\ - true - true - bin\ - obj\$(Configuration)\ - true - false - TestLibrary - TestLibraryd - - - - Disabled - ..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - EditAndContinue - - - PocoFoundationd.lib;%(AdditionalDependencies) - bin\TestLibraryd.dll - ..\..\lib;%(AdditionalLibraryDirectories) - true - bin\TestLibraryd.pdb - Console - - - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - - - PocoFoundation.lib;%(AdditionalDependencies) - bin\TestLibrary.dll - ..\..\lib;%(AdditionalLibraryDirectories) - false - - - Console - true - true - - - MachineX86 - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + release_shared + Win32 + + + + TestLibrary + {0955EB03-544B-4BD4-9C10-89CF38078F5F} + Win32Proj + + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin\ + obj\$(Configuration)\ + true + true + bin\ + obj\$(Configuration)\ + true + false + TestLibrary + TestLibraryd + + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + EditAndContinue + + + PocoFoundationd.lib;%(AdditionalDependencies) + bin\TestLibraryd.dll + ..\..\lib;%(AdditionalLibraryDirectories) + true + bin\TestLibraryd.pdb + Console + + + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + + + PocoFoundation.lib;%(AdditionalDependencies) + bin\TestLibrary.dll + ..\..\lib;%(AdditionalLibraryDirectories) + false + + + Console + true + true + + + MachineX86 + + + + + + + + + + + + \ No newline at end of file diff --git a/Foundation/testsuite/TestLibrary_vs110.vcxproj.filters b/Foundation/testsuite/TestLibrary_vs110.vcxproj.filters index 50bdf903c..492683384 100644 --- a/Foundation/testsuite/TestLibrary_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestLibrary_vs110.vcxproj.filters @@ -1,25 +1,25 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {c8906c29-86ed-4749-b34e-0f6454645796} - - - - - Source Files - - - Source Files - - - - - Header Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {c8906c29-86ed-4749-b34e-0f6454645796} + + + + + Source Files + + + Source Files + + + + + Header Files + + \ No newline at end of file diff --git a/Foundation/testsuite/TestLibrary_x64_vs110.vcxproj b/Foundation/testsuite/TestLibrary_x64_vs110.vcxproj index 281d29d29..c7b7b53ef 100644 --- a/Foundation/testsuite/TestLibrary_x64_vs110.vcxproj +++ b/Foundation/testsuite/TestLibrary_x64_vs110.vcxproj @@ -1,128 +1,128 @@ - - - - - debug_shared - x64 - - - release_shared - x64 - - - - TestLibrary - {0955EB03-544B-4BD4-9C10-89CF38078F5F} - Win32Proj - - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - bin64\ - obj64\$(Configuration)\ - true - true - bin64\ - obj64\$(Configuration)\ - true - false - TestLibraryd - TestLibrary - - - - Disabled - ..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - ProgramDatabase - - - PocoFoundationd.lib;%(AdditionalDependencies) - bin64\TestLibraryd.dll - ..\..\lib64;%(AdditionalLibraryDirectories) - true - bin64\TestLibraryd.pdb - Console - - - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - - - PocoFoundation.lib;%(AdditionalDependencies) - bin64\TestLibrary.dll - ..\..\lib64;%(AdditionalLibraryDirectories) - false - - - Console - true - true - - - MachineX64 - - - - - - - - - - - - + + + + + debug_shared + x64 + + + release_shared + x64 + + + + TestLibrary + {0955EB03-544B-4BD4-9C10-89CF38078F5F} + Win32Proj + + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin64\ + obj64\$(Configuration)\ + true + true + bin64\ + obj64\$(Configuration)\ + true + false + TestLibraryd + TestLibrary + + + + Disabled + ..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + ProgramDatabase + + + PocoFoundationd.lib;%(AdditionalDependencies) + bin64\TestLibraryd.dll + ..\..\lib64;%(AdditionalLibraryDirectories) + true + bin64\TestLibraryd.pdb + Console + + + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + + + PocoFoundation.lib;%(AdditionalDependencies) + bin64\TestLibrary.dll + ..\..\lib64;%(AdditionalLibraryDirectories) + false + + + Console + true + true + + + MachineX64 + + + + + + + + + + + + \ No newline at end of file diff --git a/Foundation/testsuite/TestLibrary_x64_vs110.vcxproj.filters b/Foundation/testsuite/TestLibrary_x64_vs110.vcxproj.filters index 0d691f7c9..a129f9954 100644 --- a/Foundation/testsuite/TestLibrary_x64_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestLibrary_x64_vs110.vcxproj.filters @@ -1,25 +1,25 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {277652dc-a245-4ba5-8144-b136dbd3a0b5} - - - - - Source Files - - - Source Files - - - - - Header Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {277652dc-a245-4ba5-8144-b136dbd3a0b5} + + + + + Source Files + + + Source Files + + + + + Header Files + + \ No newline at end of file diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj b/Foundation/testsuite/TestSuite_vs110.vcxproj index 4ad296309..7d9a0f1dc 100644 --- a/Foundation/testsuite/TestSuite_vs110.vcxproj +++ b/Foundation/testsuite/TestSuite_vs110.vcxproj @@ -1,576 +1,576 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {F1EE93DF-347F-4CB3-B191-C4E63F38E972} - Win32Proj - - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - EditAndContinue - - - CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - - - CppUnit.lib;WinTestRunner.lib;PocoFoundation.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - - - Windows - true - true - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - Default - MultiThreadedDLL - false - true - true - true - - - Level3 - - - - - CppUnitmd.lib;WinTestRunnermd.lib;PocoFoundationmd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - - - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - EditAndContinue - - - CppUnitmdd.lib;WinTestRunnermdd.lib;PocoFoundationmdd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - Level3 - EditAndContinue - - - CppUnitmtd.lib;WinTestRunnermtd.lib;PocoFoundationmtd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - false - Default - MultiThreaded - false - true - true - true - - - Level3 - - - - - CppUnitmt.lib;WinTestRunnermt.lib;PocoFoundationmt.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - - - Windows - true - false - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {F1EE93DF-347F-4CB3-B191-C4E63F38E972} + Win32Proj + + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + EditAndContinue + + + CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + + + CppUnit.lib;WinTestRunner.lib;PocoFoundation.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + + + Windows + true + true + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + Default + MultiThreadedDLL + false + true + true + true + + + Level3 + + + + + CppUnitmd.lib;WinTestRunnermd.lib;PocoFoundationmd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + + + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + EditAndContinue + + + CppUnitmdd.lib;WinTestRunnermdd.lib;PocoFoundationmdd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + Level3 + EditAndContinue + + + CppUnitmtd.lib;WinTestRunnermtd.lib;PocoFoundationmtd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + false + true + true + true + + + Level3 + + + + + CppUnitmt.lib;WinTestRunnermt.lib;PocoFoundationmt.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + + + Windows + true + false + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters index a29f13101..f39e374ab 100644 --- a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,969 +1,969 @@ - - - - - {a59b5185-a828-49a5-af23-d86b47d2c19c} - - - {1e6128ad-7c36-4a4d-ad5c-c604171281c1} - - - {7abaf643-e5e3-4023-bbe8-8b8febe849dd} - - - {87d01d31-9117-4d34-9d22-7babfd7b7bff} - - - {f6aad27f-31ed-496c-97ce-9c7d153d166d} - - - {d83da1d6-0738-4a6b-a7f7-fd79ac9ae23c} - - - {0ed8b0f5-8c2f-4c45-b211-e0144659fcb6} - - - {81f46737-5924-42f1-96dd-e809506231bd} - - - {a0215363-3aef-44fa-b1a5-153f868079dc} - - - {6ed14268-7950-426b-a6c8-b05a86890ab1} - - - {09f64b14-f65d-4d7a-809a-29c3792f46b7} - - - {ffbc93f2-916d-43ca-9416-06c87734a668} - - - {32ee8bb2-1b7b-4826-b50d-66e7f90fbe34} - - - {a8482038-01a5-4790-bd4a-1d857be47fec} - - - {fa7c79fd-7b14-4aea-ba1b-6b9ad50e2e2d} - - - {db211c8f-878a-41b0-9e48-53a7bd45b2cd} - - - {00ac797c-cdfe-4dd5-b0d0-feea5cf4b3f0} - - - {ef5ce424-fc18-4a60-8093-9f1ea328d52d} - - - {e9794e29-e01f-476a-b5b0-ee65be0c2132} - - - {59047d4e-bd68-42a9-9309-7e624c42a9b0} - - - {110b921c-f4d4-4f37-bdf3-01a7a2538693} - - - {665bb14f-e709-4b3b-8ac3-3bf3a94b686f} - - - {9c0a2a3e-eb78-47b0-9768-ef0dfc6e23d9} - - - {71886495-7c6c-42c4-8a3e-4d0a93def203} - - - {515441cb-c92a-4003-80ae-9cce02ed4c09} - - - {59f2f054-075b-4f91-8434-b9bc6d02f8a9} - - - {1ad60877-d2c7-4061-8cb9-fd5f220bbc20} - - - {d29fdc4f-a128-4f49-ae88-61ae7f63ffb2} - - - {907687c4-8f5f-4cf3-ae43-6ee1a22571de} - - - {5d57a631-556c-4b0c-a417-de68ea3f1aeb} - - - {1bbb02e6-b984-4ca8-8ea2-0e0ae41c09e9} - - - {ea02acda-0ec0-41b8-8e85-19fbf1b71687} - - - {f0c7bb59-bb71-42fc-8275-aaed17decfb0} - - - {60844487-77c9-46e6-b54e-39d7c7139ec3} - - - {28b544d5-54dd-449c-b2c6-62f92ee68f94} - - - {6f757782-30a7-47bb-b9c1-9197250c52d3} - - - {40a76071-eda0-455b-a482-b5a37ffd0b9a} - - - {a38b8ef3-6882-4a35-850c-9380db4b7d8b} - - - {ec6d5b4b-fcf5-4a4a-9e90-c1b548939c42} - - - {128755f3-1063-45aa-b4ad-6f796da5b60c} - - - {52dde893-fa0a-4f27-8c92-e758a206d626} - - - {fee75e70-8621-4511-a6a0-50a32ca0b45b} - - - {f89473da-f4fc-4aae-9fa4-2f8c361c06f1} - - - {19f29f26-70d7-41d6-a8aa-3bcd7fd7448a} - - - {e5121ac0-03cc-416a-a403-1040fdbd6559} - - - {1a7b3c9d-d60e-4b82-b146-4cb3ef47ce7f} - - - {7a7cb161-16b5-4b1c-97c3-7cdbf33a4013} - - - {9378befb-ab93-48c0-9be3-df72edda5370} - - - {9af092ac-23f9-4829-aaf8-7409e3196a33} - - - {06f76446-a7b0-457b-8e4b-341d222f57ac} - - - {03e890a9-85f6-4148-bc85-d29640ba1250} - - - {b16bd65c-3280-498f-b7a0-b51525a49971} - - - {4e83f3e5-e513-4f4e-b3c2-1d0954b7d9b9} - - - {14d22125-f7e7-47b8-9334-da6486ee9182} - - - {570d80b8-a7cf-4092-9bdd-f74ff73ec221} - - - {9793912a-a80c-4122-8d10-1edb0ea86a09} - - - {b7d7eace-f782-44ad-874d-754aaf8bcd0b} - - - {2f17bf3b-a264-4c07-a053-633bbe4112b1} - - - {2d764bf9-ddee-4319-b946-66b87e3e2328} - - - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - UUID\Source Files - - - UUID\Source Files - - - UUID\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - URI\Source Files - - - URI\Source Files - - - URI\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Tasks\Source Files - - - Tasks\Source Files - - - Tasks\Source Files - - - Event\Source Files - - - Event\Source Files - - - Event\Source Files - - - Event\Source Files - - - Event\Source Files - - - Cache\Source Files - - - Cache\Source Files - - - Cache\Source Files - - - Cache\Source Files - - - Cache\Source Files - - - Cache\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Core\Source Files - - - Filesystem\Source Files - - - Dynamic\Source Files - - - Core\Source Files - - - Streams\Source Files - - - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - UUID\Header Files - - - UUID\Header Files - - - UUID\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - URI\Header Files - - - URI\Header Files - - - URI\Header Files - - - _Suite\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Tasks\Header Files - - - Tasks\Header Files - - - Tasks\Header Files - - - Event\Header Files - - - Event\Header Files - - - Event\Header Files - - - Event\Header Files - - - Event\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Core\Header Files - - - Filesystem\Header Files - - - Dynamic\Header Files - - - Core\Source Files - - - Streams\Header Files - - + + + + + {a59b5185-a828-49a5-af23-d86b47d2c19c} + + + {1e6128ad-7c36-4a4d-ad5c-c604171281c1} + + + {7abaf643-e5e3-4023-bbe8-8b8febe849dd} + + + {87d01d31-9117-4d34-9d22-7babfd7b7bff} + + + {f6aad27f-31ed-496c-97ce-9c7d153d166d} + + + {d83da1d6-0738-4a6b-a7f7-fd79ac9ae23c} + + + {0ed8b0f5-8c2f-4c45-b211-e0144659fcb6} + + + {81f46737-5924-42f1-96dd-e809506231bd} + + + {a0215363-3aef-44fa-b1a5-153f868079dc} + + + {6ed14268-7950-426b-a6c8-b05a86890ab1} + + + {09f64b14-f65d-4d7a-809a-29c3792f46b7} + + + {ffbc93f2-916d-43ca-9416-06c87734a668} + + + {32ee8bb2-1b7b-4826-b50d-66e7f90fbe34} + + + {a8482038-01a5-4790-bd4a-1d857be47fec} + + + {fa7c79fd-7b14-4aea-ba1b-6b9ad50e2e2d} + + + {db211c8f-878a-41b0-9e48-53a7bd45b2cd} + + + {00ac797c-cdfe-4dd5-b0d0-feea5cf4b3f0} + + + {ef5ce424-fc18-4a60-8093-9f1ea328d52d} + + + {e9794e29-e01f-476a-b5b0-ee65be0c2132} + + + {59047d4e-bd68-42a9-9309-7e624c42a9b0} + + + {110b921c-f4d4-4f37-bdf3-01a7a2538693} + + + {665bb14f-e709-4b3b-8ac3-3bf3a94b686f} + + + {9c0a2a3e-eb78-47b0-9768-ef0dfc6e23d9} + + + {71886495-7c6c-42c4-8a3e-4d0a93def203} + + + {515441cb-c92a-4003-80ae-9cce02ed4c09} + + + {59f2f054-075b-4f91-8434-b9bc6d02f8a9} + + + {1ad60877-d2c7-4061-8cb9-fd5f220bbc20} + + + {d29fdc4f-a128-4f49-ae88-61ae7f63ffb2} + + + {907687c4-8f5f-4cf3-ae43-6ee1a22571de} + + + {5d57a631-556c-4b0c-a417-de68ea3f1aeb} + + + {1bbb02e6-b984-4ca8-8ea2-0e0ae41c09e9} + + + {ea02acda-0ec0-41b8-8e85-19fbf1b71687} + + + {f0c7bb59-bb71-42fc-8275-aaed17decfb0} + + + {60844487-77c9-46e6-b54e-39d7c7139ec3} + + + {28b544d5-54dd-449c-b2c6-62f92ee68f94} + + + {6f757782-30a7-47bb-b9c1-9197250c52d3} + + + {40a76071-eda0-455b-a482-b5a37ffd0b9a} + + + {a38b8ef3-6882-4a35-850c-9380db4b7d8b} + + + {ec6d5b4b-fcf5-4a4a-9e90-c1b548939c42} + + + {128755f3-1063-45aa-b4ad-6f796da5b60c} + + + {52dde893-fa0a-4f27-8c92-e758a206d626} + + + {fee75e70-8621-4511-a6a0-50a32ca0b45b} + + + {f89473da-f4fc-4aae-9fa4-2f8c361c06f1} + + + {19f29f26-70d7-41d6-a8aa-3bcd7fd7448a} + + + {e5121ac0-03cc-416a-a403-1040fdbd6559} + + + {1a7b3c9d-d60e-4b82-b146-4cb3ef47ce7f} + + + {7a7cb161-16b5-4b1c-97c3-7cdbf33a4013} + + + {9378befb-ab93-48c0-9be3-df72edda5370} + + + {9af092ac-23f9-4829-aaf8-7409e3196a33} + + + {06f76446-a7b0-457b-8e4b-341d222f57ac} + + + {03e890a9-85f6-4148-bc85-d29640ba1250} + + + {b16bd65c-3280-498f-b7a0-b51525a49971} + + + {4e83f3e5-e513-4f4e-b3c2-1d0954b7d9b9} + + + {14d22125-f7e7-47b8-9334-da6486ee9182} + + + {570d80b8-a7cf-4092-9bdd-f74ff73ec221} + + + {9793912a-a80c-4122-8d10-1edb0ea86a09} + + + {b7d7eace-f782-44ad-874d-754aaf8bcd0b} + + + {2f17bf3b-a264-4c07-a053-633bbe4112b1} + + + {2d764bf9-ddee-4319-b946-66b87e3e2328} + + + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + UUID\Source Files + + + UUID\Source Files + + + UUID\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + URI\Source Files + + + URI\Source Files + + + URI\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Tasks\Source Files + + + Tasks\Source Files + + + Tasks\Source Files + + + Event\Source Files + + + Event\Source Files + + + Event\Source Files + + + Event\Source Files + + + Event\Source Files + + + Cache\Source Files + + + Cache\Source Files + + + Cache\Source Files + + + Cache\Source Files + + + Cache\Source Files + + + Cache\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Core\Source Files + + + Filesystem\Source Files + + + Dynamic\Source Files + + + Core\Source Files + + + Streams\Source Files + + + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + UUID\Header Files + + + UUID\Header Files + + + UUID\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + URI\Header Files + + + URI\Header Files + + + URI\Header Files + + + _Suite\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Tasks\Header Files + + + Tasks\Header Files + + + Tasks\Header Files + + + Event\Header Files + + + Event\Header Files + + + Event\Header Files + + + Event\Header Files + + + Event\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Core\Header Files + + + Filesystem\Header Files + + + Dynamic\Header Files + + + Core\Source Files + + + Streams\Header Files + + \ No newline at end of file diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj index 465518367..e44a6b5ec 100644 --- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,577 +1,577 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {F1EE93DF-347F-4CB3-B191-C4E63F38E972} - Win32Proj - - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - ProgramDatabase - - - CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - - Level3 - - - - - CppUnit.lib;WinTestRunner.lib;PocoFoundation.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - - - Windows - true - true - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - Default - MultiThreadedDLL - false - true - true - true - - - Level3 - - - - - CppUnitmd.lib;WinTestRunnermd.lib;PocoFoundationmd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - - - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - Level3 - ProgramDatabase - - - CppUnitmdd.lib;WinTestRunnermdd.lib;PocoFoundationmdd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - Level3 - ProgramDatabase - - - CppUnitmtd.lib;WinTestRunnermtd.lib;PocoFoundationmtd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - false - Default - MultiThreaded - false - true - true - true - - - Level3 - - - - - CppUnitmt.lib;WinTestRunnermt.lib;PocoFoundationmt.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - - - Windows - true - false - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {F1EE93DF-347F-4CB3-B191-C4E63F38E972} + Win32Proj + + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + ProgramDatabase + + + CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + + Level3 + + + + + CppUnit.lib;WinTestRunner.lib;PocoFoundation.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + + + Windows + true + true + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + Default + MultiThreadedDLL + false + true + true + true + + + Level3 + + + + + CppUnitmd.lib;WinTestRunnermd.lib;PocoFoundationmd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + + + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + + Level3 + ProgramDatabase + + + CppUnitmdd.lib;WinTestRunnermdd.lib;PocoFoundationmdd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + + Level3 + ProgramDatabase + + + CppUnitmtd.lib;WinTestRunnermtd.lib;PocoFoundationmtd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + false + true + true + true + + + Level3 + + + + + CppUnitmt.lib;WinTestRunnermt.lib;PocoFoundationmt.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + + + Windows + true + false + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters index 70a0f7918..e1c5c67b1 100644 --- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,972 +1,972 @@ - - - - - {61761bcd-174d-44c0-a1da-09a3c0fbf3b9} - - - {a4ffaebf-880e-42a1-926a-a34c1d8cfcd7} - - - {5a4f6520-cf4d-4251-b13a-3a686198ae50} - - - {dbcab07d-4ac6-4770-a2b7-e30117e9026a} - - - {d341facd-6c2b-4406-8952-84cee2ff921c} - - - {cbdd7506-5701-4cd7-aafa-6239e9338154} - - - {7c1fea8f-9e19-4775-ad45-52514212eaa5} - - - {45ddfc2d-41dd-4ec3-b1fe-68badc9dc053} - - - {41f6221c-287f-4095-8d68-bf7d43d57986} - - - {5206216b-93f1-4d4b-9bd3-2e569fd14c35} - - - {09f8ec3a-9632-49c0-a73f-8d64bbbe554a} - - - {3658231d-8f2d-40ec-982f-a819f16e14ef} - - - {66b741e5-c5d7-4918-b5d9-f7e123541fcc} - - - {90b4814d-e820-4e7e-9478-e3b1a8b29425} - - - {db7fa0c6-ead3-4c4f-a183-c35ced9c94e2} - - - {3e366905-3992-407b-8490-26bf9683b753} - - - {8230d159-b383-46e6-9343-c5994eeb0023} - - - {98980fff-4121-45a6-abbe-44f9decca606} - - - {b1055477-4a46-4f4d-9bd9-dc62158af7eb} - - - {3740e219-0bf8-488c-8a6a-e41f0c7f7084} - - - {b60a9646-1ae9-4f3a-9f56-5fdf2966be4a} - - - {20c8773e-2f4a-4ae8-82b8-e43b2af181b2} - - - {120e0d1a-fd1f-4676-a6a4-60bd0a092353} - - - {6c7e9ef2-8efb-4fd9-b8c9-426816ae09dc} - - - {57dd2c28-dc2c-4d4a-8ac3-06d6cc28f628} - - - {ff262ea5-7e9b-46a9-a78c-71cd456df4de} - - - {5c8f9e34-d180-4044-8426-9a9a80ab9c16} - - - {a14ac415-611f-406d-975a-587107bd148e} - - - {5444d0b1-31a5-45f6-91fb-b10fa497f9d7} - - - {b0970c59-85a1-493e-8bd7-a8d4b3d73479} - - - {c09a0d17-1c4c-41bf-bb88-1affba28cc9f} - - - {a313536b-447f-411b-8812-d317b6ccbed7} - - - {4b333bdb-c5b6-4a74-8802-17eb7ebe96ae} - - - {b93abf82-5fe8-4f89-afd0-d509104a3c15} - - - {1998a2d4-8c6b-45f9-a986-43361e74c95f} - - - {23262db9-954d-4d00-89ad-e83fa36ce0f5} - - - {e7b43808-e473-41f5-ab75-74fe4e94c064} - - - {f0c7e064-edba-4de8-a3f4-81bf3bc63440} - - - {276cd6b2-6fcb-48d5-ab6a-e5d26586e77b} - - - {8d108b96-f5ff-48e0-bd6a-68d8bbc709d8} - - - {c0434fd2-8b90-415d-9ee0-f8b0d8f798bf} - - - {4fae28d6-ef01-4587-b717-bf048c803d93} - - - {7c1f0e20-c68e-41d0-86a1-3f34951f3e1f} - - - {e6357d2f-1c39-4c9e-b3c4-5118be69ad0f} - - - {aaf605d7-11e6-4aab-bc57-ddd5e65ad44c} - - - {559701bf-59bd-46f9-ad12-ba7aec09600f} - - - {f0ed8757-4994-4627-b76b-4c3367476137} - - - {93d2c47c-068b-4866-a654-7309b68ccc38} - - - {57405867-eeac-4bf4-8bdf-9b614f02b562} - - - {4bd2879b-4e23-446c-95c9-1a1628774c45} - - - {08de05ff-958a-4146-bafe-8c38c6ee1a76} - - - {fad494e5-26da-4b47-8f4e-81aa0c19e0f7} - - - {cf174669-73a2-4f48-8bbb-ec5ea1c09f4b} - - - {4c661a1b-1281-42e9-bfd8-f86d3e7d4daf} - - - {a1adc868-69d4-4d26-a361-238b35a6cf93} - - - {009defb4-dc35-4ac4-88aa-5b9cd342110b} - - - {2d58ce37-9daa-4359-a602-06de87c1d4eb} - - - {896a3ce9-b004-4ea8-aa48-ab1b4db9d863} - - - {a38a83b0-a188-4e99-b3a9-37453c6a9559} - - - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Core\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Streams\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Crypt\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Notifications\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - Threading\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - SharedLibrary\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - Filesystem\Source Files - - - UUID\Source Files - - - UUID\Source Files - - - UUID\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - DateTime\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - URI\Source Files - - - URI\Source Files - - - URI\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Processes\Source Files - - - Tasks\Source Files - - - Tasks\Source Files - - - Tasks\Source Files - - - Event\Source Files - - - Event\Source Files - - - Event\Source Files - - - Event\Source Files - - - Event\Source Files - - - Cache\Source Files - - - Cache\Source Files - - - Cache\Source Files - - - Cache\Source Files - - - Cache\Source Files - - - Cache\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Hashing\Source Files - - - Core\Source Files - - - Filesystem\Source Files - - - Dynamic\Source Files - - - Streams\Source Files - - - Core\Source Files - - - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Streams\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Crypt\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Notifications\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - Threading\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - SharedLibrary\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - - UUID\Header Files - - - UUID\Header Files - - - UUID\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - DateTime\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - Text\Header Files - - - URI\Header Files - - - URI\Header Files - - - URI\Header Files - - - _Suite\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Processes\Header Files - - - Tasks\Header Files - - - Tasks\Header Files - - - Tasks\Header Files - - - Event\Header Files - - - Event\Header Files - - - Event\Header Files - - - Event\Header Files - - - Event\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Cache\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Hashing\Header Files - - - Core\Header Files - - - Filesystem\Header Files - - - Dynamic\Header Files - - - Streams\Header Files - - - Core\Header Files - - + + + + + {61761bcd-174d-44c0-a1da-09a3c0fbf3b9} + + + {a4ffaebf-880e-42a1-926a-a34c1d8cfcd7} + + + {5a4f6520-cf4d-4251-b13a-3a686198ae50} + + + {dbcab07d-4ac6-4770-a2b7-e30117e9026a} + + + {d341facd-6c2b-4406-8952-84cee2ff921c} + + + {cbdd7506-5701-4cd7-aafa-6239e9338154} + + + {7c1fea8f-9e19-4775-ad45-52514212eaa5} + + + {45ddfc2d-41dd-4ec3-b1fe-68badc9dc053} + + + {41f6221c-287f-4095-8d68-bf7d43d57986} + + + {5206216b-93f1-4d4b-9bd3-2e569fd14c35} + + + {09f8ec3a-9632-49c0-a73f-8d64bbbe554a} + + + {3658231d-8f2d-40ec-982f-a819f16e14ef} + + + {66b741e5-c5d7-4918-b5d9-f7e123541fcc} + + + {90b4814d-e820-4e7e-9478-e3b1a8b29425} + + + {db7fa0c6-ead3-4c4f-a183-c35ced9c94e2} + + + {3e366905-3992-407b-8490-26bf9683b753} + + + {8230d159-b383-46e6-9343-c5994eeb0023} + + + {98980fff-4121-45a6-abbe-44f9decca606} + + + {b1055477-4a46-4f4d-9bd9-dc62158af7eb} + + + {3740e219-0bf8-488c-8a6a-e41f0c7f7084} + + + {b60a9646-1ae9-4f3a-9f56-5fdf2966be4a} + + + {20c8773e-2f4a-4ae8-82b8-e43b2af181b2} + + + {120e0d1a-fd1f-4676-a6a4-60bd0a092353} + + + {6c7e9ef2-8efb-4fd9-b8c9-426816ae09dc} + + + {57dd2c28-dc2c-4d4a-8ac3-06d6cc28f628} + + + {ff262ea5-7e9b-46a9-a78c-71cd456df4de} + + + {5c8f9e34-d180-4044-8426-9a9a80ab9c16} + + + {a14ac415-611f-406d-975a-587107bd148e} + + + {5444d0b1-31a5-45f6-91fb-b10fa497f9d7} + + + {b0970c59-85a1-493e-8bd7-a8d4b3d73479} + + + {c09a0d17-1c4c-41bf-bb88-1affba28cc9f} + + + {a313536b-447f-411b-8812-d317b6ccbed7} + + + {4b333bdb-c5b6-4a74-8802-17eb7ebe96ae} + + + {b93abf82-5fe8-4f89-afd0-d509104a3c15} + + + {1998a2d4-8c6b-45f9-a986-43361e74c95f} + + + {23262db9-954d-4d00-89ad-e83fa36ce0f5} + + + {e7b43808-e473-41f5-ab75-74fe4e94c064} + + + {f0c7e064-edba-4de8-a3f4-81bf3bc63440} + + + {276cd6b2-6fcb-48d5-ab6a-e5d26586e77b} + + + {8d108b96-f5ff-48e0-bd6a-68d8bbc709d8} + + + {c0434fd2-8b90-415d-9ee0-f8b0d8f798bf} + + + {4fae28d6-ef01-4587-b717-bf048c803d93} + + + {7c1f0e20-c68e-41d0-86a1-3f34951f3e1f} + + + {e6357d2f-1c39-4c9e-b3c4-5118be69ad0f} + + + {aaf605d7-11e6-4aab-bc57-ddd5e65ad44c} + + + {559701bf-59bd-46f9-ad12-ba7aec09600f} + + + {f0ed8757-4994-4627-b76b-4c3367476137} + + + {93d2c47c-068b-4866-a654-7309b68ccc38} + + + {57405867-eeac-4bf4-8bdf-9b614f02b562} + + + {4bd2879b-4e23-446c-95c9-1a1628774c45} + + + {08de05ff-958a-4146-bafe-8c38c6ee1a76} + + + {fad494e5-26da-4b47-8f4e-81aa0c19e0f7} + + + {cf174669-73a2-4f48-8bbb-ec5ea1c09f4b} + + + {4c661a1b-1281-42e9-bfd8-f86d3e7d4daf} + + + {a1adc868-69d4-4d26-a361-238b35a6cf93} + + + {009defb4-dc35-4ac4-88aa-5b9cd342110b} + + + {2d58ce37-9daa-4359-a602-06de87c1d4eb} + + + {896a3ce9-b004-4ea8-aa48-ab1b4db9d863} + + + {a38a83b0-a188-4e99-b3a9-37453c6a9559} + + + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Core\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Streams\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Crypt\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Notifications\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + Threading\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + SharedLibrary\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + Filesystem\Source Files + + + UUID\Source Files + + + UUID\Source Files + + + UUID\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + DateTime\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + Text\Source Files + + + URI\Source Files + + + URI\Source Files + + + URI\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Processes\Source Files + + + Tasks\Source Files + + + Tasks\Source Files + + + Tasks\Source Files + + + Event\Source Files + + + Event\Source Files + + + Event\Source Files + + + Event\Source Files + + + Event\Source Files + + + Cache\Source Files + + + Cache\Source Files + + + Cache\Source Files + + + Cache\Source Files + + + Cache\Source Files + + + Cache\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Hashing\Source Files + + + Core\Source Files + + + Filesystem\Source Files + + + Dynamic\Source Files + + + Streams\Source Files + + + Core\Source Files + + + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Core\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Streams\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Crypt\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Notifications\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + Threading\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + SharedLibrary\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + Filesystem\Header Files + + + UUID\Header Files + + + UUID\Header Files + + + UUID\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + DateTime\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + Text\Header Files + + + URI\Header Files + + + URI\Header Files + + + URI\Header Files + + + _Suite\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Processes\Header Files + + + Tasks\Header Files + + + Tasks\Header Files + + + Tasks\Header Files + + + Event\Header Files + + + Event\Header Files + + + Event\Header Files + + + Event\Header Files + + + Event\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Cache\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Hashing\Header Files + + + Core\Header Files + + + Filesystem\Header Files + + + Dynamic\Header Files + + + Streams\Header Files + + + Core\Header Files + + \ No newline at end of file diff --git a/Foundation/testsuite/src/DigestStreamTest.cpp b/Foundation/testsuite/src/DigestStreamTest.cpp index fe28fb3d4..6ddad1586 100644 --- a/Foundation/testsuite/src/DigestStreamTest.cpp +++ b/Foundation/testsuite/src/DigestStreamTest.cpp @@ -1,7 +1,8 @@ // // DigestStreamTest.cpp // -// $Id: //poco/1.4/Foundation/testsuite/src/DigestStreamTest.cpp#1 $ +// $Id: //poco/1.4/Foundation/testsuite/src/DigestStreamTest.cpp#1 $ + // // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. // and Contributors. @@ -95,10 +96,10 @@ void DigestStreamTest::testOutputStream2() void DigestStreamTest::testToFromHex() { - std::string digest("c3fcd3d76192e4007dfb496cca67e13b"); - Poco::DigestEngine::Digest dig = DigestEngine::digestFromHex(digest); - std::string digest2 = DigestEngine::digestToHex(dig); - assert (digest == digest2); + std::string digest("c3fcd3d76192e4007dfb496cca67e13b"); + Poco::DigestEngine::Digest dig = DigestEngine::digestFromHex(digest); + std::string digest2 = DigestEngine::digestToHex(dig); + assert (digest == digest2); } @@ -116,10 +117,10 @@ CppUnit::Test* DigestStreamTest::suite() { CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("DigestStreamTest"); - CppUnit_addTest(pSuite, DigestStreamTest, testInputStream); - CppUnit_addTest(pSuite, DigestStreamTest, testOutputStream1); - CppUnit_addTest(pSuite, DigestStreamTest, testOutputStream2); - CppUnit_addTest(pSuite, DigestStreamTest, testToFromHex); - - return pSuite; + CppUnit_addTest(pSuite, DigestStreamTest, testInputStream); + CppUnit_addTest(pSuite, DigestStreamTest, testOutputStream1); + CppUnit_addTest(pSuite, DigestStreamTest, testOutputStream2); + CppUnit_addTest(pSuite, DigestStreamTest, testToFromHex); + + return pSuite; } diff --git a/Foundation/testsuite/src/FIFOBufferStreamTest.cpp b/Foundation/testsuite/src/FIFOBufferStreamTest.cpp index b62b13c4e..98890af3e 100644 --- a/Foundation/testsuite/src/FIFOBufferStreamTest.cpp +++ b/Foundation/testsuite/src/FIFOBufferStreamTest.cpp @@ -1,224 +1,224 @@ -// -// FIFOBufferStreamTest.cpp -// -// $Id: //poco/1.4/Foundation/testsuite/src/FIFOBufferStreamTest.cpp#2 $ -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "FIFOBufferStreamTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" -#include "Poco/FIFOBuffer.h" -#include "Poco/FIFOBufferStream.h" -#include "Poco/Delegate.h" - - -using Poco::FIFOBuffer; -using Poco::FIFOBufferStream; -using Poco::delegate; - - -FIFOBufferStreamTest::FIFOBufferStreamTest(const std::string& name): CppUnit::TestCase(name) -{ -} - - -FIFOBufferStreamTest::~FIFOBufferStreamTest() -{ -} - - -void FIFOBufferStreamTest::testInput() -{ - const char* data = "This is a test"; - FIFOBuffer fb1(data, 14); - FIFOBufferStream str1(fb1); - assert (str1.rdbuf()->fifoBuffer().isFull()); - - int c = str1.get(); - assert (c == 'T'); - c = str1.get(); - assert (c == 'h'); - - std::string str; - str1 >> str; - assert (str == "is"); - - char buffer[32]; - str1.read(buffer, sizeof(buffer)); - assert (str1.gcount() == 10); - buffer[str1.gcount()] = 0; - assert (std::string(" is a test") == buffer); - - const char* data2 = "123"; - FIFOBufferStream str2(data2, 3); - - c = str2.get(); - assert (c == '1'); - assert (str2.good()); - c = str2.get(); - assert (c == '2'); - str2.unget(); - c = str2.get(); - assert (c == '2'); - assert (str2.good()); - c = str2.get(); - assert (c == '3'); - assert (str2.good()); - c = str2.get(); - assert (c == -1); - assert (str2.eof()); -} - - -void FIFOBufferStreamTest::testOutput() -{ - char output[64]; - FIFOBufferStream iostr1(output, 64); - iostr1 << "This is a test " << 42 << std::ends << std::flush; - assert (std::string("This is a test 42") == output); -} - - -void FIFOBufferStreamTest::testNotify() -{ - FIFOBuffer fb(18); - FIFOBufferStream iostr(fb); - assert (iostr.rdbuf()->fifoBuffer().isEmpty()); - - assert (0 == _readableToNot); - assert (0 == _notToReadable); - assert (0 == _writableToNot); - assert (0 == _notToWritable); - - iostr.readable += delegate(this, &FIFOBufferStreamTest::onReadable); - iostr.writable += delegate(this, &FIFOBufferStreamTest::onWritable); - - iostr << "This is a test " << 42 << std::ends << std::flush; - assert (iostr.rdbuf()->fifoBuffer().isFull()); - - assert (0 == _readableToNot); - assert (1 == _notToReadable); - assert (1 == _writableToNot); - assert (0 == _notToWritable); - - char input[64]; - iostr >> input; - assert (std::string("This") == input); - assert (iostr.rdbuf()->fifoBuffer().isEmpty()); - - assert (1 == _readableToNot); - assert (1 == _notToReadable); - assert (1 == _writableToNot); - assert (1 == _notToWritable); - - iostr >> input; - assert (std::string("is") == input); - - assert (1 == _readableToNot); - assert (1 == _notToReadable); - assert (1 == _writableToNot); - assert (1 == _notToWritable); - - iostr >> input; - assert (std::string("a") == input); - - assert (1 == _readableToNot); - assert (1 == _notToReadable); - assert (1 == _writableToNot); - assert (1 == _notToWritable); - - iostr >> input; - assert (std::string("test") == input); - - assert (1 == _readableToNot); - assert (1 == _notToReadable); - assert (1 == _writableToNot); - assert (1 == _notToWritable); - - iostr >> input; - assert (std::string("42") == input); - - assert (1 == _readableToNot); - assert (1 == _notToReadable); - assert (1 == _writableToNot); - assert (1 == _notToWritable); - - iostr.clear(); - assert (iostr.good()); - iostr << "This is a test " << 42 << std::ends << std::flush; - assert (iostr.rdbuf()->fifoBuffer().isFull()); - - assert (1 == _readableToNot); - assert (2 == _notToReadable); - assert (2 == _writableToNot); - assert (1 == _notToWritable); - - iostr.readable -= delegate(this, &FIFOBufferStreamTest::onReadable); - iostr.writable -= delegate(this, &FIFOBufferStreamTest::onWritable); -} - - -void FIFOBufferStreamTest::onReadable(bool& b) -{ - if (b) ++_notToReadable; - else ++_readableToNot; -}; - - -void FIFOBufferStreamTest::onWritable(bool& b) -{ - if (b) ++_notToWritable; - else ++_writableToNot; -} - - -void FIFOBufferStreamTest::setUp() -{ - _readableToNot = 0; - _notToReadable = 0; - _writableToNot = 0; - _notToWritable = 0; -} - - -void FIFOBufferStreamTest::tearDown() -{ -} - - -CppUnit::Test* FIFOBufferStreamTest::suite() -{ - CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("FIFOBufferStreamTest"); - - CppUnit_addTest(pSuite, FIFOBufferStreamTest, testInput); - CppUnit_addTest(pSuite, FIFOBufferStreamTest, testOutput); - CppUnit_addTest(pSuite, FIFOBufferStreamTest, testNotify); - - return pSuite; -} +// +// FIFOBufferStreamTest.cpp +// +// $Id: //poco/1.4/Foundation/testsuite/src/FIFOBufferStreamTest.cpp#2 $ +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "FIFOBufferStreamTest.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" +#include "Poco/FIFOBuffer.h" +#include "Poco/FIFOBufferStream.h" +#include "Poco/Delegate.h" + + +using Poco::FIFOBuffer; +using Poco::FIFOBufferStream; +using Poco::delegate; + + +FIFOBufferStreamTest::FIFOBufferStreamTest(const std::string& name): CppUnit::TestCase(name) +{ +} + + +FIFOBufferStreamTest::~FIFOBufferStreamTest() +{ +} + + +void FIFOBufferStreamTest::testInput() +{ + const char* data = "This is a test"; + FIFOBuffer fb1(data, 14); + FIFOBufferStream str1(fb1); + assert (str1.rdbuf()->fifoBuffer().isFull()); + + int c = str1.get(); + assert (c == 'T'); + c = str1.get(); + assert (c == 'h'); + + std::string str; + str1 >> str; + assert (str == "is"); + + char buffer[32]; + str1.read(buffer, sizeof(buffer)); + assert (str1.gcount() == 10); + buffer[str1.gcount()] = 0; + assert (std::string(" is a test") == buffer); + + const char* data2 = "123"; + FIFOBufferStream str2(data2, 3); + + c = str2.get(); + assert (c == '1'); + assert (str2.good()); + c = str2.get(); + assert (c == '2'); + str2.unget(); + c = str2.get(); + assert (c == '2'); + assert (str2.good()); + c = str2.get(); + assert (c == '3'); + assert (str2.good()); + c = str2.get(); + assert (c == -1); + assert (str2.eof()); +} + + +void FIFOBufferStreamTest::testOutput() +{ + char output[64]; + FIFOBufferStream iostr1(output, 64); + iostr1 << "This is a test " << 42 << std::ends << std::flush; + assert (std::string("This is a test 42") == output); +} + + +void FIFOBufferStreamTest::testNotify() +{ + FIFOBuffer fb(18); + FIFOBufferStream iostr(fb); + assert (iostr.rdbuf()->fifoBuffer().isEmpty()); + + assert (0 == _readableToNot); + assert (0 == _notToReadable); + assert (0 == _writableToNot); + assert (0 == _notToWritable); + + iostr.readable += delegate(this, &FIFOBufferStreamTest::onReadable); + iostr.writable += delegate(this, &FIFOBufferStreamTest::onWritable); + + iostr << "This is a test " << 42 << std::ends << std::flush; + assert (iostr.rdbuf()->fifoBuffer().isFull()); + + assert (0 == _readableToNot); + assert (1 == _notToReadable); + assert (1 == _writableToNot); + assert (0 == _notToWritable); + + char input[64]; + iostr >> input; + assert (std::string("This") == input); + assert (iostr.rdbuf()->fifoBuffer().isEmpty()); + + assert (1 == _readableToNot); + assert (1 == _notToReadable); + assert (1 == _writableToNot); + assert (1 == _notToWritable); + + iostr >> input; + assert (std::string("is") == input); + + assert (1 == _readableToNot); + assert (1 == _notToReadable); + assert (1 == _writableToNot); + assert (1 == _notToWritable); + + iostr >> input; + assert (std::string("a") == input); + + assert (1 == _readableToNot); + assert (1 == _notToReadable); + assert (1 == _writableToNot); + assert (1 == _notToWritable); + + iostr >> input; + assert (std::string("test") == input); + + assert (1 == _readableToNot); + assert (1 == _notToReadable); + assert (1 == _writableToNot); + assert (1 == _notToWritable); + + iostr >> input; + assert (std::string("42") == input); + + assert (1 == _readableToNot); + assert (1 == _notToReadable); + assert (1 == _writableToNot); + assert (1 == _notToWritable); + + iostr.clear(); + assert (iostr.good()); + iostr << "This is a test " << 42 << std::ends << std::flush; + assert (iostr.rdbuf()->fifoBuffer().isFull()); + + assert (1 == _readableToNot); + assert (2 == _notToReadable); + assert (2 == _writableToNot); + assert (1 == _notToWritable); + + iostr.readable -= delegate(this, &FIFOBufferStreamTest::onReadable); + iostr.writable -= delegate(this, &FIFOBufferStreamTest::onWritable); +} + + +void FIFOBufferStreamTest::onReadable(bool& b) +{ + if (b) ++_notToReadable; + else ++_readableToNot; +}; + + +void FIFOBufferStreamTest::onWritable(bool& b) +{ + if (b) ++_notToWritable; + else ++_writableToNot; +} + + +void FIFOBufferStreamTest::setUp() +{ + _readableToNot = 0; + _notToReadable = 0; + _writableToNot = 0; + _notToWritable = 0; +} + + +void FIFOBufferStreamTest::tearDown() +{ +} + + +CppUnit::Test* FIFOBufferStreamTest::suite() +{ + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("FIFOBufferStreamTest"); + + CppUnit_addTest(pSuite, FIFOBufferStreamTest, testInput); + CppUnit_addTest(pSuite, FIFOBufferStreamTest, testOutput); + CppUnit_addTest(pSuite, FIFOBufferStreamTest, testNotify); + + return pSuite; +} diff --git a/Foundation/testsuite/src/FIFOBufferStreamTest.h b/Foundation/testsuite/src/FIFOBufferStreamTest.h index 11d1cd4e5..69ecc254c 100644 --- a/Foundation/testsuite/src/FIFOBufferStreamTest.h +++ b/Foundation/testsuite/src/FIFOBufferStreamTest.h @@ -1,70 +1,70 @@ -// -// FIFOBufferStreamTest.h -// -// $Id: //poco/1.4/Foundation/testsuite/src/FIFOBufferStreamTest.h#1 $ -// -// Definition of the FIFOBufferStreamTest class. -// -// Copyright (c) 2009, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef FIFOBufferStreamTest_INCLUDED -#define FIFOBufferStreamTest_INCLUDED - - -#include "Poco/Foundation.h" -#include "CppUnit/TestCase.h" - - -class FIFOBufferStreamTest: public CppUnit::TestCase -{ -public: - FIFOBufferStreamTest(const std::string& name); - ~FIFOBufferStreamTest(); - - void testInput(); - void testOutput(); - void testNotify(); - - void setUp(); - void tearDown(); - - static CppUnit::Test* suite(); - -protected: - void onReadable(bool& b); - void onWritable(bool& b); - -private: - int _readableToNot; - int _notToReadable; - int _writableToNot; - int _notToWritable; -}; - - -#endif // FIFOBufferStreamTest_INCLUDED +// +// FIFOBufferStreamTest.h +// +// $Id: //poco/1.4/Foundation/testsuite/src/FIFOBufferStreamTest.h#1 $ +// +// Definition of the FIFOBufferStreamTest class. +// +// Copyright (c) 2009, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef FIFOBufferStreamTest_INCLUDED +#define FIFOBufferStreamTest_INCLUDED + + +#include "Poco/Foundation.h" +#include "CppUnit/TestCase.h" + + +class FIFOBufferStreamTest: public CppUnit::TestCase +{ +public: + FIFOBufferStreamTest(const std::string& name); + ~FIFOBufferStreamTest(); + + void testInput(); + void testOutput(); + void testNotify(); + + void setUp(); + void tearDown(); + + static CppUnit::Test* suite(); + +protected: + void onReadable(bool& b); + void onWritable(bool& b); + +private: + int _readableToNot; + int _notToReadable; + int _writableToNot; + int _notToWritable; +}; + + +#endif // FIFOBufferStreamTest_INCLUDED diff --git a/Foundation/testsuite/src/VarTest.cpp b/Foundation/testsuite/src/VarTest.cpp index 398db810f..86989cfb8 100644 --- a/Foundation/testsuite/src/VarTest.cpp +++ b/Foundation/testsuite/src/VarTest.cpp @@ -1,2513 +1,2514 @@ -// -// VarTest.cpp -// -// $Id: //poco/svn/Foundation/testsuite/src/VarTest.cpp#2 $ -// -// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "VarTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" -#include "Poco/Exception.h" -#include "Poco/Dynamic/Var.h" -#include "Poco/Bugcheck.h" -#include "Poco/Dynamic/Struct.h" -#include "Poco/Dynamic/Pair.h" -#include -#include - -#if defined(_MSC_VER) && _MSC_VER < 1400 - #pragma warning(disable:4800)//forcing value to bool 'true' or 'false' -#endif - - -using namespace Poco; -using namespace Poco::Dynamic; - - -class Dummy -{ -public: - Dummy(): _val(0) - { - } - - Dummy(int val): _val(val) - { - } - - operator int () const - { - return _val; - } - - bool operator == (int i) - { - return i == _val; - } - -private: - int _val; -}; - - -VarTest::VarTest(const std::string& name): CppUnit::TestCase(name) -{ -} - - -VarTest::~VarTest() -{ -} - - -void VarTest::testInt8() -{ - Poco::Int8 src = 32; - Var a1 = src; - - assert (a1.type() == typeid(Poco::Int8)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - Int8 value = a1.extract(); - assert (value == 32); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1; - assert (a3 == 33); - a3 = a1 - 1; - assert (a3 == 31); - a3 += 1; - assert (a3 == 32); - a3 -= 1; - assert (a3 == 31); - a3 = a1 / 2; - assert (a3 == 16); - a3 = a1 * 2; - assert (a3 == 64); - a3 /= 2; - assert (a3 == 32); - a3 *= 2; - assert (a3 == 64); -} - - -void VarTest::testInt16() -{ - Poco::Int16 src = 32; - Var a1 = src; - - assert (a1.type() == typeid(Poco::Int16)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - Int16 value = a1.extract(); - assert (value == 32); - - try - { - Int32 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1; - assert (a3 == 33); - a3 = a1 - 1; - assert (a3 == 31); - a3 += 1; - assert (a3 == 32); - a3 -= 1; - assert (a3 == 31); - a3 = a1 / 2; - assert (a3 == 16); - a3 = a1 * 2; - assert (a3 == 64); - a3 /= 2; - assert (a3 == 32); - a3 *= 2; - assert (a3 == 64); -} - - -void VarTest::testInt32() -{ - Poco::Int32 src = 32; - Var a1 = src; - - assert (a1.type() == typeid(Poco::Int32)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - Int32 value = a1.extract(); - assert (value == 32); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1; - assert (a3 == 33); - a3 = a1 - 1; - assert (a3 == 31); - a3 += 1; - assert (a3 == 32); - a3 -= 1; - assert (a3 == 31); - a3 = a1 / 2; - assert (a3 == 16); - a3 = a1 * 2; - assert (a3 == 64); - a3 /= 2; - assert (a3 == 32); - a3 *= 2; - assert (a3 == 64); -} - - -void VarTest::testInt64() -{ - Poco::Int64 src = 32; - Var a1 = src; - - assert (a1.type() == typeid(Poco::Int64)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - Int64 value = a1.extract(); - assert (value == 32); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1; - assert (a3 == 33); - a3 = a1 - 1; - assert (a3 == 31); - a3 += 1; - assert (a3 == 32); - a3 -= 1; - assert (a3 == 31); - a3 = a1 / 2; - assert (a3 == 16); - a3 = a1 * 2; - assert (a3 == 64); - a3 /= 2; - assert (a3 == 32); - a3 *= 2; - assert (a3 == 64); -} - - -void VarTest::testUInt8() -{ - Poco::UInt8 src = 32; - Var a1 = src; - - assert (a1.type() == typeid(Poco::UInt8)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - UInt8 value = a1.extract(); - assert (value == 32); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1; - assert (a3 == 33); - a3 = a1 - 1; - assert (a3 == 31); - a3 += 1; - assert (a3 == 32); - a3 -= 1; - assert (a3 == 31); - a3 = a1 / 2; - assert (a3 == 16); - a3 = a1 * 2; - assert (a3 == 64); - a3 /= 2; - assert (a3 == 32); - a3 *= 2; - assert (a3 == 64); -} - - -void VarTest::testUInt16() -{ - Poco::UInt16 src = 32; - Var a1 = src; - - assert (a1.type() == typeid(Poco::UInt16)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - UInt16 value = a1.extract(); - assert (value == 32); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1; - assert (a3 == 33); - a3 = a1 - 1; - assert (a3 == 31); - a3 += 1; - assert (a3 == 32); - a3 -= 1; - assert (a3 == 31); - a3 = a1 / 2; - assert (a3 == 16); - a3 = a1 * 2; - assert (a3 == 64); - a3 /= 2; - assert (a3 == 32); - a3 *= 2; - assert (a3 == 64); -} - - -void VarTest::testUInt32() -{ - Poco::UInt32 src = 32; - Var a1 = src; - - assert (a1.type() == typeid(Poco::UInt32)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - UInt32 value = a1.extract(); - assert (value == 32); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1; - assert (a3 == 33); - a3 = a1 - 1; - assert (a3 == 31); - a3 += 1; - assert (a3 == 32); - a3 -= 1; - assert (a3 == 31); - a3 = a1 / 2; - assert (a3 == 16); - a3 = a1 * 2; - assert (a3 == 64); - a3 /= 2; - assert (a3 == 32); - a3 *= 2; - assert (a3 == 64); -} - - -void VarTest::testUInt64() -{ - Poco::UInt64 src = 32; - Var a1 = src; - - assert (a1.type() == typeid(Poco::UInt64)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - UInt64 value = a1.extract(); - assert (value == 32); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1; - assert (a3 == 33); - a3 = a1 - 1; - assert (a3 == 31); - a3 += 1; - assert (a3 == 32); - a3 -= 1; - assert (a3 == 31); - a3 = a1 / 2; - assert (a3 == 16); - a3 = a1 * 2; - assert (a3 == 64); - a3 /= 2; - assert (a3 == 32); - a3 *= 2; - assert (a3 == 64); -} - - -void VarTest::testBool() -{ - bool src = true; - Var a1 = src; - - assert (a1.type() == typeid(bool)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 1); - assert (s15 == 1); - assert (s1 == "true"); - assert (s2 == 1); - assert (s3 == 1); - assert (s4 == 1); - assert (s5 == 1); - assert (s6 == 1); - assert (s7 == 1); - assert (s8 == 1); - assert (s9 == 1); - assert (s10 == 1.0f); - assert (s11 == 1.0); - assert (s12); - assert (s13 == '\x1'); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - bool value = a1.extract(); - assert (value); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } -} - - -void VarTest::testChar() -{ - char src = ' '; - Var a1 = src; - - assert (a1.type() == typeid(char)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == " "); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - char value = a1.extract(); - assert (value == ' '); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } -} - - -void VarTest::testFloat() -{ - Var any("0"); - float f = any; - - float src = 32.0f; - Var a1 = src; - - assert (a1.type() == typeid(float)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - float value = a1.extract(); - assert (value == 32.0f); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1.0f; - assert (a3 == 33.0f); - a3 = a1 - 1.0f; - assert (a3 == 31.0f); - a3 += 1.0f; - assert (a3 == 32.0f); - a3 -= 1.0f; - assert (a3 == 31.0f); - a3 = a1 / 2.0f; - assert (a3 == 16.0f); - a3 = a1 * 2.0f; - assert (a3 == 64.0f); - a3 /= 2.0f; - assert (a3 == 32.0f); - a3 *= 2.0f; - assert (a3 == 64.0f); -} - - -void VarTest::testDouble() -{ - double d = 0; - Var v(d); - float f = v; - - double src = 32.0; - Var a1 = src; - - assert (a1.type() == typeid(double)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - double value = a1.extract(); - assert (value == 32.0); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - - Var a3 = a1 + 1.0; - assert (a3 == 33.0); - a3 = a1 - 1.0; - assert (a3 == 31.0); - a3 += 1.0; - assert (a3 == 32.0); - a3 -= 1.0; - assert (a3 == 31.0); - a3 = a1 / 2.0; - assert (a3 == 16.0); - a3 = a1 * 2.0; - assert (a3 == 64.0); - a3 /= 2.0; - assert (a3 == 32.0); - a3 *= 2.0; - assert (a3 == 64.0); -} - - -void VarTest::testString() -{ - Var a1("32"); - - assert (a1.type() == typeid(std::string)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == '3'); - - const std::string& value = a1.extract(); - assert (value == "32"); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a4(123); - std::string s("456"); - Var a5 = a4 + s; - assert (a5 == "123456"); - a4 += s; - assert (a4 == "123456"); - Var a6 = a4 + "789"; - assert (a6 == "123456789"); - a4 += "789"; - assert (a4 == "123456789"); - - a4 = ""; - assert(!a4); - a4 = "0"; - assert(!a4); - a4 = "FaLsE"; - assert(!a4); -} - - -void VarTest::testLong() -{ - long src = 32; - Var a1 = src; - - assert (a1.type() == typeid(long)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - long value = a1.extract(); - assert (value == 32); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1; - assert (a3 == 33); - a3 = a1 - 1; - assert (a3 == 31); - a3 += 1; - assert (a3 == 32); - a3 -= 1; - assert (a3 == 31); - a3 = a1 / 2; - assert (a3 == 16); - a3 = a1 * 2; - assert (a3 == 64); - a3 /= 2; - assert (a3 == 32); - a3 *= 2; - assert (a3 == 64); -} - - -void VarTest::testULong() -{ - unsigned long src = 32; - Var a1 = src; - - assert (a1.type() == typeid(unsigned long)); - - std::string s1; - Poco::Int8 s2; - Poco::Int16 s3; - Poco::Int32 s4; - Poco::Int64 s5; - Poco::UInt8 s6; - Poco::UInt16 s7; - Poco::UInt32 s8; - Poco::UInt64 s9; - float s10; - double s11; - bool s12; - char s13; - a1.convert(s1); - a1.convert(s2); - a1.convert(s3); - a1.convert(s4); - a1.convert(s5); - a1.convert(s6); - a1.convert(s7); - a1.convert(s8); - a1.convert(s9); - a1.convert(s10); - a1.convert(s11); - a1.convert(s12); - a1.convert(s13); - long s14; - unsigned long s15; - a1.convert(s14); - a1.convert(s15); - assert (s14 == 32); - assert (s15 == 32); - assert (s1 == "32"); - assert (s2 == 32); - assert (s3 == 32); - assert (s4 == 32); - assert (s5 == 32); - assert (s6 == 32); - assert (s7 == 32); - assert (s8 == 32); - assert (s9 == 32); - assert (s10 == 32.0f); - assert (s11 == 32.0); - assert (s12); - assert (s13 == ' '); - Var a2(a1); - std::string t2; - a2.convert(t2); - assert (s1 == t2); - - unsigned long value = a1.extract(); - assert (value == 32); - - try - { - Int16 value2; value2 = a1.extract(); - fail("bad cast - must throw"); - } - catch (Poco::BadCastException&) - { - } - - Var a3 = a1 + 1; - assert (a3 == 33); - a3 = a1 - 1; - assert (a3 == 31); - a3 += 1; - assert (a3 == 32); - a3 -= 1; - assert (a3 == 31); - a3 = a1 / 2; - assert (a3 == 16); - a3 = a1 * 2; - assert (a3 == 64); - a3 /= 2; - assert (a3 == 32); - a3 *= 2; - assert (a3 == 64); -} - - -void VarTest::testUDT() -{ - Dummy d0; - assert (d0 == 0); - - Dummy d(1); - Var da = d; - assert (da.extract() == 1); - - Dummy d1 = d; - Var da1 = d1; - assert (da1.extract() == 1); - - try - { - float f = da1; - fail ("must fail"); - } - catch (BadCastException&) { } -} - - -void VarTest::testConversionOperator() -{ - Var any("42"); - int i = any; - assert (i == 42); - assert (any == i); - - any = 123; - std::string s1 = any.convert(); - assert (s1 == "123"); - assert (s1 == any); - assert (any == s1); - assert ("123" == any); - - any = 321; - s1 = any.convert(); - assert (s1 == "321"); - - any = "456"; - assert (any == "456"); - assert ("456" == any); - - any = 789; - std::string s2 = any.convert(); - assert (s2 == "789"); - assert (s2 == any); - assert (any == s2); - assert ("789" == any); - - Var any2 = "1.5"; - double d = any2; - assert (d == 1.5); - assert (any2 == d); -} - - -void VarTest::testComparisonOperators() -{ - Var any1 = 1; - Var any2 = "1"; - assert (any1 == any2); - assert (any1 == 1); - assert (1 == any1); - assert (any1 == "1"); - assert ("1" == any1); - assert (any1 <= 1); - assert (1 >= any1); - assert (any1 <= 2); - assert (2 >= any1); - assert (any1 < 2); - assert (2 > any1); - assert (any1 > 0); - assert (0 < any1); - assert (any1 >= 1); - assert (1 <= any1); - assert (any1 >= 0); - assert (0 <= any1); - - any1 = 1L; - assert (any1 == any2); - assert (any1 == 1L); - assert (1L == any1); - assert (any1 == "1"); - assert ("1" == any1); - assert (any1 != 2L); - assert (2L != any1); - assert (any1 != "2"); - assert ("2" != any1); - assert (any1 <= 1L); - assert (1L >= any1); - assert (any1 <= 2L); - assert (2L >= any1); - assert (any1 < 2L); - assert (2L > any1); - assert (any1 > 0); - assert (0 < any1); - assert (any1 >= 1L); - assert (1L <= any1); - assert (any1 >= 0); - assert (0 <= any1); - - any1 = 0x31; - assert (any1 == '1'); - assert ('1' == any1); - assert (any1 <= '1'); - assert ('1' >= any1); - assert (any1 <= '2'); - assert ('2' >= any1); - assert (any1 < '2'); - assert ('2' > any1); - assert (any1 > 0); - assert (0 < any1); - assert (any1 >= '1'); - assert ('1' <= any1); - assert (any1 >= 0); - assert (0 <= any1); - - any1 = "2"; - assert (any1 != any2); - assert (any1 != 1); - assert (1 != any1); - assert (any1 != "1"); - assert ("1" != any1); - - any1 = 1.5; - assert (any1 == 1.5); - assert (1.5 == any1); - assert (any1 == "1.5"); - assert ("1.5" == any1); - assert (any1 != 2.5); - assert (2.5 != any1); - assert (any1 != "2.5"); - assert ("2.5" != any1); - assert (any1 <= 1.5); - assert (1.5 >= any1); - assert (any1 <= 2.5); - assert (2.5 >= any1); - assert (any1 < 2.5); - assert (2.5 > any1); - assert (any1 > 0); - assert (0 < any1); - assert (any1 >= 1.5); - assert (1.5 <= any1); - assert (any1 >= 0); - assert (0 <= any1); - - any1 = 1.5f; - assert (any1 == 1.5f); - assert (1.5f == any1); - assert (any1 == "1.5"); - assert ("1.5" == any1); - assert (any1 != 2.5f); - assert (2.5f != any1); - assert (any1 != "2.5"); - assert ("2.5" != any1); - assert (any1 <= 1.5f); - assert (1.5f >= any1); - assert (any1 <= 2.5f); - assert (2.5f >= any1); - assert (any1 < 2.5f); - assert (2.5f > any1); - assert (any1 > 0); - assert (0 < any1); - assert (any1 >= 1.5f); - assert (1.5f <= any1); - assert (any1 >= 0); - assert (0 <= any1); -} - - -void VarTest::testArithmeticOperators() -{ - Var any1 = 1; - Var any2 = 2; - Var any3 = any1 + any2; - assert (any3 == 3); - int i = 1; - i += any1; - assert (2 == i); - - any1 = 3; - assert ((5 - any1) == 2); - any2 = 5; - any3 = any2 - any1; - assert (any3 == 2); - any3 -= 1; - assert (any3 == 1); - i = 5; - i -= any1; - assert (2 == i); - - any1 = 3; - assert ((5 * any1) == 15); - any2 = 5; - any3 = any1 * any2; - assert (any3 == 15); - any3 *= 3; - assert (any3 == 45); - i = 5; - i *= any1; - assert (15 == i); - - any1 = 3; - assert ((9 / any1) == 3); - any2 = 9; - any3 = any2 / any1; - assert (any3 == 3); - any3 /= 3; - assert (any3 == 1); - i = 9; - i /= any1; - assert (3 == i); - - any1 = 1.0f; - any2 = .5f; - any3 = .0f; - any3 = any1 + any2; - assert (any3 == 1.5f); - any3 += .5f; - assert (any3 == 2.0f); - - any1 = 1.0; - any2 = .5; - any3 = 0.0; - any3 = any1 + any2; - assert (any3 == 1.5); - any3 += .5; - assert (any3 == 2.0); - - any1 = 1; - any2 = "2"; - any3 = any1 + any2; - assert (any3 == 3); - any2 = "4"; - any3 += any2; - assert (any3 == 7); - assert (1 + any3 == 8); - - any1 = "123"; - any2 = "456"; - any3 = any1 + any2; - assert (any3 == "123456"); - any2 = "789"; - any3 += any2; - assert (any3 == "123456789"); - assert (("xyz" + any3) == "xyz123456789"); - - try { any3 = any1 - any2; fail ("must fail"); } - catch (InvalidArgumentException&){} - - try { any3 -= any2; fail ("must fail"); } - catch (InvalidArgumentException&){} - - try { any3 = any1 * any2; fail ("must fail"); } - catch (InvalidArgumentException&){} - - try { any3 *= any2; fail ("must fail"); } - catch (InvalidArgumentException&){} - - try { any3 = any1 / any2; fail ("must fail"); } - catch (InvalidArgumentException&){} - - try { any3 /= any2; fail ("must fail"); } - catch (InvalidArgumentException&){} - - any1 = 10; - - assert (any1++ == 10); - assert (any1 == 11); - assert (++any1 == 12); - - assert (any1-- == 12); - assert (any1 == 11); - assert (--any1 == 10); - - any1 = 1.23; - - try { ++any1; fail ("must fail"); } - catch (InvalidArgumentException&){} - - try { any1++; fail ("must fail"); } - catch (InvalidArgumentException&){} - - try { --any1; fail ("must fail"); } - catch (InvalidArgumentException&){} - - try { any1--; fail ("must fail"); } - catch (InvalidArgumentException&){} -} - - -void VarTest::testLimitsInt() -{ - testLimitsSigned(); - testLimitsSigned(); - testLimitsSigned(); - testLimitsFloatToInt(); - testLimitsFloatToInt(); - - testLimitsSigned(); - testLimitsSigned(); - testLimitsFloatToInt(); - testLimitsFloatToInt(); - - testLimitsSigned(); - testLimitsFloatToInt(); - testLimitsFloatToInt(); - - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsFloatToInt(); - testLimitsFloatToInt(); - - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsFloatToInt(); - testLimitsFloatToInt(); - - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsFloatToInt(); - testLimitsFloatToInt(); - - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsSignedUnsigned(); - testLimitsFloatToInt(); - testLimitsFloatToInt(); - - - testLimitsUnsigned(); - testLimitsUnsigned(); - testLimitsUnsigned(); - - testLimitsUnsigned(); - testLimitsUnsigned(); - - testLimitsUnsigned(); -} - - -void VarTest::testLimitsFloat() -{ - if (std::numeric_limits::max() != std::numeric_limits::max()) - { - double iMin = -1 * std::numeric_limits::max(); - Var da = iMin * 10; - try { float f; f = da; fail("must fail"); } - catch (RangeException&) {} - - double iMax = std::numeric_limits::max(); - da = iMax * 10; - try { float f; f = da; fail("must fail"); } - catch (RangeException&) {} - } -} - - -void VarTest::testCtor() -{ - // this is mainly to test a reported compiler error with assignment on HP aCC. - // (SF# 1733964) - - Var a1(42); - Var a2(a1); - Var a3; - - a3 = a1; - - assert (a2 == 42); - assert (a3 == 42); -} - - -void VarTest::testIsStruct() -{ - std::string s1("string"); - Poco::Int8 s2(-23); - Poco::Int16 s3(-33); - Poco::Int32 s4(-388); - Poco::Int64 s5(-23823838); - Poco::UInt8 s6(32); - Poco::UInt16 s7(16000); - Poco::UInt32 s8(334234); - Poco::UInt64 s9(2328328382); - float s10(13.333f); - double s11(13.555); - bool s12(true); - char s13('c'); - long s14(232323); - unsigned long s15(21233232); - std::vector s16; - Struct s17; - Struct s18; - - Var d1(s1); - Var d2(s2); - Var d3(s3); - Var d4(s4); - Var d5(s5); - Var d6(s6); - Var d7(s7); - Var d8(s8); - Var d9(s9); - Var d10(s10); - Var d11(s11); - Var d12(s12); - Var d13(s13); - Var d14(s14); - Var d15(s15); - Var d16(s16); - Var d17(s17); - Var d18(s18); - - assert (!d1.isStruct()); - assert (!d2.isStruct()); - assert (!d3.isStruct()); - assert (!d4.isStruct()); - assert (!d5.isStruct()); - assert (!d6.isStruct()); - assert (!d7.isStruct()); - assert (!d8.isStruct()); - assert (!d9.isStruct()); - assert (!d10.isStruct()); - assert (!d11.isStruct()); - assert (!d12.isStruct()); - assert (!d13.isStruct()); - assert (!d14.isStruct()); - assert (!d15.isStruct()); - assert (!d16.isStruct()); - assert (d17.isStruct()); - assert (d18.isStruct()); -} - - -void VarTest::testIsArray() -{ - std::string s1("string"); - Poco::Int8 s2(-23); - Poco::Int16 s3(-33); - Poco::Int32 s4(-388); - Poco::Int64 s5(-23823838); - Poco::UInt8 s6(32); - Poco::UInt16 s7(16000); - Poco::UInt32 s8(334234); - Poco::UInt64 s9(2328328382); - float s10(13.333f); - double s11(13.555); - bool s12(true); - char s13('c'); - long s14(232323); - unsigned long s15(21233232); - std::vector s16; - DynamicStruct s17; - - Var d1(s1); - Var d2(s2); - Var d3(s3); - Var d4(s4); - Var d5(s5); - Var d6(s6); - Var d7(s7); - Var d8(s8); - Var d9(s9); - Var d10(s10); - Var d11(s11); - Var d12(s12); - Var d13(s13); - Var d14(s14); - Var d15(s15); - Var d16(s16); - Var d17(s17); - - assert (!d1.isArray()); - assert (!d2.isArray()); - assert (!d3.isArray()); - assert (!d4.isArray()); - assert (!d5.isArray()); - assert (!d6.isArray()); - assert (!d7.isArray()); - assert (!d8.isArray()); - assert (!d9.isArray()); - assert (!d10.isArray()); - assert (!d11.isArray()); - assert (!d12.isArray()); - assert (!d13.isArray()); - assert (!d14.isArray()); - assert (!d15.isArray()); - assert (d16.isArray()); - assert (!d17.isArray()); -} - - -void VarTest::testArrayIdxOperator() -{ - std::string s1("string"); - Poco::Int8 s2(-23); - Poco::Int16 s3(-33); - Poco::Int32 s4(-388); - Poco::Int64 s5(-23823838); - Poco::UInt8 s6(32); - Poco::UInt16 s7(16000); - Poco::UInt32 s8(334234); - Poco::UInt64 s9(2328328382); - float s10(13.333f); - double s11(13.555); - bool s12(true); - char s13('c'); - long s14(232323); - unsigned long s15(21233232); - std::vector s16; - s16.push_back(s1); - s16.push_back(s2); - DynamicStruct s17; - - Var d1(s1); - Var d2(s2); - Var d3(s3); - Var d4(s4); - Var d5(s5); - Var d6(s6); - Var d7(s7); - Var d8(s8); - Var d9(s9); - Var d10(s10); - Var d11(s11); - Var d12(s12); - Var d13(s13); - Var d14(s14); - Var d15(s15); - Var d16(s16); - Var d17(s17); - - testGetIdxMustThrow(d1, 0); - testGetIdxMustThrow(d2, 0); - testGetIdxMustThrow(d3, 0); - testGetIdxMustThrow(d4, 0); - testGetIdxMustThrow(d5, 0); - testGetIdxMustThrow(d6, 0); - testGetIdxMustThrow(d7, 0); - testGetIdxMustThrow(d8, 0); - testGetIdxMustThrow(d9, 0); - testGetIdxMustThrow(d10, 0); - testGetIdxMustThrow(d11, 0); - testGetIdxMustThrow(d12, 0); - testGetIdxMustThrow(d13, 0); - testGetIdxMustThrow(d14, 0); - testGetIdxMustThrow(d15, 0); - testGetIdx(d16, 0, s1); - testGetIdx(d16, 1, s2); - testGetIdxMustThrow(d17, 0); -} - - -void VarTest::testDynamicStructBasics() -{ - DynamicStruct aStruct; - assert (aStruct.empty()); - assert (aStruct.size() == 0); - assert (aStruct.members().empty()); - - aStruct.insert("First Name", "Little"); - assert (!aStruct.empty()); - assert (aStruct.size() == 1); - assert (*(aStruct.members().begin()) == "First Name"); - assert (aStruct["First Name"] == "Little"); - aStruct.insert("Last Name", "POCO"); - assert (aStruct.members().size() == 2); - aStruct.erase("First Name"); - assert (aStruct.size() == 1); - assert (*(aStruct.members().begin()) == "Last Name"); -} - - -void VarTest::testDynamicStructString() -{ - DynamicStruct aStruct; - aStruct["First Name"] = "Junior"; - aStruct["Last Name"] = "POCO"; - Var a1(aStruct); - assert (a1["First Name"] == "Junior"); - assert (a1["Last Name"] == "POCO"); - a1["First Name"] = "Senior"; - assert (a1["First Name"] == "Senior"); - testGetIdxMustThrow(a1, 0); - - Struct s1; - s1["1"] = 1; - s1["2"] = 2; - s1["3"] = 3; - - Struct s2(s1); - assert (s2["1"] == 1); - assert (s2["2"] == 2); - assert (s2["3"] == 3); - - std::map m1; - m1["1"] = 1; - m1["2"] = 2; - m1["3"] = 3; - - Struct m2(m1); - assert (m2["1"] == 1); - assert (m2["2"] == 2); - assert (m2["3"] == 3); -} - - -void VarTest::testDynamicStructInt() -{ - Dynamic::Struct aStruct; - aStruct[0] = "Junior"; - aStruct[1] = "POCO"; - Var a1(aStruct); - assert (a1[0] == "Junior"); - assert (a1[1] == "POCO"); - a1[0] = "Senior"; - assert (a1[0] == "Senior"); - - Struct s1; - s1[1] = "1"; - s1[2] = "2"; - s1[3] = "3"; - - Struct s2(s1); - assert (s2[1] == "1"); - assert (s2[2] == "2"); - assert (s2[3] == "3"); - - std::map m1; - m1[1] = "1"; - m1[2] = "2"; - m1[3] = "3"; - - Struct m2(m1); - assert (m2[1] == "1"); - assert (m2[2] == "2"); - assert (m2[3] == "3"); -} - - -void VarTest::testDynamicPair() -{ - Pair aPair; - assert (0 == aPair.first()); - try - { - std::string s = aPair.second().convert(); - fail ("must fail"); - } - catch (InvalidAccessException&) { } - - Var va(aPair); - assert ("{ 0 : null }" == va.convert()); - - aPair = Pair(4, "123"); - assert ("123" == aPair.second()); - - va = aPair; - assert ("{ 4 : \"123\" }" == va.convert()); - - int i = 1; - std::string s = "2"; - Pair iPair(i, s); - assert (1 == iPair.first()); - assert ("2" == iPair.second()); - - Pair sPair(s, i); - assert ("2" == sPair.first()); - assert (1 == sPair.second()); - - std::pair p = std::make_pair(i, s); - Pair pPair(p); - assert (1 == pPair.first()); - assert ("2" == pPair.second()); - - Var vp(pPair); - assert ("{ 1 : \"2\" }" == vp.convert()); - - Var vs(sPair); - assert ("{ \"2\" : 1 }" == vs.convert()); -} - - -void VarTest::testArrayToString() -{ - std::string s1("string"); - Poco::Int8 s2(23); - std::vector s16; - s16.push_back(s1); - s16.push_back(s2); - Var a1(s16); - std::string res = a1.convert(); - std::string expected("[ \"string\", 23 ]"); - assert (res == expected); -} - - -void VarTest::testStructToString() -{ - DynamicStruct aStruct; - aStruct["First Name"] = "Junior"; - aStruct["Last Name"] = "POCO"; - aStruct["Age"] = 1; - Var a1(aStruct); - std::string res = a1.convert(); - std::string expected = "{ \"Age\" : 1, \"First Name\" : \"Junior\", \"Last Name\" : \"POCO\" }"; - assert (res == expected); -} - - -void VarTest::testArrayOfStructsToString() -{ - std::vector s16; - DynamicStruct aStruct; - aStruct["First Name"] = "Junior"; - aStruct["Last Name"] = "POCO"; - aStruct["Age"] = 1; - s16.push_back(aStruct); - aStruct["First Name"] = "Senior"; - aStruct["Last Name"] = "POCO"; - aStruct["Age"] = 100; - s16.push_back(aStruct); - std::vector s16Cpy = s16; - // recursive arrays! - s16Cpy.push_back(s16); - s16.push_back(s16Cpy); - Var a1(s16); - std::string res = a1.convert(); - std::string expected = "[ " - "{ \"Age\" : 1, \"First Name\" : \"Junior\", \"Last Name\" : \"POCO\" }, " - "{ \"Age\" : 100, \"First Name\" : \"Senior\", \"Last Name\" : \"POCO\" }, " - "[ " - "{ \"Age\" : 1, \"First Name\" : \"Junior\", \"Last Name\" : \"POCO\" }, " - "{ \"Age\" : 100, \"First Name\" : \"Senior\", \"Last Name\" : \"POCO\" }, " - "[ " - "{ \"Age\" : 1, \"First Name\" : \"Junior\", \"Last Name\" : \"POCO\" }, " - "{ \"Age\" : 100, \"First Name\" : \"Senior\", \"Last Name\" : \"POCO\" } " - "] ] ]"; - - assert (res == expected); -} - - -void VarTest::testStructWithArraysToString() -{ - std::string s1("string"); - Poco::Int8 s2(23); - std::vector s16; - s16.push_back(s1); - s16.push_back(s2); - Var a1(s16); - DynamicStruct addr; - addr["Number"] = 4; - addr["Street"] = "Unknown"; - addr["Country"] = "Carinthia"; - DynamicStruct aStruct; - aStruct["First Name"] = "Junior"; - aStruct["Last Name"] = a1; - aStruct["Age"] = 1; - aStruct["Address"] = addr; - Var a2(aStruct); - std::string res = a2.convert(); - std::string expected = "{ \"Address\" : { \"Country\" : \"Carinthia\", \"Number\" : 4, \"Street\" : \"Unknown\" }, " - "\"Age\" : 1, \"First Name\" : \"Junior\", \"Last Name\" : [ \"string\", 23 ] }"; - - assert (res == expected); -} - - -void VarTest::testJSONDeserializeString() -{ - Var a("test"); - std::string tst = Var::toString(a); - Var b = Var::parse(tst); - assert (b.convert() == "test"); - - Var c('c'); - std::string tst2 = Var::toString(c); - Var b2 = Var::parse(tst2); - char cc = b2.convert(); - assert (cc == 'c'); -} - - -void VarTest::testJSONDeserializePrimitives() -{ - Poco::Int8 i8(-12); - Poco::UInt16 u16(2345); - Poco::Int32 i32(-24343); - Poco::UInt64 u64(1234567890); - u64 *= u64; - bool b = false; - float f = 3.1415f; - double d = 3.1415; - - std::string s8 = Var::toString(i8); - std::string s16 = Var::toString(u16); - std::string s32 = Var::toString(i32); - std::string s64 = Var::toString(u64); - std::string sb = Var::toString(b); - std::string sf = Var::toString(f); - std::string sd = Var::toString(d); - Var a8 = Var::parse(s8); - Var a16 = Var::parse(s16); - Var a32 = Var::parse(s32); - Var a64 = Var::parse(s64); - Var ab = Var::parse(sb); - Var af = Var::parse(sf); - Var ad = Var::parse(sd); - assert (a8 == i8); - assert (a16 == u16); - assert (a32 == i32); - assert (a64 == u64); - assert (ab == b); - assert (af == f); - assert (ad == d); -} - - -void VarTest::testJSONDeserializeArray() -{ - Poco::Int8 i8(-12); - Poco::UInt16 u16(2345); - Poco::Int32 i32(-24343); - Poco::UInt64 u64(1234567890); - u64 *= u64; - bool b = false; - float f = 3.1415f; - double d = 3.1415; - std::string s("test string"); - char c('x'); - std::vector aVec; - aVec.push_back(i8); - aVec.push_back(u16); - aVec.push_back(i32); - aVec.push_back(u64); - aVec.push_back(b); - aVec.push_back(f); - aVec.push_back(d); - aVec.push_back(s); - aVec.push_back(c); - - std::string sVec = Var::toString(aVec); - Var a = Var::parse(sVec); - assert (a[0] == i8); - assert (a[1] == u16); - assert (a[2] == i32); - assert (a[3] == u64); - assert (a[4] == b); - assert (a[5] == f); - assert (a[6] == d); - assert (a[7] == s); - assert (a[8] == c); -} - - -void VarTest::testJSONDeserializeComplex() -{ - Poco::Int8 i8(-12); - Poco::UInt16 u16(2345); - Poco::Int32 i32(-24343); - Poco::UInt64 u64(1234567890); - u64 *= u64; - bool b = false; - float f = 3.1415f; - double d = 3.1415; - std::string s("test string"); - char c('x'); - DynamicStruct aStr; - aStr["i8"] = i8; - aStr["u16"] = u16; - aStr["i32"] = i32; - aStr["u64"] = u64; - aStr["b"] = b; - aStr["f"] = f; - aStr["d"] = d; - aStr["s"] = s; - aStr["c"] = c; - std::vector aVec; - aVec.push_back(i8); - aVec.push_back(u16); - aVec.push_back(i32); - aVec.push_back(u64); - aVec.push_back(b); - aVec.push_back(f); - aVec.push_back(d); - aVec.push_back(s); - aVec.push_back(c); - aVec.push_back(aStr); - aStr["vec"] = aVec; - - std::string sStr = Var::toString(aStr); - Var a = Var::parse(sStr); - assert (a.isStruct()); - assert (aStr["i8"] == i8); - assert (aStr["u16"] == u16); - assert (aStr["i32"] == i32); - assert (aStr["u64"] == u64); - assert (aStr["b"] == b); - assert (aStr["f"] == f); - assert (aStr["d"] == d); - assert (aStr["s"] == s); - assert (aStr["c"] == c); - Var vecRet = a["vec"]; - assert (vecRet.isArray()); - assert (vecRet[0] == i8); - assert (vecRet[1] == u16); - assert (vecRet[2] == i32); - assert (vecRet[3] == u64); - assert (vecRet[4] == b); - assert (vecRet[5] == f); - assert (vecRet[6] == d); - assert (vecRet[7] == s); - assert (vecRet[8] == c); - Var strRet = vecRet[9]; - assert (strRet.isStruct()); -} - - -void VarTest::testJSONDeserializeStruct() -{ - Poco::Int8 i8(-12); - Poco::UInt16 u16(2345); - Poco::Int32 i32(-24343); - Poco::UInt64 u64(1234567890); - u64 *= u64; - bool b = false; - float f = 3.1415f; - double d = 3.1415; - std::string s("test string"); - char c('x'); - DynamicStruct aStr; - aStr["i8"] = i8; - aStr["u16"] = u16; - aStr["i32"] = i32; - aStr["u64"] = u64; - aStr["b"] = b; - aStr["f"] = f; - aStr["d"] = d; - aStr["s"] = s; - aStr["c"] = c; - - std::string sStr = Var::toString(aStr); - Var a = Var::parse(sStr); - assert (aStr["i8"] == i8); - assert (aStr["u16"] == u16); - assert (aStr["i32"] == i32); - assert (aStr["u64"] == u64); - assert (aStr["b"] == b); - assert (aStr["f"] == f); - assert (aStr["d"] == d); - assert (aStr["s"] == s); - assert (aStr["c"] == c); -} - - -void VarTest::testDate() -{ - Poco::DateTime dtNow(2007, 3, 13, 8, 12, 15); - - Poco::Timestamp tsNow = dtNow.timestamp(); - Poco::LocalDateTime ldtNow(dtNow.timestamp()); - Var dt(dtNow); - Var ts(tsNow); - Var ldt(ldtNow); - Var dtStr(dt.convert()); - Var tsStr(ts.convert()); - Var ldtStr(ldt.convert()); - DateTime dtRes = dtStr.convert(); - LocalDateTime ldtRes = ldtStr.convert(); - Timestamp tsRes = tsStr.convert(); - assert (dtNow == dtRes); - assert (ldtNow == ldtRes); - assert (tsNow == tsRes); -} - -void VarTest::testGetIdxMustThrow(Var& a1, std::vector::size_type n) -{ - try - { - Var& val1 = a1[n]; - fail("bad cast - must throw"); - val1 = 0; // silence the compiler - } - catch (Poco::InvalidAccessException&) - { - } - - try - { - const Var& c1 = a1; - const Var& cval1 = c1[n]; - fail("bad const cast - must throw"); - assert (cval1 == c1); // silence the compiler - } - catch (Poco::InvalidAccessException&) - { - } -} - - -void VarTest::testEmpty() -{ - Var da; - assert (da.isEmpty()); - assert (da.type() == typeid(void)); - assert (!da.isArray()); - assert (!da.isInteger()); - assert (!da.isNumeric()); - assert (!da.isSigned()); - assert (!da.isString()); - assert (!(da == da)); - assert (!(da != da)); - - da = "123"; - int i = da.convert(); - assert (123 == i); - std::string s = da.extract(); - assert ("123" == s); - assert (!da.isEmpty()); - da.empty(); - assert (da.isEmpty()); - assert (da.type() == typeid(void)); - assert (!da.isArray()); - assert (!da.isInteger()); - assert (!da.isNumeric()); - assert (!da.isSigned()); - assert (!da.isString()); - assert (!(da == da)); - assert (!(da != da)); - - assert (da != ""); - assert ("" != da); - assert (!(da == "")); - assert (!("" == da)); - - - testEmptyComparisons(); - testEmptyComparisons(); - testEmptyComparisons(); - testEmptyComparisons(); - testEmptyComparisons(); - testEmptyComparisons(); - testEmptyComparisons(); - testEmptyComparisons(); - testEmptyComparisons(); - testEmptyComparisons(); -#ifdef POCO_LONG_IS_64_BIT - testEmptyComparisons(); - testEmptyComparisons(); -#endif - testEmptyComparisons(); - testEmptyComparisons(); - - try - { - int i = da; - fail ("must fail"); - } catch (InvalidAccessException&) { } - - try - { - int i = da.extract(); - fail ("must fail"); - } catch (InvalidAccessException&) { } -} - - -void VarTest::setUp() -{ -} - - -void VarTest::tearDown() -{ -} - - -CppUnit::Test* VarTest::suite() -{ - CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("VarTest"); - - CppUnit_addTest(pSuite, VarTest, testInt8); - CppUnit_addTest(pSuite, VarTest, testInt16); - CppUnit_addTest(pSuite, VarTest, testInt32); - CppUnit_addTest(pSuite, VarTest, testInt64); - CppUnit_addTest(pSuite, VarTest, testUInt8); - CppUnit_addTest(pSuite, VarTest, testUInt16); - CppUnit_addTest(pSuite, VarTest, testUInt32); - CppUnit_addTest(pSuite, VarTest, testUInt64); - CppUnit_addTest(pSuite, VarTest, testBool); - CppUnit_addTest(pSuite, VarTest, testChar); - CppUnit_addTest(pSuite, VarTest, testFloat); - CppUnit_addTest(pSuite, VarTest, testDouble); - CppUnit_addTest(pSuite, VarTest, testLong); - CppUnit_addTest(pSuite, VarTest, testULong); - CppUnit_addTest(pSuite, VarTest, testString); - CppUnit_addTest(pSuite, VarTest, testUDT); - CppUnit_addTest(pSuite, VarTest, testConversionOperator); - CppUnit_addTest(pSuite, VarTest, testComparisonOperators); - CppUnit_addTest(pSuite, VarTest, testArithmeticOperators); - CppUnit_addTest(pSuite, VarTest, testLimitsInt); - CppUnit_addTest(pSuite, VarTest, testLimitsFloat); - CppUnit_addTest(pSuite, VarTest, testCtor); - CppUnit_addTest(pSuite, VarTest, testIsStruct); - CppUnit_addTest(pSuite, VarTest, testIsArray); - CppUnit_addTest(pSuite, VarTest, testArrayIdxOperator); - CppUnit_addTest(pSuite, VarTest, testDynamicPair); - CppUnit_addTest(pSuite, VarTest, testDynamicStructBasics); - CppUnit_addTest(pSuite, VarTest, testDynamicStructString); - CppUnit_addTest(pSuite, VarTest, testDynamicStructInt); - CppUnit_addTest(pSuite, VarTest, testArrayToString); - CppUnit_addTest(pSuite, VarTest, testStructToString); - CppUnit_addTest(pSuite, VarTest, testArrayOfStructsToString); - CppUnit_addTest(pSuite, VarTest, testStructWithArraysToString); - CppUnit_addTest(pSuite, VarTest, testJSONDeserializeString); - CppUnit_addTest(pSuite, VarTest, testJSONDeserializePrimitives); - CppUnit_addTest(pSuite, VarTest, testJSONDeserializeArray); - CppUnit_addTest(pSuite, VarTest, testJSONDeserializeStruct); - CppUnit_addTest(pSuite, VarTest, testJSONDeserializeComplex); - CppUnit_addTest(pSuite, VarTest, testDate); - CppUnit_addTest(pSuite, VarTest, testEmpty); - - return pSuite; -} +// +// VarTest.cpp +// +// $Id: //poco/svn/Foundation/testsuite/src/VarTest.cpp#2 $ +// +// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "VarTest.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" +#include "Poco/Exception.h" +#include "Poco/Dynamic/Var.h" +#include "Poco/Bugcheck.h" +#include "Poco/Dynamic/Struct.h" +#include "Poco/Dynamic/Pair.h" +#include +#include + + +#if defined(_MSC_VER) && _MSC_VER < 1400 + #pragma warning(disable:4800)//forcing value to bool 'true' or 'false' +#endif + + +using namespace Poco; +using namespace Poco::Dynamic; + + +class Dummy +{ +public: + Dummy(): _val(0) + { + } + + Dummy(int val): _val(val) + { + } + + operator int () const + { + return _val; + } + + bool operator == (int i) + { + return i == _val; + } + +private: + int _val; +}; + + +VarTest::VarTest(const std::string& name): CppUnit::TestCase(name) +{ +} + + +VarTest::~VarTest() +{ +} + + +void VarTest::testInt8() +{ + Poco::Int8 src = 32; + Var a1 = src; + + assert (a1.type() == typeid(Poco::Int8)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + Int8 value = a1.extract(); + assert (value == 32); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1; + assert (a3 == 33); + a3 = a1 - 1; + assert (a3 == 31); + a3 += 1; + assert (a3 == 32); + a3 -= 1; + assert (a3 == 31); + a3 = a1 / 2; + assert (a3 == 16); + a3 = a1 * 2; + assert (a3 == 64); + a3 /= 2; + assert (a3 == 32); + a3 *= 2; + assert (a3 == 64); +} + + +void VarTest::testInt16() +{ + Poco::Int16 src = 32; + Var a1 = src; + + assert (a1.type() == typeid(Poco::Int16)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + Int16 value = a1.extract(); + assert (value == 32); + + try + { + Int32 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1; + assert (a3 == 33); + a3 = a1 - 1; + assert (a3 == 31); + a3 += 1; + assert (a3 == 32); + a3 -= 1; + assert (a3 == 31); + a3 = a1 / 2; + assert (a3 == 16); + a3 = a1 * 2; + assert (a3 == 64); + a3 /= 2; + assert (a3 == 32); + a3 *= 2; + assert (a3 == 64); +} + + +void VarTest::testInt32() +{ + Poco::Int32 src = 32; + Var a1 = src; + + assert (a1.type() == typeid(Poco::Int32)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + Int32 value = a1.extract(); + assert (value == 32); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1; + assert (a3 == 33); + a3 = a1 - 1; + assert (a3 == 31); + a3 += 1; + assert (a3 == 32); + a3 -= 1; + assert (a3 == 31); + a3 = a1 / 2; + assert (a3 == 16); + a3 = a1 * 2; + assert (a3 == 64); + a3 /= 2; + assert (a3 == 32); + a3 *= 2; + assert (a3 == 64); +} + + +void VarTest::testInt64() +{ + Poco::Int64 src = 32; + Var a1 = src; + + assert (a1.type() == typeid(Poco::Int64)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + Int64 value = a1.extract(); + assert (value == 32); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1; + assert (a3 == 33); + a3 = a1 - 1; + assert (a3 == 31); + a3 += 1; + assert (a3 == 32); + a3 -= 1; + assert (a3 == 31); + a3 = a1 / 2; + assert (a3 == 16); + a3 = a1 * 2; + assert (a3 == 64); + a3 /= 2; + assert (a3 == 32); + a3 *= 2; + assert (a3 == 64); +} + + +void VarTest::testUInt8() +{ + Poco::UInt8 src = 32; + Var a1 = src; + + assert (a1.type() == typeid(Poco::UInt8)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + UInt8 value = a1.extract(); + assert (value == 32); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1; + assert (a3 == 33); + a3 = a1 - 1; + assert (a3 == 31); + a3 += 1; + assert (a3 == 32); + a3 -= 1; + assert (a3 == 31); + a3 = a1 / 2; + assert (a3 == 16); + a3 = a1 * 2; + assert (a3 == 64); + a3 /= 2; + assert (a3 == 32); + a3 *= 2; + assert (a3 == 64); +} + + +void VarTest::testUInt16() +{ + Poco::UInt16 src = 32; + Var a1 = src; + + assert (a1.type() == typeid(Poco::UInt16)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + UInt16 value = a1.extract(); + assert (value == 32); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1; + assert (a3 == 33); + a3 = a1 - 1; + assert (a3 == 31); + a3 += 1; + assert (a3 == 32); + a3 -= 1; + assert (a3 == 31); + a3 = a1 / 2; + assert (a3 == 16); + a3 = a1 * 2; + assert (a3 == 64); + a3 /= 2; + assert (a3 == 32); + a3 *= 2; + assert (a3 == 64); +} + + +void VarTest::testUInt32() +{ + Poco::UInt32 src = 32; + Var a1 = src; + + assert (a1.type() == typeid(Poco::UInt32)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + UInt32 value = a1.extract(); + assert (value == 32); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1; + assert (a3 == 33); + a3 = a1 - 1; + assert (a3 == 31); + a3 += 1; + assert (a3 == 32); + a3 -= 1; + assert (a3 == 31); + a3 = a1 / 2; + assert (a3 == 16); + a3 = a1 * 2; + assert (a3 == 64); + a3 /= 2; + assert (a3 == 32); + a3 *= 2; + assert (a3 == 64); +} + + +void VarTest::testUInt64() +{ + Poco::UInt64 src = 32; + Var a1 = src; + + assert (a1.type() == typeid(Poco::UInt64)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + UInt64 value = a1.extract(); + assert (value == 32); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1; + assert (a3 == 33); + a3 = a1 - 1; + assert (a3 == 31); + a3 += 1; + assert (a3 == 32); + a3 -= 1; + assert (a3 == 31); + a3 = a1 / 2; + assert (a3 == 16); + a3 = a1 * 2; + assert (a3 == 64); + a3 /= 2; + assert (a3 == 32); + a3 *= 2; + assert (a3 == 64); +} + + +void VarTest::testBool() +{ + bool src = true; + Var a1 = src; + + assert (a1.type() == typeid(bool)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 1); + assert (s15 == 1); + assert (s1 == "true"); + assert (s2 == 1); + assert (s3 == 1); + assert (s4 == 1); + assert (s5 == 1); + assert (s6 == 1); + assert (s7 == 1); + assert (s8 == 1); + assert (s9 == 1); + assert (s10 == 1.0f); + assert (s11 == 1.0); + assert (s12); + assert (s13 == '\x1'); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + bool value = a1.extract(); + assert (value); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } +} + + +void VarTest::testChar() +{ + char src = ' '; + Var a1 = src; + + assert (a1.type() == typeid(char)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == " "); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + char value = a1.extract(); + assert (value == ' '); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } +} + + +void VarTest::testFloat() +{ + Var any("0"); + float f = any; + + float src = 32.0f; + Var a1 = src; + + assert (a1.type() == typeid(float)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + float value = a1.extract(); + assert (value == 32.0f); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1.0f; + assert (a3 == 33.0f); + a3 = a1 - 1.0f; + assert (a3 == 31.0f); + a3 += 1.0f; + assert (a3 == 32.0f); + a3 -= 1.0f; + assert (a3 == 31.0f); + a3 = a1 / 2.0f; + assert (a3 == 16.0f); + a3 = a1 * 2.0f; + assert (a3 == 64.0f); + a3 /= 2.0f; + assert (a3 == 32.0f); + a3 *= 2.0f; + assert (a3 == 64.0f); +} + + +void VarTest::testDouble() +{ + double d = 0; + Var v(d); + float f = v; + + double src = 32.0; + Var a1 = src; + + assert (a1.type() == typeid(double)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + double value = a1.extract(); + assert (value == 32.0); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + + Var a3 = a1 + 1.0; + assert (a3 == 33.0); + a3 = a1 - 1.0; + assert (a3 == 31.0); + a3 += 1.0; + assert (a3 == 32.0); + a3 -= 1.0; + assert (a3 == 31.0); + a3 = a1 / 2.0; + assert (a3 == 16.0); + a3 = a1 * 2.0; + assert (a3 == 64.0); + a3 /= 2.0; + assert (a3 == 32.0); + a3 *= 2.0; + assert (a3 == 64.0); +} + + +void VarTest::testString() +{ + Var a1("32"); + + assert (a1.type() == typeid(std::string)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == '3'); + + const std::string& value = a1.extract(); + assert (value == "32"); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a4(123); + std::string s("456"); + Var a5 = a4 + s; + assert (a5 == "123456"); + a4 += s; + assert (a4 == "123456"); + Var a6 = a4 + "789"; + assert (a6 == "123456789"); + a4 += "789"; + assert (a4 == "123456789"); + + a4 = ""; + assert(!a4); + a4 = "0"; + assert(!a4); + a4 = "FaLsE"; + assert(!a4); +} + + +void VarTest::testLong() +{ + long src = 32; + Var a1 = src; + + assert (a1.type() == typeid(long)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + long value = a1.extract(); + assert (value == 32); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1; + assert (a3 == 33); + a3 = a1 - 1; + assert (a3 == 31); + a3 += 1; + assert (a3 == 32); + a3 -= 1; + assert (a3 == 31); + a3 = a1 / 2; + assert (a3 == 16); + a3 = a1 * 2; + assert (a3 == 64); + a3 /= 2; + assert (a3 == 32); + a3 *= 2; + assert (a3 == 64); +} + + +void VarTest::testULong() +{ + unsigned long src = 32; + Var a1 = src; + + assert (a1.type() == typeid(unsigned long)); + + std::string s1; + Poco::Int8 s2; + Poco::Int16 s3; + Poco::Int32 s4; + Poco::Int64 s5; + Poco::UInt8 s6; + Poco::UInt16 s7; + Poco::UInt32 s8; + Poco::UInt64 s9; + float s10; + double s11; + bool s12; + char s13; + a1.convert(s1); + a1.convert(s2); + a1.convert(s3); + a1.convert(s4); + a1.convert(s5); + a1.convert(s6); + a1.convert(s7); + a1.convert(s8); + a1.convert(s9); + a1.convert(s10); + a1.convert(s11); + a1.convert(s12); + a1.convert(s13); + long s14; + unsigned long s15; + a1.convert(s14); + a1.convert(s15); + assert (s14 == 32); + assert (s15 == 32); + assert (s1 == "32"); + assert (s2 == 32); + assert (s3 == 32); + assert (s4 == 32); + assert (s5 == 32); + assert (s6 == 32); + assert (s7 == 32); + assert (s8 == 32); + assert (s9 == 32); + assert (s10 == 32.0f); + assert (s11 == 32.0); + assert (s12); + assert (s13 == ' '); + Var a2(a1); + std::string t2; + a2.convert(t2); + assert (s1 == t2); + + unsigned long value = a1.extract(); + assert (value == 32); + + try + { + Int16 value2; value2 = a1.extract(); + fail("bad cast - must throw"); + } + catch (Poco::BadCastException&) + { + } + + Var a3 = a1 + 1; + assert (a3 == 33); + a3 = a1 - 1; + assert (a3 == 31); + a3 += 1; + assert (a3 == 32); + a3 -= 1; + assert (a3 == 31); + a3 = a1 / 2; + assert (a3 == 16); + a3 = a1 * 2; + assert (a3 == 64); + a3 /= 2; + assert (a3 == 32); + a3 *= 2; + assert (a3 == 64); +} + + +void VarTest::testUDT() +{ + Dummy d0; + assert (d0 == 0); + + Dummy d(1); + Var da = d; + assert (da.extract() == 1); + + Dummy d1 = d; + Var da1 = d1; + assert (da1.extract() == 1); + + try + { + float f = da1; + fail ("must fail"); + } + catch (BadCastException&) { } +} + + +void VarTest::testConversionOperator() +{ + Var any("42"); + int i = any; + assert (i == 42); + assert (any == i); + + any = 123; + std::string s1 = any.convert(); + assert (s1 == "123"); + assert (s1 == any); + assert (any == s1); + assert ("123" == any); + + any = 321; + s1 = any.convert(); + assert (s1 == "321"); + + any = "456"; + assert (any == "456"); + assert ("456" == any); + + any = 789; + std::string s2 = any.convert(); + assert (s2 == "789"); + assert (s2 == any); + assert (any == s2); + assert ("789" == any); + + Var any2 = "1.5"; + double d = any2; + assert (d == 1.5); + assert (any2 == d); +} + + +void VarTest::testComparisonOperators() +{ + Var any1 = 1; + Var any2 = "1"; + assert (any1 == any2); + assert (any1 == 1); + assert (1 == any1); + assert (any1 == "1"); + assert ("1" == any1); + assert (any1 <= 1); + assert (1 >= any1); + assert (any1 <= 2); + assert (2 >= any1); + assert (any1 < 2); + assert (2 > any1); + assert (any1 > 0); + assert (0 < any1); + assert (any1 >= 1); + assert (1 <= any1); + assert (any1 >= 0); + assert (0 <= any1); + + any1 = 1L; + assert (any1 == any2); + assert (any1 == 1L); + assert (1L == any1); + assert (any1 == "1"); + assert ("1" == any1); + assert (any1 != 2L); + assert (2L != any1); + assert (any1 != "2"); + assert ("2" != any1); + assert (any1 <= 1L); + assert (1L >= any1); + assert (any1 <= 2L); + assert (2L >= any1); + assert (any1 < 2L); + assert (2L > any1); + assert (any1 > 0); + assert (0 < any1); + assert (any1 >= 1L); + assert (1L <= any1); + assert (any1 >= 0); + assert (0 <= any1); + + any1 = 0x31; + assert (any1 == '1'); + assert ('1' == any1); + assert (any1 <= '1'); + assert ('1' >= any1); + assert (any1 <= '2'); + assert ('2' >= any1); + assert (any1 < '2'); + assert ('2' > any1); + assert (any1 > 0); + assert (0 < any1); + assert (any1 >= '1'); + assert ('1' <= any1); + assert (any1 >= 0); + assert (0 <= any1); + + any1 = "2"; + assert (any1 != any2); + assert (any1 != 1); + assert (1 != any1); + assert (any1 != "1"); + assert ("1" != any1); + + any1 = 1.5; + assert (any1 == 1.5); + assert (1.5 == any1); + assert (any1 == "1.5"); + assert ("1.5" == any1); + assert (any1 != 2.5); + assert (2.5 != any1); + assert (any1 != "2.5"); + assert ("2.5" != any1); + assert (any1 <= 1.5); + assert (1.5 >= any1); + assert (any1 <= 2.5); + assert (2.5 >= any1); + assert (any1 < 2.5); + assert (2.5 > any1); + assert (any1 > 0); + assert (0 < any1); + assert (any1 >= 1.5); + assert (1.5 <= any1); + assert (any1 >= 0); + assert (0 <= any1); + + any1 = 1.5f; + assert (any1 == 1.5f); + assert (1.5f == any1); + assert (any1 == "1.5"); + assert ("1.5" == any1); + assert (any1 != 2.5f); + assert (2.5f != any1); + assert (any1 != "2.5"); + assert ("2.5" != any1); + assert (any1 <= 1.5f); + assert (1.5f >= any1); + assert (any1 <= 2.5f); + assert (2.5f >= any1); + assert (any1 < 2.5f); + assert (2.5f > any1); + assert (any1 > 0); + assert (0 < any1); + assert (any1 >= 1.5f); + assert (1.5f <= any1); + assert (any1 >= 0); + assert (0 <= any1); +} + + +void VarTest::testArithmeticOperators() +{ + Var any1 = 1; + Var any2 = 2; + Var any3 = any1 + any2; + assert (any3 == 3); + int i = 1; + i += any1; + assert (2 == i); + + any1 = 3; + assert ((5 - any1) == 2); + any2 = 5; + any3 = any2 - any1; + assert (any3 == 2); + any3 -= 1; + assert (any3 == 1); + i = 5; + i -= any1; + assert (2 == i); + + any1 = 3; + assert ((5 * any1) == 15); + any2 = 5; + any3 = any1 * any2; + assert (any3 == 15); + any3 *= 3; + assert (any3 == 45); + i = 5; + i *= any1; + assert (15 == i); + + any1 = 3; + assert ((9 / any1) == 3); + any2 = 9; + any3 = any2 / any1; + assert (any3 == 3); + any3 /= 3; + assert (any3 == 1); + i = 9; + i /= any1; + assert (3 == i); + + any1 = 1.0f; + any2 = .5f; + any3 = .0f; + any3 = any1 + any2; + assert (any3 == 1.5f); + any3 += .5f; + assert (any3 == 2.0f); + + any1 = 1.0; + any2 = .5; + any3 = 0.0; + any3 = any1 + any2; + assert (any3 == 1.5); + any3 += .5; + assert (any3 == 2.0); + + any1 = 1; + any2 = "2"; + any3 = any1 + any2; + assert (any3 == 3); + any2 = "4"; + any3 += any2; + assert (any3 == 7); + assert (1 + any3 == 8); + + any1 = "123"; + any2 = "456"; + any3 = any1 + any2; + assert (any3 == "123456"); + any2 = "789"; + any3 += any2; + assert (any3 == "123456789"); + assert (("xyz" + any3) == "xyz123456789"); + + try { any3 = any1 - any2; fail ("must fail"); } + catch (InvalidArgumentException&){} + + try { any3 -= any2; fail ("must fail"); } + catch (InvalidArgumentException&){} + + try { any3 = any1 * any2; fail ("must fail"); } + catch (InvalidArgumentException&){} + + try { any3 *= any2; fail ("must fail"); } + catch (InvalidArgumentException&){} + + try { any3 = any1 / any2; fail ("must fail"); } + catch (InvalidArgumentException&){} + + try { any3 /= any2; fail ("must fail"); } + catch (InvalidArgumentException&){} + + any1 = 10; + + assert (any1++ == 10); + assert (any1 == 11); + assert (++any1 == 12); + + assert (any1-- == 12); + assert (any1 == 11); + assert (--any1 == 10); + + any1 = 1.23; + + try { ++any1; fail ("must fail"); } + catch (InvalidArgumentException&){} + + try { any1++; fail ("must fail"); } + catch (InvalidArgumentException&){} + + try { --any1; fail ("must fail"); } + catch (InvalidArgumentException&){} + + try { any1--; fail ("must fail"); } + catch (InvalidArgumentException&){} +} + + +void VarTest::testLimitsInt() +{ + testLimitsSigned(); + testLimitsSigned(); + testLimitsSigned(); + testLimitsFloatToInt(); + testLimitsFloatToInt(); + + testLimitsSigned(); + testLimitsSigned(); + testLimitsFloatToInt(); + testLimitsFloatToInt(); + + testLimitsSigned(); + testLimitsFloatToInt(); + testLimitsFloatToInt(); + + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsFloatToInt(); + testLimitsFloatToInt(); + + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsFloatToInt(); + testLimitsFloatToInt(); + + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsFloatToInt(); + testLimitsFloatToInt(); + + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsSignedUnsigned(); + testLimitsFloatToInt(); + testLimitsFloatToInt(); + + + testLimitsUnsigned(); + testLimitsUnsigned(); + testLimitsUnsigned(); + + testLimitsUnsigned(); + testLimitsUnsigned(); + + testLimitsUnsigned(); +} + + +void VarTest::testLimitsFloat() +{ + if (std::numeric_limits::max() != std::numeric_limits::max()) + { + double iMin = -1 * std::numeric_limits::max(); + Var da = iMin * 10; + try { float f; f = da; fail("must fail"); } + catch (RangeException&) {} + + double iMax = std::numeric_limits::max(); + da = iMax * 10; + try { float f; f = da; fail("must fail"); } + catch (RangeException&) {} + } +} + + +void VarTest::testCtor() +{ + // this is mainly to test a reported compiler error with assignment on HP aCC. + // (SF# 1733964) + + Var a1(42); + Var a2(a1); + Var a3; + + a3 = a1; + + assert (a2 == 42); + assert (a3 == 42); +} + + +void VarTest::testIsStruct() +{ + std::string s1("string"); + Poco::Int8 s2(-23); + Poco::Int16 s3(-33); + Poco::Int32 s4(-388); + Poco::Int64 s5(-23823838); + Poco::UInt8 s6(32); + Poco::UInt16 s7(16000); + Poco::UInt32 s8(334234); + Poco::UInt64 s9(2328328382); + float s10(13.333f); + double s11(13.555); + bool s12(true); + char s13('c'); + long s14(232323); + unsigned long s15(21233232); + std::vector s16; + Struct s17; + Struct s18; + + Var d1(s1); + Var d2(s2); + Var d3(s3); + Var d4(s4); + Var d5(s5); + Var d6(s6); + Var d7(s7); + Var d8(s8); + Var d9(s9); + Var d10(s10); + Var d11(s11); + Var d12(s12); + Var d13(s13); + Var d14(s14); + Var d15(s15); + Var d16(s16); + Var d17(s17); + Var d18(s18); + + assert (!d1.isStruct()); + assert (!d2.isStruct()); + assert (!d3.isStruct()); + assert (!d4.isStruct()); + assert (!d5.isStruct()); + assert (!d6.isStruct()); + assert (!d7.isStruct()); + assert (!d8.isStruct()); + assert (!d9.isStruct()); + assert (!d10.isStruct()); + assert (!d11.isStruct()); + assert (!d12.isStruct()); + assert (!d13.isStruct()); + assert (!d14.isStruct()); + assert (!d15.isStruct()); + assert (!d16.isStruct()); + assert (d17.isStruct()); + assert (d18.isStruct()); +} + + +void VarTest::testIsArray() +{ + std::string s1("string"); + Poco::Int8 s2(-23); + Poco::Int16 s3(-33); + Poco::Int32 s4(-388); + Poco::Int64 s5(-23823838); + Poco::UInt8 s6(32); + Poco::UInt16 s7(16000); + Poco::UInt32 s8(334234); + Poco::UInt64 s9(2328328382); + float s10(13.333f); + double s11(13.555); + bool s12(true); + char s13('c'); + long s14(232323); + unsigned long s15(21233232); + std::vector s16; + DynamicStruct s17; + + Var d1(s1); + Var d2(s2); + Var d3(s3); + Var d4(s4); + Var d5(s5); + Var d6(s6); + Var d7(s7); + Var d8(s8); + Var d9(s9); + Var d10(s10); + Var d11(s11); + Var d12(s12); + Var d13(s13); + Var d14(s14); + Var d15(s15); + Var d16(s16); + Var d17(s17); + + assert (!d1.isArray()); + assert (!d2.isArray()); + assert (!d3.isArray()); + assert (!d4.isArray()); + assert (!d5.isArray()); + assert (!d6.isArray()); + assert (!d7.isArray()); + assert (!d8.isArray()); + assert (!d9.isArray()); + assert (!d10.isArray()); + assert (!d11.isArray()); + assert (!d12.isArray()); + assert (!d13.isArray()); + assert (!d14.isArray()); + assert (!d15.isArray()); + assert (d16.isArray()); + assert (!d17.isArray()); +} + + +void VarTest::testArrayIdxOperator() +{ + std::string s1("string"); + Poco::Int8 s2(-23); + Poco::Int16 s3(-33); + Poco::Int32 s4(-388); + Poco::Int64 s5(-23823838); + Poco::UInt8 s6(32); + Poco::UInt16 s7(16000); + Poco::UInt32 s8(334234); + Poco::UInt64 s9(2328328382); + float s10(13.333f); + double s11(13.555); + bool s12(true); + char s13('c'); + long s14(232323); + unsigned long s15(21233232); + std::vector s16; + s16.push_back(s1); + s16.push_back(s2); + DynamicStruct s17; + + Var d1(s1); + Var d2(s2); + Var d3(s3); + Var d4(s4); + Var d5(s5); + Var d6(s6); + Var d7(s7); + Var d8(s8); + Var d9(s9); + Var d10(s10); + Var d11(s11); + Var d12(s12); + Var d13(s13); + Var d14(s14); + Var d15(s15); + Var d16(s16); + Var d17(s17); + + testGetIdxMustThrow(d1, 0); + testGetIdxMustThrow(d2, 0); + testGetIdxMustThrow(d3, 0); + testGetIdxMustThrow(d4, 0); + testGetIdxMustThrow(d5, 0); + testGetIdxMustThrow(d6, 0); + testGetIdxMustThrow(d7, 0); + testGetIdxMustThrow(d8, 0); + testGetIdxMustThrow(d9, 0); + testGetIdxMustThrow(d10, 0); + testGetIdxMustThrow(d11, 0); + testGetIdxMustThrow(d12, 0); + testGetIdxMustThrow(d13, 0); + testGetIdxMustThrow(d14, 0); + testGetIdxMustThrow(d15, 0); + testGetIdx(d16, 0, s1); + testGetIdx(d16, 1, s2); + testGetIdxMustThrow(d17, 0); +} + + +void VarTest::testDynamicStructBasics() +{ + DynamicStruct aStruct; + assert (aStruct.empty()); + assert (aStruct.size() == 0); + assert (aStruct.members().empty()); + + aStruct.insert("First Name", "Little"); + assert (!aStruct.empty()); + assert (aStruct.size() == 1); + assert (*(aStruct.members().begin()) == "First Name"); + assert (aStruct["First Name"] == "Little"); + aStruct.insert("Last Name", "POCO"); + assert (aStruct.members().size() == 2); + aStruct.erase("First Name"); + assert (aStruct.size() == 1); + assert (*(aStruct.members().begin()) == "Last Name"); +} + + +void VarTest::testDynamicStructString() +{ + DynamicStruct aStruct; + aStruct["First Name"] = "Junior"; + aStruct["Last Name"] = "POCO"; + Var a1(aStruct); + assert (a1["First Name"] == "Junior"); + assert (a1["Last Name"] == "POCO"); + a1["First Name"] = "Senior"; + assert (a1["First Name"] == "Senior"); + testGetIdxMustThrow(a1, 0); + + Struct s1; + s1["1"] = 1; + s1["2"] = 2; + s1["3"] = 3; + + Struct s2(s1); + assert (s2["1"] == 1); + assert (s2["2"] == 2); + assert (s2["3"] == 3); + + std::map m1; + m1["1"] = 1; + m1["2"] = 2; + m1["3"] = 3; + + Struct m2(m1); + assert (m2["1"] == 1); + assert (m2["2"] == 2); + assert (m2["3"] == 3); +} + + +void VarTest::testDynamicStructInt() +{ + Dynamic::Struct aStruct; + aStruct[0] = "Junior"; + aStruct[1] = "POCO"; + Var a1(aStruct); + assert (a1[0] == "Junior"); + assert (a1[1] == "POCO"); + a1[0] = "Senior"; + assert (a1[0] == "Senior"); + + Struct s1; + s1[1] = "1"; + s1[2] = "2"; + s1[3] = "3"; + + Struct s2(s1); + assert (s2[1] == "1"); + assert (s2[2] == "2"); + assert (s2[3] == "3"); + + std::map m1; + m1[1] = "1"; + m1[2] = "2"; + m1[3] = "3"; + + Struct m2(m1); + assert (m2[1] == "1"); + assert (m2[2] == "2"); + assert (m2[3] == "3"); +} + + +void VarTest::testDynamicPair() +{ + Pair aPair; + assert (0 == aPair.first()); + try + { + std::string s = aPair.second().convert(); + fail ("must fail"); + } + catch (InvalidAccessException&) { } + + Var va(aPair); + assert ("{ 0 : null }" == va.convert()); + + aPair = Pair(4, "123"); + assert ("123" == aPair.second()); + + va = aPair; + assert ("{ 4 : \"123\" }" == va.convert()); + + int i = 1; + std::string s = "2"; + Pair iPair(i, s); + assert (1 == iPair.first()); + assert ("2" == iPair.second()); + + Pair sPair(s, i); + assert ("2" == sPair.first()); + assert (1 == sPair.second()); + + std::pair p = std::make_pair(i, s); + Pair pPair(p); + assert (1 == pPair.first()); + assert ("2" == pPair.second()); + + Var vp(pPair); + assert ("{ 1 : \"2\" }" == vp.convert()); + + Var vs(sPair); + assert ("{ \"2\" : 1 }" == vs.convert()); +} + + +void VarTest::testArrayToString() +{ + std::string s1("string"); + Poco::Int8 s2(23); + std::vector s16; + s16.push_back(s1); + s16.push_back(s2); + Var a1(s16); + std::string res = a1.convert(); + std::string expected("[ \"string\", 23 ]"); + assert (res == expected); +} + + +void VarTest::testStructToString() +{ + DynamicStruct aStruct; + aStruct["First Name"] = "Junior"; + aStruct["Last Name"] = "POCO"; + aStruct["Age"] = 1; + Var a1(aStruct); + std::string res = a1.convert(); + std::string expected = "{ \"Age\" : 1, \"First Name\" : \"Junior\", \"Last Name\" : \"POCO\" }"; + assert (res == expected); +} + + +void VarTest::testArrayOfStructsToString() +{ + std::vector s16; + DynamicStruct aStruct; + aStruct["First Name"] = "Junior"; + aStruct["Last Name"] = "POCO"; + aStruct["Age"] = 1; + s16.push_back(aStruct); + aStruct["First Name"] = "Senior"; + aStruct["Last Name"] = "POCO"; + aStruct["Age"] = 100; + s16.push_back(aStruct); + std::vector s16Cpy = s16; + // recursive arrays! + s16Cpy.push_back(s16); + s16.push_back(s16Cpy); + Var a1(s16); + std::string res = a1.convert(); + std::string expected = "[ " + "{ \"Age\" : 1, \"First Name\" : \"Junior\", \"Last Name\" : \"POCO\" }, " + "{ \"Age\" : 100, \"First Name\" : \"Senior\", \"Last Name\" : \"POCO\" }, " + "[ " + "{ \"Age\" : 1, \"First Name\" : \"Junior\", \"Last Name\" : \"POCO\" }, " + "{ \"Age\" : 100, \"First Name\" : \"Senior\", \"Last Name\" : \"POCO\" }, " + "[ " + "{ \"Age\" : 1, \"First Name\" : \"Junior\", \"Last Name\" : \"POCO\" }, " + "{ \"Age\" : 100, \"First Name\" : \"Senior\", \"Last Name\" : \"POCO\" } " + "] ] ]"; + + assert (res == expected); +} + + +void VarTest::testStructWithArraysToString() +{ + std::string s1("string"); + Poco::Int8 s2(23); + std::vector s16; + s16.push_back(s1); + s16.push_back(s2); + Var a1(s16); + DynamicStruct addr; + addr["Number"] = 4; + addr["Street"] = "Unknown"; + addr["Country"] = "Carinthia"; + DynamicStruct aStruct; + aStruct["First Name"] = "Junior"; + aStruct["Last Name"] = a1; + aStruct["Age"] = 1; + aStruct["Address"] = addr; + Var a2(aStruct); + std::string res = a2.convert(); + std::string expected = "{ \"Address\" : { \"Country\" : \"Carinthia\", \"Number\" : 4, \"Street\" : \"Unknown\" }, " + "\"Age\" : 1, \"First Name\" : \"Junior\", \"Last Name\" : [ \"string\", 23 ] }"; + + assert (res == expected); +} + + +void VarTest::testJSONDeserializeString() +{ + Var a("test"); + std::string tst = Var::toString(a); + Var b = Var::parse(tst); + assert (b.convert() == "test"); + + Var c('c'); + std::string tst2 = Var::toString(c); + Var b2 = Var::parse(tst2); + char cc = b2.convert(); + assert (cc == 'c'); +} + + +void VarTest::testJSONDeserializePrimitives() +{ + Poco::Int8 i8(-12); + Poco::UInt16 u16(2345); + Poco::Int32 i32(-24343); + Poco::UInt64 u64(1234567890); + u64 *= u64; + bool b = false; + float f = 3.1415f; + double d = 3.1415; + + std::string s8 = Var::toString(i8); + std::string s16 = Var::toString(u16); + std::string s32 = Var::toString(i32); + std::string s64 = Var::toString(u64); + std::string sb = Var::toString(b); + std::string sf = Var::toString(f); + std::string sd = Var::toString(d); + Var a8 = Var::parse(s8); + Var a16 = Var::parse(s16); + Var a32 = Var::parse(s32); + Var a64 = Var::parse(s64); + Var ab = Var::parse(sb); + Var af = Var::parse(sf); + Var ad = Var::parse(sd); + assert (a8 == i8); + assert (a16 == u16); + assert (a32 == i32); + assert (a64 == u64); + assert (ab == b); + assert (af == f); + assert (ad == d); +} + + +void VarTest::testJSONDeserializeArray() +{ + Poco::Int8 i8(-12); + Poco::UInt16 u16(2345); + Poco::Int32 i32(-24343); + Poco::UInt64 u64(1234567890); + u64 *= u64; + bool b = false; + float f = 3.1415f; + double d = 3.1415; + std::string s("test string"); + char c('x'); + std::vector aVec; + aVec.push_back(i8); + aVec.push_back(u16); + aVec.push_back(i32); + aVec.push_back(u64); + aVec.push_back(b); + aVec.push_back(f); + aVec.push_back(d); + aVec.push_back(s); + aVec.push_back(c); + + std::string sVec = Var::toString(aVec); + Var a = Var::parse(sVec); + assert (a[0] == i8); + assert (a[1] == u16); + assert (a[2] == i32); + assert (a[3] == u64); + assert (a[4] == b); + assert (a[5] == f); + assert (a[6] == d); + assert (a[7] == s); + assert (a[8] == c); +} + + +void VarTest::testJSONDeserializeComplex() +{ + Poco::Int8 i8(-12); + Poco::UInt16 u16(2345); + Poco::Int32 i32(-24343); + Poco::UInt64 u64(1234567890); + u64 *= u64; + bool b = false; + float f = 3.1415f; + double d = 3.1415; + std::string s("test string"); + char c('x'); + DynamicStruct aStr; + aStr["i8"] = i8; + aStr["u16"] = u16; + aStr["i32"] = i32; + aStr["u64"] = u64; + aStr["b"] = b; + aStr["f"] = f; + aStr["d"] = d; + aStr["s"] = s; + aStr["c"] = c; + std::vector aVec; + aVec.push_back(i8); + aVec.push_back(u16); + aVec.push_back(i32); + aVec.push_back(u64); + aVec.push_back(b); + aVec.push_back(f); + aVec.push_back(d); + aVec.push_back(s); + aVec.push_back(c); + aVec.push_back(aStr); + aStr["vec"] = aVec; + + std::string sStr = Var::toString(aStr); + Var a = Var::parse(sStr); + assert (a.isStruct()); + assert (aStr["i8"] == i8); + assert (aStr["u16"] == u16); + assert (aStr["i32"] == i32); + assert (aStr["u64"] == u64); + assert (aStr["b"] == b); + assert (aStr["f"] == f); + assert (aStr["d"] == d); + assert (aStr["s"] == s); + assert (aStr["c"] == c); + Var vecRet = a["vec"]; + assert (vecRet.isArray()); + assert (vecRet[0] == i8); + assert (vecRet[1] == u16); + assert (vecRet[2] == i32); + assert (vecRet[3] == u64); + assert (vecRet[4] == b); + assert (vecRet[5] == f); + assert (vecRet[6] == d); + assert (vecRet[7] == s); + assert (vecRet[8] == c); + Var strRet = vecRet[9]; + assert (strRet.isStruct()); +} + + +void VarTest::testJSONDeserializeStruct() +{ + Poco::Int8 i8(-12); + Poco::UInt16 u16(2345); + Poco::Int32 i32(-24343); + Poco::UInt64 u64(1234567890); + u64 *= u64; + bool b = false; + float f = 3.1415f; + double d = 3.1415; + std::string s("test string"); + char c('x'); + DynamicStruct aStr; + aStr["i8"] = i8; + aStr["u16"] = u16; + aStr["i32"] = i32; + aStr["u64"] = u64; + aStr["b"] = b; + aStr["f"] = f; + aStr["d"] = d; + aStr["s"] = s; + aStr["c"] = c; + + std::string sStr = Var::toString(aStr); + Var a = Var::parse(sStr); + assert (aStr["i8"] == i8); + assert (aStr["u16"] == u16); + assert (aStr["i32"] == i32); + assert (aStr["u64"] == u64); + assert (aStr["b"] == b); + assert (aStr["f"] == f); + assert (aStr["d"] == d); + assert (aStr["s"] == s); + assert (aStr["c"] == c); +} + + +void VarTest::testDate() +{ + Poco::DateTime dtNow(2007, 3, 13, 8, 12, 15); + + Poco::Timestamp tsNow = dtNow.timestamp(); + Poco::LocalDateTime ldtNow(dtNow.timestamp()); + Var dt(dtNow); + Var ts(tsNow); + Var ldt(ldtNow); + Var dtStr(dt.convert()); + Var tsStr(ts.convert()); + Var ldtStr(ldt.convert()); + DateTime dtRes = dtStr.convert(); + LocalDateTime ldtRes = ldtStr.convert(); + Timestamp tsRes = tsStr.convert(); + assert (dtNow == dtRes); + assert (ldtNow == ldtRes); + assert (tsNow == tsRes); +} + +void VarTest::testGetIdxMustThrow(Var& a1, std::vector::size_type n) +{ + try + { + Var& val1 = a1[n]; + fail("bad cast - must throw"); + val1 = 0; // silence the compiler + } + catch (Poco::InvalidAccessException&) + { + } + + try + { + const Var& c1 = a1; + const Var& cval1 = c1[n]; + fail("bad const cast - must throw"); + assert (cval1 == c1); // silence the compiler + } + catch (Poco::InvalidAccessException&) + { + } +} + + +void VarTest::testEmpty() +{ + Var da; + assert (da.isEmpty()); + assert (da.type() == typeid(void)); + assert (!da.isArray()); + assert (!da.isInteger()); + assert (!da.isNumeric()); + assert (!da.isSigned()); + assert (!da.isString()); + assert (!(da == da)); + assert (!(da != da)); + + da = "123"; + int i = da.convert(); + assert (123 == i); + std::string s = da.extract(); + assert ("123" == s); + assert (!da.isEmpty()); + da.empty(); + assert (da.isEmpty()); + assert (da.type() == typeid(void)); + assert (!da.isArray()); + assert (!da.isInteger()); + assert (!da.isNumeric()); + assert (!da.isSigned()); + assert (!da.isString()); + assert (!(da == da)); + assert (!(da != da)); + + assert (da != ""); + assert ("" != da); + assert (!(da == "")); + assert (!("" == da)); + + + testEmptyComparisons(); + testEmptyComparisons(); + testEmptyComparisons(); + testEmptyComparisons(); + testEmptyComparisons(); + testEmptyComparisons(); + testEmptyComparisons(); + testEmptyComparisons(); + testEmptyComparisons(); + testEmptyComparisons(); +#ifdef POCO_LONG_IS_64_BIT + testEmptyComparisons(); + testEmptyComparisons(); +#endif + testEmptyComparisons(); + testEmptyComparisons(); + + try + { + int i = da; + fail ("must fail"); + } catch (InvalidAccessException&) { } + + try + { + int i = da.extract(); + fail ("must fail"); + } catch (InvalidAccessException&) { } +} + + +void VarTest::setUp() +{ +} + + +void VarTest::tearDown() +{ +} + + +CppUnit::Test* VarTest::suite() +{ + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("VarTest"); + + CppUnit_addTest(pSuite, VarTest, testInt8); + CppUnit_addTest(pSuite, VarTest, testInt16); + CppUnit_addTest(pSuite, VarTest, testInt32); + CppUnit_addTest(pSuite, VarTest, testInt64); + CppUnit_addTest(pSuite, VarTest, testUInt8); + CppUnit_addTest(pSuite, VarTest, testUInt16); + CppUnit_addTest(pSuite, VarTest, testUInt32); + CppUnit_addTest(pSuite, VarTest, testUInt64); + CppUnit_addTest(pSuite, VarTest, testBool); + CppUnit_addTest(pSuite, VarTest, testChar); + CppUnit_addTest(pSuite, VarTest, testFloat); + CppUnit_addTest(pSuite, VarTest, testDouble); + CppUnit_addTest(pSuite, VarTest, testLong); + CppUnit_addTest(pSuite, VarTest, testULong); + CppUnit_addTest(pSuite, VarTest, testString); + CppUnit_addTest(pSuite, VarTest, testUDT); + CppUnit_addTest(pSuite, VarTest, testConversionOperator); + CppUnit_addTest(pSuite, VarTest, testComparisonOperators); + CppUnit_addTest(pSuite, VarTest, testArithmeticOperators); + CppUnit_addTest(pSuite, VarTest, testLimitsInt); + CppUnit_addTest(pSuite, VarTest, testLimitsFloat); + CppUnit_addTest(pSuite, VarTest, testCtor); + CppUnit_addTest(pSuite, VarTest, testIsStruct); + CppUnit_addTest(pSuite, VarTest, testIsArray); + CppUnit_addTest(pSuite, VarTest, testArrayIdxOperator); + CppUnit_addTest(pSuite, VarTest, testDynamicPair); + CppUnit_addTest(pSuite, VarTest, testDynamicStructBasics); + CppUnit_addTest(pSuite, VarTest, testDynamicStructString); + CppUnit_addTest(pSuite, VarTest, testDynamicStructInt); + CppUnit_addTest(pSuite, VarTest, testArrayToString); + CppUnit_addTest(pSuite, VarTest, testStructToString); + CppUnit_addTest(pSuite, VarTest, testArrayOfStructsToString); + CppUnit_addTest(pSuite, VarTest, testStructWithArraysToString); + CppUnit_addTest(pSuite, VarTest, testJSONDeserializeString); + CppUnit_addTest(pSuite, VarTest, testJSONDeserializePrimitives); + CppUnit_addTest(pSuite, VarTest, testJSONDeserializeArray); + CppUnit_addTest(pSuite, VarTest, testJSONDeserializeStruct); + CppUnit_addTest(pSuite, VarTest, testJSONDeserializeComplex); + CppUnit_addTest(pSuite, VarTest, testDate); + CppUnit_addTest(pSuite, VarTest, testEmpty); + + return pSuite; +} diff --git a/JSON/JSON_CE_vs90.sln b/JSON/JSON_CE_vs90.sln index 6f9988eb7..b6c76a933 100644 --- a/JSON/JSON_CE_vs90.sln +++ b/JSON/JSON_CE_vs90.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_CE_vs90.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_CE_vs90.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" - ProjectSection(ProjectDependencies) = postProject - {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) - release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) - debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) - release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) - debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) - release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_CE_vs90.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_CE_vs90.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) + release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) + debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) + release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) + debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) + release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/JSON_CE_vs90.vcproj b/JSON/JSON_CE_vs90.vcproj index 049fde1d9..9600be84b 100644 --- a/JSON/JSON_CE_vs90.vcproj +++ b/JSON/JSON_CE_vs90.vcproj @@ -1,481 +1,481 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/JSON_vs100.vcxproj b/JSON/JSON_vs100.vcxproj index e2c646c77..25fde07dc 100644 --- a/JSON/JSON_vs100.vcxproj +++ b/JSON/JSON_vs100.vcxproj @@ -1,296 +1,296 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - JSON - {A63135B8-0DFC-428C-AF90-BC020BE83D0C} - XML - Win32Proj - - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoJSONd - PocoJSONmdd - PocoJSONmtd - PocoJSON - PocoJSONmd - PocoJSONmt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoJSONd.dll - true - true - ..\bin\PocoJSONd.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoJSONd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoJSON.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoJSON.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoJSONmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoJSONmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoJSONmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoJSONmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoJSONmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoJSONmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\lib\PocoJSONmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + JSON + {A63135B8-0DFC-428C-AF90-BC020BE83D0C} + XML + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoJSONd + PocoJSONmdd + PocoJSONmtd + PocoJSON + PocoJSONmd + PocoJSONmt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoJSONd.dll + true + true + ..\bin\PocoJSONd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoJSONd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoJSON.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoJSON.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoJSONmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoJSONmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoJSONmt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoJSONmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoJSONmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoJSONmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\lib\PocoJSONmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/JSON/JSON_vs100.vcxproj.filters b/JSON/JSON_vs100.vcxproj.filters index 9825a4f3d..90e41bf38 100644 --- a/JSON/JSON_vs100.vcxproj.filters +++ b/JSON/JSON_vs100.vcxproj.filters @@ -1,78 +1,78 @@ - - - - - {b4829cf4-4869-4e5d-97cd-d218af2d99c7} - - - {5c6e8198-4c99-4086-8496-cd11d1ce4c7b} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {b4829cf4-4869-4e5d-97cd-d218af2d99c7} + + + {5c6e8198-4c99-4086-8496-cd11d1ce4c7b} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/JSON/JSON_vs110.sln b/JSON/JSON_vs110.sln index 43deb96aa..968c1de73 100644 --- a/JSON/JSON_vs110.sln +++ b/JSON/JSON_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs110.vcxproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" - ProjectSection(ProjectDependencies) = postProject - {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Build.0 = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs110.vcxproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Build.0 = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/JSON_vs110.vcxproj b/JSON/JSON_vs110.vcxproj index 4f8406a41..52d1c01a2 100644 --- a/JSON/JSON_vs110.vcxproj +++ b/JSON/JSON_vs110.vcxproj @@ -1,302 +1,302 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - JSON - {0E7FE914-0690-3EB4-9119-93A97CC97741} - JSON - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoJSONd - PocoJSONmdd - PocoJSONmtd - PocoJSON - PocoJSONmd - PocoJSONmt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoJSONd.dll - true - true - ..\bin\PocoJSONd.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoJSONd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoJSON.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoJSON.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoJSONmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoJSONmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoJSONmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoJSONmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoJSONmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoJSONmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\lib\PocoJSONmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + JSON + {0E7FE914-0690-3EB4-9119-93A97CC97741} + JSON + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoJSONd + PocoJSONmdd + PocoJSONmtd + PocoJSON + PocoJSONmd + PocoJSONmt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoJSONd.dll + true + true + ..\bin\PocoJSONd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoJSONd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoJSON.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoJSON.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoJSONmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoJSONmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoJSONmt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoJSONmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoJSONmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoJSONmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\lib\PocoJSONmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/JSON_vs110.vcxproj.filters b/JSON/JSON_vs110.vcxproj.filters index 279221051..6e53552f9 100644 --- a/JSON/JSON_vs110.vcxproj.filters +++ b/JSON/JSON_vs110.vcxproj.filters @@ -1,78 +1,78 @@ - - - - - {f95002f7-ceed-402b-9692-6b79535cd94e} - - - {8d7e2a37-888a-4254-8d0c-b7909d1348b1} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + + + + + {f95002f7-ceed-402b-9692-6b79535cd94e} + + + {8d7e2a37-888a-4254-8d0c-b7909d1348b1} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/JSON/JSON_vs71.sln b/JSON/JSON_vs71.sln index 67224136d..af83f4f93 100644 --- a/JSON/JSON_vs71.sln +++ b/JSON/JSON_vs71.sln @@ -1,50 +1,50 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs71.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs71.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" - ProjectSection(ProjectDependencies) = postProject - {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - debug_shared = debug_shared - release_shared = release_shared - debug_static_mt = debug_static_mt - release_static_mt = release_static_mt - debug_static_md = debug_static_md - release_static_md = release_static_md - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared.ActiveCfg = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared.Build.0 = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared.ActiveCfg = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared.Build.0 = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt.Build.0 = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt.ActiveCfg = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt.Build.0 = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md.ActiveCfg = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md.Build.0 = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md.ActiveCfg = release_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md.Build.0 = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared.ActiveCfg = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared.Build.0 = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared.ActiveCfg = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared.Build.0 = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt.Build.0 = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt.ActiveCfg = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt.Build.0 = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md.ActiveCfg = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md.Build.0 = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md.ActiveCfg = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md.Build.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs71.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs71.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + debug_shared = debug_shared + release_shared = release_shared + debug_static_mt = debug_static_mt + release_static_mt = release_static_mt + debug_static_md = debug_static_md + release_static_md = release_static_md + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared.ActiveCfg = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared.Build.0 = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared.ActiveCfg = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared.Build.0 = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt.Build.0 = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt.ActiveCfg = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt.Build.0 = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md.ActiveCfg = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md.Build.0 = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md.ActiveCfg = release_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md.Build.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared.ActiveCfg = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared.Build.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared.ActiveCfg = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared.Build.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt.Build.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt.ActiveCfg = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt.Build.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md.ActiveCfg = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md.Build.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md.ActiveCfg = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md.Build.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/JSON/JSON_vs71.vcproj b/JSON/JSON_vs71.vcproj index 2db5e06f5..b9eaff778 100644 --- a/JSON/JSON_vs71.vcproj +++ b/JSON/JSON_vs71.vcproj @@ -1,413 +1,413 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/JSON_vs80.sln b/JSON/JSON_vs80.sln index 21661c1d0..9afd6eb11 100644 --- a/JSON/JSON_vs80.sln +++ b/JSON/JSON_vs80.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs80.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs80.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" - ProjectSection(ProjectDependencies) = postProject - {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Build.0 = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs80.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs80.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Build.0 = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/JSON_vs80.vcproj b/JSON/JSON_vs80.vcproj index 50fd02f4f..1a12e7876 100644 --- a/JSON/JSON_vs80.vcproj +++ b/JSON/JSON_vs80.vcproj @@ -1,434 +1,434 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/JSON_vs90.sln b/JSON/JSON_vs90.sln index 1acd4ab8c..6ed2fc75e 100644 --- a/JSON/JSON_vs90.sln +++ b/JSON/JSON_vs90.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs90.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs90.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" - ProjectSection(ProjectDependencies) = postProject - {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Build.0 = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs90.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs90.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Build.0 = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Build.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/JSON_vs90.vcproj b/JSON/JSON_vs90.vcproj index 40d20b555..44a80efcc 100644 --- a/JSON/JSON_vs90.vcproj +++ b/JSON/JSON_vs90.vcproj @@ -1,433 +1,433 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/JSON_x64_vs100.sln b/JSON/JSON_x64_vs100.sln index b0b420085..22a17a6c3 100644 --- a/JSON/JSON_x64_vs100.sln +++ b/JSON/JSON_x64_vs100.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_x64_vs100.vcxproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs100.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" - ProjectSection(ProjectDependencies) = postProject - {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Build.0 = debug_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.ActiveCfg = release_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Build.0 = release_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Deploy.0 = release_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Build.0 = release_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Build.0 = debug_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.ActiveCfg = release_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Build.0 = release_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Deploy.0 = release_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Build.0 = release_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_x64_vs100.vcxproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs100.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Build.0 = debug_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.ActiveCfg = release_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Build.0 = release_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Deploy.0 = release_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Build.0 = release_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Build.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.ActiveCfg = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Build.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Deploy.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Build.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/JSON_x64_vs110.sln b/JSON/JSON_x64_vs110.sln index 1b0c1d999..a24025a9e 100644 --- a/JSON/JSON_x64_vs110.sln +++ b/JSON/JSON_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_x64_vs110.vcxproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" - ProjectSection(ProjectDependencies) = postProject - {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Build.0 = debug_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.ActiveCfg = release_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Build.0 = release_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Deploy.0 = release_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Build.0 = release_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Build.0 = debug_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.ActiveCfg = release_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Build.0 = release_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Deploy.0 = release_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Build.0 = release_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_x64_vs110.vcxproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Build.0 = debug_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.ActiveCfg = release_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Build.0 = release_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Deploy.0 = release_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Build.0 = release_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Build.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.ActiveCfg = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Build.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Deploy.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Build.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/JSON_x64_vs110.vcxproj b/JSON/JSON_x64_vs110.vcxproj index 121d55c25..026253844 100644 --- a/JSON/JSON_x64_vs110.vcxproj +++ b/JSON/JSON_x64_vs110.vcxproj @@ -1,300 +1,300 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - JSON - {0E7FE914-0690-3EB4-9119-93A97CC97741} - JSON - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoJSON64d - PocoJSONmdd - PocoJSONmtd - PocoJSON64 - PocoJSONmd - PocoJSONmt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoJSON64d.dll - true - true - ..\bin64\PocoJSON64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoJSONd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoJSON64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoJSON.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoJSONmtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoJSONmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoJSONmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoJSONmdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoJSONmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoJSONmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + JSON + {0E7FE914-0690-3EB4-9119-93A97CC97741} + JSON + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoJSON64d + PocoJSONmdd + PocoJSONmtd + PocoJSON64 + PocoJSONmd + PocoJSONmt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoJSON64d.dll + true + true + ..\bin64\PocoJSON64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoJSONd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoJSON64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoJSON.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoJSONmtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoJSONmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoJSONmt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoJSONmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoJSONmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoJSONmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/JSON_x64_vs110.vcxproj.filters b/JSON/JSON_x64_vs110.vcxproj.filters index 54e71e529..4578d5ef4 100644 --- a/JSON/JSON_x64_vs110.vcxproj.filters +++ b/JSON/JSON_x64_vs110.vcxproj.filters @@ -1,78 +1,78 @@ - - - - - {bff7a40f-9ccb-4289-b576-d3294eadedca} - - - {437cb1ec-dde2-4fa8-a1cf-3fefdbd1c523} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + + + + + {bff7a40f-9ccb-4289-b576-d3294eadedca} + + + {437cb1ec-dde2-4fa8-a1cf-3fefdbd1c523} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/JSON/JSON_x64_vs90.sln b/JSON/JSON_x64_vs90.sln index 43365c47d..a3af2f421 100644 --- a/JSON/JSON_x64_vs90.sln +++ b/JSON/JSON_x64_vs90.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_x64_vs90.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" - ProjectSection(ProjectDependencies) = postProject - {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Build.0 = debug_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.ActiveCfg = release_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Build.0 = release_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Deploy.0 = release_shared|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Build.0 = release_static_md|x64 - {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Build.0 = debug_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.ActiveCfg = release_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Build.0 = release_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Deploy.0 = release_shared|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Build.0 = release_static_md|x64 - {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_x64_vs90.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" + ProjectSection(ProjectDependencies) = postProject + {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Build.0 = debug_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.ActiveCfg = release_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Build.0 = release_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_shared|x64.Deploy.0 = release_shared|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Build.0 = release_static_md|x64 + {0E7FE914-0690-3EB4-9119-93A97CC97741}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Build.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.ActiveCfg = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Build.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_shared|x64.Deploy.0 = release_shared|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Build.0 = release_static_md|x64 + {96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/JSON_x64_vs90.vcproj b/JSON/JSON_x64_vs90.vcproj index 6c4f100a7..a26d8d8ca 100644 --- a/JSON/JSON_x64_vs90.vcproj +++ b/JSON/JSON_x64_vs90.vcproj @@ -1,438 +1,438 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/samples/Benchmark/Benchmark_CE_vs90.vcproj b/JSON/samples/Benchmark/Benchmark_CE_vs90.vcproj index 8629dcaa1..01a8d9855 100644 --- a/JSON/samples/Benchmark/Benchmark_CE_vs90.vcproj +++ b/JSON/samples/Benchmark/Benchmark_CE_vs90.vcproj @@ -1,468 +1,468 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/samples/Benchmark/Benchmark_vs100.vcxproj b/JSON/samples/Benchmark/Benchmark_vs100.vcxproj index 641ef7551..1dc9cc9c6 100644 --- a/JSON/samples/Benchmark/Benchmark_vs100.vcxproj +++ b/JSON/samples/Benchmark/Benchmark_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Benchmark - {D0381ECF-E750-32DA-8EEF-92D56B172D15} - Benchmark - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Benchmarkd - Benchmarkd - Benchmarkd - Benchmark - Benchmark - Benchmark - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Benchmarkd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Benchmarkd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Benchmark.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Benchmarkd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Benchmarkd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Benchmark.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Benchmarkd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Benchmarkd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Benchmark.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Benchmark + {D0381ECF-E750-32DA-8EEF-92D56B172D15} + Benchmark + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Benchmarkd + Benchmarkd + Benchmarkd + Benchmark + Benchmark + Benchmark + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Benchmarkd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Benchmarkd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Benchmark.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Benchmarkd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Benchmarkd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Benchmark.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Benchmarkd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Benchmarkd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Benchmark.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/JSON/samples/Benchmark/Benchmark_vs100.vcxproj.filters b/JSON/samples/Benchmark/Benchmark_vs100.vcxproj.filters index c5df1a0f2..a8dd05b32 100644 --- a/JSON/samples/Benchmark/Benchmark_vs100.vcxproj.filters +++ b/JSON/samples/Benchmark/Benchmark_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {e58dfba4-0f4f-4309-8f4b-42dfe5787ba5} - - - {1d075cd5-6323-477e-b875-3855647929f8} - - - - - Source Files - - + + + + + {e58dfba4-0f4f-4309-8f4b-42dfe5787ba5} + + + {1d075cd5-6323-477e-b875-3855647929f8} + + + + + Source Files + + \ No newline at end of file diff --git a/JSON/samples/Benchmark/Benchmark_vs110.vcxproj b/JSON/samples/Benchmark/Benchmark_vs110.vcxproj index 0723e04bd..897685f67 100644 --- a/JSON/samples/Benchmark/Benchmark_vs110.vcxproj +++ b/JSON/samples/Benchmark/Benchmark_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Benchmark - {D0381ECF-E750-32DA-8EEF-92D56B172D15} - Benchmark - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Benchmarkd - Benchmarkd - Benchmarkd - Benchmark - Benchmark - Benchmark - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Benchmarkd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Benchmarkd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Benchmark.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Benchmarkd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Benchmarkd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Benchmark.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Benchmarkd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Benchmarkd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Benchmark.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Benchmark + {D0381ECF-E750-32DA-8EEF-92D56B172D15} + Benchmark + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Benchmarkd + Benchmarkd + Benchmarkd + Benchmark + Benchmark + Benchmark + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Benchmarkd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Benchmarkd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Benchmark.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Benchmarkd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Benchmarkd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Benchmark.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Benchmarkd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Benchmarkd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Benchmark.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/JSON/samples/Benchmark/Benchmark_vs110.vcxproj.filters b/JSON/samples/Benchmark/Benchmark_vs110.vcxproj.filters index 931318388..0867eab1f 100644 --- a/JSON/samples/Benchmark/Benchmark_vs110.vcxproj.filters +++ b/JSON/samples/Benchmark/Benchmark_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {b3f6581f-1959-42f8-97d6-e15672a6034d} - - - {de478574-1bf1-4c1b-ba7e-173b67973828} - - - - - Source Files - - + + + + + {b3f6581f-1959-42f8-97d6-e15672a6034d} + + + {de478574-1bf1-4c1b-ba7e-173b67973828} + + + + + Source Files + + \ No newline at end of file diff --git a/JSON/samples/Benchmark/Benchmark_vs71.vcproj b/JSON/samples/Benchmark/Benchmark_vs71.vcproj index ae1fb64f1..dcdf8aa47 100644 --- a/JSON/samples/Benchmark/Benchmark_vs71.vcproj +++ b/JSON/samples/Benchmark/Benchmark_vs71.vcproj @@ -1,395 +1,395 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/samples/Benchmark/Benchmark_vs80.vcproj b/JSON/samples/Benchmark/Benchmark_vs80.vcproj index 7491491c0..073ac60e1 100644 --- a/JSON/samples/Benchmark/Benchmark_vs80.vcproj +++ b/JSON/samples/Benchmark/Benchmark_vs80.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/samples/Benchmark/Benchmark_vs90.vcproj b/JSON/samples/Benchmark/Benchmark_vs90.vcproj index 12757e0e2..02649b79a 100644 --- a/JSON/samples/Benchmark/Benchmark_vs90.vcproj +++ b/JSON/samples/Benchmark/Benchmark_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/samples/Benchmark/Benchmark_x64_vs100.vcxproj b/JSON/samples/Benchmark/Benchmark_x64_vs100.vcxproj index 54dcac50e..06283e2cc 100644 --- a/JSON/samples/Benchmark/Benchmark_x64_vs100.vcxproj +++ b/JSON/samples/Benchmark/Benchmark_x64_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Benchmark - {D0381ECF-E750-32DA-8EEF-92D56B172D15} - Benchmark - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Benchmarkd - Benchmarkd - Benchmarkd - Benchmark - Benchmark - Benchmark - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Benchmarkd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Benchmarkd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Benchmark.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Benchmarkd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Benchmarkd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Benchmark.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Benchmarkd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Benchmarkd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Benchmark.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Benchmark + {D0381ECF-E750-32DA-8EEF-92D56B172D15} + Benchmark + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Benchmarkd + Benchmarkd + Benchmarkd + Benchmark + Benchmark + Benchmark + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Benchmarkd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Benchmarkd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Benchmark.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Benchmarkd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Benchmarkd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Benchmark.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Benchmarkd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Benchmarkd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Benchmark.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/JSON/samples/Benchmark/Benchmark_x64_vs100.vcxproj.filters b/JSON/samples/Benchmark/Benchmark_x64_vs100.vcxproj.filters index 73b1fb5e5..e18bb7c29 100644 --- a/JSON/samples/Benchmark/Benchmark_x64_vs100.vcxproj.filters +++ b/JSON/samples/Benchmark/Benchmark_x64_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {6ac03e6c-f888-4ddb-b3b8-d3b5a9c70346} - - - {776bab70-9a5f-4947-afe8-3f705df5e0ce} - - - - - Source Files - - + + + + + {6ac03e6c-f888-4ddb-b3b8-d3b5a9c70346} + + + {776bab70-9a5f-4947-afe8-3f705df5e0ce} + + + + + Source Files + + \ No newline at end of file diff --git a/JSON/samples/Benchmark/Benchmark_x64_vs110.vcxproj b/JSON/samples/Benchmark/Benchmark_x64_vs110.vcxproj index b5a69a606..40eea1dd4 100644 --- a/JSON/samples/Benchmark/Benchmark_x64_vs110.vcxproj +++ b/JSON/samples/Benchmark/Benchmark_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Benchmark - {D0381ECF-E750-32DA-8EEF-92D56B172D15} - Benchmark - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Benchmarkd - Benchmarkd - Benchmarkd - Benchmark - Benchmark - Benchmark - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Benchmarkd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Benchmarkd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Benchmark.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Benchmarkd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Benchmarkd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Benchmark.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Benchmarkd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Benchmarkd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Benchmark.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Benchmark + {D0381ECF-E750-32DA-8EEF-92D56B172D15} + Benchmark + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Benchmarkd + Benchmarkd + Benchmarkd + Benchmark + Benchmark + Benchmark + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Benchmarkd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Benchmarkd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Benchmark.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Benchmarkd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Benchmarkd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Benchmark.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Benchmarkd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Benchmarkd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Benchmark.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/JSON/samples/Benchmark/Benchmark_x64_vs110.vcxproj.filters b/JSON/samples/Benchmark/Benchmark_x64_vs110.vcxproj.filters index 4e863a999..4fb309110 100644 --- a/JSON/samples/Benchmark/Benchmark_x64_vs110.vcxproj.filters +++ b/JSON/samples/Benchmark/Benchmark_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {20b39047-6b50-4624-bb54-6c1fae0d9bf0} - - - {c8cfad70-9dd3-47df-a14a-5500e64694a6} - - - - - Source Files - - + + + + + {20b39047-6b50-4624-bb54-6c1fae0d9bf0} + + + {c8cfad70-9dd3-47df-a14a-5500e64694a6} + + + + + Source Files + + \ No newline at end of file diff --git a/JSON/samples/Benchmark/Benchmark_x64_vs90.vcproj b/JSON/samples/Benchmark/Benchmark_x64_vs90.vcproj index 3c423f603..9c787b184 100644 --- a/JSON/samples/Benchmark/Benchmark_x64_vs90.vcproj +++ b/JSON/samples/Benchmark/Benchmark_x64_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/samples/Benchmark/src/Benchmark.cpp b/JSON/samples/Benchmark/src/Benchmark.cpp index b42ff68fb..64ddd65d5 100644 --- a/JSON/samples/Benchmark/src/Benchmark.cpp +++ b/JSON/samples/Benchmark/src/Benchmark.cpp @@ -1,113 +1,113 @@ -// -// Benchmark.cpp -// -// $Id$ -// -// This sample shows a benchmark of the JSON parser. -// -// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Timestamp.h" -#include "Poco/JSON/Parser.h" -#include "Poco/JSON/DefaultHandler.h" -#include "Poco/JSON/JSONException.h" -#include "Poco/Environment.h" -#include "Poco/Path.h" -#include "Poco/File.h" -#include "Poco/FileStream.h" -#include "Poco/StreamCopier.h" -#include -#include - - -void printTimeDiff(const Poco::Timestamp& start, const Poco::Timestamp& end) -{ - Poco::Timestamp::TimeDiff diff = end - start; - std::cout << std::setw(25) << std::left << diff; -} - - -int main(int argc, char** argv) -{ - Poco::JSON::Object::Ptr obj; - - std::string dir = Poco::Environment::get("POCO_BASE") + "/JSON/samples/Benchmark/"; - Poco::Path filePath(dir, "input"); - - std::ostringstream ostr; - - if ( filePath.isFile() ) - { - Poco::File inputFile(filePath); - if ( inputFile.exists() ) - { - Poco::FileInputStream fis(filePath.toString()); - Poco::StreamCopier::copyStream(fis, ostr); - } - else - { - std::cout << filePath.toString() << " doesn't exist!" << std::endl; - return 1; - } - } - - std::cout << std::setw(25) << "POCO JSON"; - - std::string jsonStr = ostr.str(); - - try - { - Poco::JSON::DefaultHandler handler; - Poco::JSON::Parser parser; - parser.setHandler(&handler); - Poco::Timestamp time1; - parser.parse(jsonStr); - Poco::DynamicAny result = handler.result(); - Poco::Timestamp time2; - printTimeDiff(time1, time2); - - if ( result.type() == typeid(Poco::JSON::Object::Ptr) ) - { - obj = result.extract(); - } - - //Serialize to string - std::ostringstream out; - Poco::Timestamp time3; - obj->stringify(out); - Poco::Timestamp time4; - printTimeDiff(time3, time4); - std::cout << std::endl; - } - catch(Poco::JSON::JSONException jsone) - { - std::cout << jsone.message() << std::endl; - } - - return 0; -} +// +// Benchmark.cpp +// +// $Id$ +// +// This sample shows a benchmark of the JSON parser. +// +// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Timestamp.h" +#include "Poco/JSON/Parser.h" +#include "Poco/JSON/DefaultHandler.h" +#include "Poco/JSON/JSONException.h" +#include "Poco/Environment.h" +#include "Poco/Path.h" +#include "Poco/File.h" +#include "Poco/FileStream.h" +#include "Poco/StreamCopier.h" +#include +#include + + +void printTimeDiff(const Poco::Timestamp& start, const Poco::Timestamp& end) +{ + Poco::Timestamp::TimeDiff diff = end - start; + std::cout << std::setw(25) << std::left << diff; +} + + +int main(int argc, char** argv) +{ + Poco::JSON::Object::Ptr obj; + + std::string dir = Poco::Environment::get("POCO_BASE") + "/JSON/samples/Benchmark/"; + Poco::Path filePath(dir, "input"); + + std::ostringstream ostr; + + if ( filePath.isFile() ) + { + Poco::File inputFile(filePath); + if ( inputFile.exists() ) + { + Poco::FileInputStream fis(filePath.toString()); + Poco::StreamCopier::copyStream(fis, ostr); + } + else + { + std::cout << filePath.toString() << " doesn't exist!" << std::endl; + return 1; + } + } + + std::cout << std::setw(25) << "POCO JSON"; + + std::string jsonStr = ostr.str(); + + try + { + Poco::JSON::DefaultHandler handler; + Poco::JSON::Parser parser; + parser.setHandler(&handler); + Poco::Timestamp time1; + parser.parse(jsonStr); + Poco::DynamicAny result = handler.result(); + Poco::Timestamp time2; + printTimeDiff(time1, time2); + + if ( result.type() == typeid(Poco::JSON::Object::Ptr) ) + { + obj = result.extract(); + } + + //Serialize to string + std::ostringstream out; + Poco::Timestamp time3; + obj->stringify(out); + Poco::Timestamp time4; + printTimeDiff(time3, time4); + std::cout << std::endl; + } + catch(Poco::JSON::JSONException jsone) + { + std::cout << jsone.message() << std::endl; + } + + return 0; +} diff --git a/JSON/samples/samples_CE_vs90.sln b/JSON/samples/samples_CE_vs90.sln index b50448e5b..529d2adc1 100644 --- a/JSON/samples/samples_CE_vs90.sln +++ b/JSON/samples/samples_CE_vs90.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_CE_vs90.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) - release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) - debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) - release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) - debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) - release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_CE_vs90.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) + release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I) + debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I) + release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I) + debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I) + release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/samples/samples_vs100.sln b/JSON/samples/samples_vs100.sln index f6d5288e4..c5bf0672d 100644 --- a/JSON/samples/samples_vs100.sln +++ b/JSON/samples/samples_vs100.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_vs100.vcxproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Build.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_vs100.vcxproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Build.0 = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/samples/samples_vs110.sln b/JSON/samples/samples_vs110.sln index fc1868de7..ed6fd9c6d 100644 --- a/JSON/samples/samples_vs110.sln +++ b/JSON/samples/samples_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_vs110.vcxproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Build.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_vs110.vcxproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Build.0 = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/samples/samples_vs71.sln b/JSON/samples/samples_vs71.sln index 7b2f4fe2a..f79cbefea 100644 --- a/JSON/samples/samples_vs71.sln +++ b/JSON/samples/samples_vs71.sln @@ -1,33 +1,33 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_vs71.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - debug_shared = debug_shared - release_shared = release_shared - debug_static_mt = debug_static_mt - release_static_mt = release_static_mt - debug_static_md = debug_static_md - release_static_md = release_static_md - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared.ActiveCfg = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared.Build.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared.ActiveCfg = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared.Build.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt.Build.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt.ActiveCfg = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt.Build.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md.ActiveCfg = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md.Build.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md.ActiveCfg = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md.Build.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_vs71.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + debug_shared = debug_shared + release_shared = release_shared + debug_static_mt = debug_static_mt + release_static_mt = release_static_mt + debug_static_md = debug_static_md + release_static_md = release_static_md + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared.ActiveCfg = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared.Build.0 = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared.ActiveCfg = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared.Build.0 = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt.Build.0 = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt.ActiveCfg = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt.Build.0 = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md.ActiveCfg = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md.Build.0 = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md.ActiveCfg = release_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md.Build.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/JSON/samples/samples_vs80.sln b/JSON/samples/samples_vs80.sln index 1750b1422..511126e44 100644 --- a/JSON/samples/samples_vs80.sln +++ b/JSON/samples/samples_vs80.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_vs80.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Build.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_vs80.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Build.0 = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/samples/samples_vs90.sln b/JSON/samples/samples_vs90.sln index 45ad13e6e..a7a332e81 100644 --- a/JSON/samples/samples_vs90.sln +++ b/JSON/samples/samples_vs90.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_vs90.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Build.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_vs90.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Build.0 = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/samples/samples_x64_vs100.sln b/JSON/samples/samples_x64_vs100.sln index 19d3366f7..aaa1da08b 100644 --- a/JSON/samples/samples_x64_vs100.sln +++ b/JSON/samples/samples_x64_vs100.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_x64_vs100.vcxproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Build.0 = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.ActiveCfg = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Build.0 = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Deploy.0 = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Build.0 = release_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_x64_vs100.vcxproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Build.0 = debug_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.ActiveCfg = release_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Build.0 = release_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Deploy.0 = release_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Build.0 = release_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/samples/samples_x64_vs110.sln b/JSON/samples/samples_x64_vs110.sln index 21c53a784..fb82bc54b 100644 --- a/JSON/samples/samples_x64_vs110.sln +++ b/JSON/samples/samples_x64_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_x64_vs110.vcxproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Build.0 = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.ActiveCfg = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Build.0 = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Deploy.0 = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Build.0 = release_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_x64_vs110.vcxproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Build.0 = debug_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.ActiveCfg = release_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Build.0 = release_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Deploy.0 = release_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Build.0 = release_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/samples/samples_x64_vs90.sln b/JSON/samples/samples_x64_vs90.sln index a3c9200b1..24c6307ed 100644 --- a/JSON/samples/samples_x64_vs90.sln +++ b/JSON/samples/samples_x64_vs90.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_x64_vs90.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Build.0 = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.ActiveCfg = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Build.0 = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Deploy.0 = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Build.0 = release_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark_x64_vs90.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Build.0 = debug_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.ActiveCfg = release_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Build.0 = release_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Deploy.0 = release_shared|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Build.0 = release_static_md|x64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JSON/src/Parser.cpp b/JSON/src/Parser.cpp index 3ef5fd419..0c4a5a83b 100644 --- a/JSON/src/Parser.cpp +++ b/JSON/src/Parser.cpp @@ -1,700 +1,701 @@ -// -// Parser.cpp -// -// $Id$ -// -// Library: JSON -// Package: JSON -// Module: Parser -// -// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/JSON/Parser.h" -#include "Poco/JSON/JSONException.h" -#include "Poco/Ascii.h" -#include "Poco/Token.h" -#undef min -#undef max -#include - - -namespace Poco { -namespace JSON { - - -class SeparatorToken: public Token -{ -public: - SeparatorToken() - { - } - - virtual ~SeparatorToken() - { - } - - Class tokenClass() const - { - return Token::SEPARATOR_TOKEN; - } - - bool start(char c, std::istream& istr) - { - if ( c == '{' - || c == '}' - || c == ']' - || c == '[' - || c == ',' - || c == ':' ) - { - _value = c; - return true; - } - - if ( c == '\'' ) - { - throw JSONException("Invalid quote found"); - } - - else return false; - } - - void finish(std::istream& istr) - { - } -}; - - -class StringToken: public Token -{ -public: - StringToken() - { - } - - virtual ~StringToken() - { - } - - Class tokenClass() const - { - return Token::STRING_LITERAL_TOKEN; - } - - bool start(char c, std::istream& istr) - { - if ( c == '"') - { - _value = ""; // We don't need the quote! - return true; - } - else return false; - } - - void finish(std::istream& istr) - { - int c = istr.get(); - while (c != -1) - { - if ( c == 0 ) - { - throw JSONException("Null byte not allowed"); - } - - if ( 0 < c && c <= 0x1F ) - { - throw JSONException(format("Control character 0x%x not allowed", (unsigned int) c)); - } - - if ( c == '"' ) - break; - - if ( c == '\\' ) // Escaped String - { - c = istr.get(); - switch(c) - { - case '"' : - c = '"'; - break; - case '\\' : - c = '\\'; - break; - case '/' : - c = '/'; - break; - case 'b' : - c = '\b'; - break; - case 'f' : - c = '\f'; - break; - case 'n' : - c = '\n'; - break; - case 'r' : - c = '\r'; - break; - case 't' : - c = '\t'; - break; - case 'u' : // Unicode - { - Poco::Int32 unicode = decodeUnicode(istr); - if ( unicode == 0 ) - { - throw JSONException("\\u0000 is not allowed"); - } - if ( unicode >= 0xD800 && unicode <= 0xDBFF ) - { - c = istr.get(); - if ( c != '\\' ) - { - throw JSONException("Invalid unicode surrogate pair"); - } - c = istr.get(); - if ( c != 'u' ) - { - throw JSONException("Invalid unicode surrogate pair"); - } - Poco::Int32 surrogatePair = decodeUnicode(istr); - if ( 0xDC00 <= surrogatePair && surrogatePair <= 0xDFFF ) - { - unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF); - } - else - { - throw JSONException("Invalid unicode surrogate pair"); - } - } - else if ( 0xDC00 <= unicode && unicode <= 0xDFFF ) - { - throw JSONException("Invalid unicode"); - } - c = unicode; - break; - } - default: - { - throw JSONException(format("Invalid escape '%c' character used", (char) c)); - } - } - } - _value += c; - c = istr.get(); - } - - if ( c == -1 ) - { - throw JSONException("Unterminated string found"); - } - } - - Poco::Int32 decodeUnicode(std::istream& istr) - { - Poco::Int32 value = 0; - - for(int i = 0; i < 4; i++) - { - value <<= 4; - int nc = istr.peek(); - if ( nc == -1 ) - { - throw JSONException("Invalid unicode sequence"); - } - istr.get(); // No EOF, so read the character - - if (nc >= '0' && nc <= '9') - value += nc - '0'; - else if (nc >= 'A' && nc <= 'F') - value += 10 + nc - 'A'; - else if (nc >= 'a' && nc <= 'f') - value += 10 + nc - 'a'; - else - throw JSONException("Invalid unicode sequence. Hexadecimal digit expected"); - } - - return value; - } -}; - - -class KeywordToken : public Token -{ -public: - KeywordToken() - { - } - - virtual ~KeywordToken() - { - } - - Class tokenClass() const - { - return Token::KEYWORD_TOKEN; - } - - bool start(char c, std::istream& istr) - { - if ( Ascii::isAlpha(c) ) - { - _value = c; - return true; - } - return false; - } - - void finish(std::istream& istr) - { - int c = istr.peek(); - while (c != -1 && Ascii::isAlpha(c) ) - { - istr.get(); - _value += c; - c = istr.peek(); - } - } -}; - - -class NumberToken: public Token -{ -public: - NumberToken() : _activeClass(INTEGER_LITERAL_TOKEN) - { - } - - virtual ~NumberToken() - { - } - - Class tokenClass() const - { - return _activeClass; - } - - bool start(char c, std::istream& istr) - { - // Reset the active class to integer - _activeClass = INTEGER_LITERAL_TOKEN; - - if ( c == -1 ) - return false; - - if ( Ascii::isDigit(c) ) - { - if ( c == '0' ) - { - int nc = istr.peek(); - if ( Ascii::isDigit(nc) ) // A digit after a zero is not allowed - { - throw JSONException("Number can't start with a zero"); - } - } - _value = c; - return true; - } - - if ( c == '-' ) - { - _value = c; - - int nc = istr.peek(); - if ( Ascii::isDigit(nc) ) - { - if ( nc == '0' ) - { - _value += '0'; - istr.get(); - - nc = istr.peek(); - if ( Ascii::isDigit(nc) ) // A digit after -0 is not allowed - { - throw JSONException("Number can't start with a zero"); - } - } - return true; - } - } - - return false; - } - - void finish(std::istream& istr) - { - int c; - while( (c = istr.peek()) != -1) - { - if ( Ascii::isDigit(c) ) - { - _value += c; - istr.get(); - } - else - { - switch(c) - { - case '.': // Float - { - if ( _activeClass == Token::FLOAT_LITERAL_TOKEN ) - { - throw JSONException("Invalid float value"); - } - _activeClass = Token::FLOAT_LITERAL_TOKEN; - - _value += c; - istr.get(); - - // After a . we need a digit - c = istr.peek(); - if ( ! Ascii::isDigit(c) ) - { - throw JSONException("Invalid float value"); - } - - break; - } - case 'E': - case 'e': - { - if ( _activeClass == Token::DOUBLE_LITERAL_TOKEN ) - { - throw JSONException("Invalid double value"); - } - _activeClass = Token::DOUBLE_LITERAL_TOKEN; - - // Add the e or E - _value += c; - istr.get(); - - // When the next char is - or + then read the next char - c = istr.peek(); - if ( c == '-' || c == '+' ) - { - _value += c; - istr.get(); - c = istr.peek(); - } - - if ( ! Ascii::isDigit(c) ) - { - throw JSONException("Invalid double value"); - } - - break; - } - default: - return; // End of number token - } - - istr.get(); // If we get here we have a valid character for a number - _value += c; - } - } - } - -private: - Class _activeClass; -}; - - -Parser::Parser() : _tokenizer(), _handler(NULL) -{ - _tokenizer.addToken(new WhitespaceToken()); - _tokenizer.addToken(new InvalidToken()); - _tokenizer.addToken(new SeparatorToken()); - _tokenizer.addToken(new StringToken()); - _tokenizer.addToken(new NumberToken()); - _tokenizer.addToken(new KeywordToken()); -} - - -Parser::~Parser() -{ - -} - - -const Token* Parser::nextToken() -{ - const Token* token = _tokenizer.next(); - if ( token->is(Token::EOF_TOKEN) ) - { - throw JSONException("Unexpected EOF found"); - } - return token; -} - - -void Parser::parse(std::istream& in) -{ - _tokenizer.attachToStream(in); - const Token* token = nextToken(); - - if ( token->is(Token::SEPARATOR_TOKEN) ) - { - // This must be a { or a [ - if ( token->asChar() == '{' ) - { - readObject(); - } - else if ( token->asChar() == '[' ) - { - readArray(); - } - else - { - throw JSONException(format("Invalid separator '%c' found. Expecting { or [", token->asChar())); - } - token = _tokenizer.next(); - if ( ! token->is(Token::EOF_TOKEN) ) - { - throw JSONException(format("EOF expected but found '%s'", token->asString())); - } - } - else - { - throw JSONException(format("Invalid token '%s' found. Expecting { or [", token->asString())); - } -} - - -void Parser::readObject() -{ - if ( _handler != NULL ) - { - _handler->startObject(); - } - - if ( readRow(true) ) // First call is special: check for empty object - { - while(readRow()); - } - - if ( _handler != NULL ) - { - _handler->endObject(); - } -} - - -bool Parser::readRow(bool firstCall) -{ - const Token* token = nextToken(); - - if ( firstCall && token->tokenClass() == Token::SEPARATOR_TOKEN && token->asChar() == '}' ) - { - return false; // End of object is possible for an empty object - } - - if ( token->tokenClass() == Token::STRING_LITERAL_TOKEN ) - { - std::string propertyName = token->tokenString(); - if ( _handler != NULL ) - { - _handler->key(propertyName); - } - - token = nextToken(); - - if ( token->is(Token::SEPARATOR_TOKEN) - && token->asChar() == ':' ) - { - readValue(nextToken()); - - token = nextToken(); - - if ( token->is(Token::SEPARATOR_TOKEN) ) - { - if ( token->asChar() == ',' ) - { - return true; // Read next row - } - else if ( token->asChar() == '}' ) - { - return false; // End of object - } - else - { - throw JSONException(format("Invalid separator '%c' found. Expecting , or }", token->asChar())); - } - } - else - { - throw JSONException(format("Invalid token '%s' found. Expecting , or }", token->asString())); - } - } - else - { - throw JSONException(format("Invalid token '%s' found. Expecting :", token->asString())); - } - } - else - { - throw JSONException(format("Invalid token '%s' found. Expecting key", token->asString())); - } -} - - -void Parser::readValue(const Token* token) -{ - switch(token->tokenClass()) - { - default: - case Token::IDENTIFIER_TOKEN: - case Token::OPERATOR_TOKEN: - case Token::CHAR_LITERAL_TOKEN: - break; - - case Token::INTEGER_LITERAL_TOKEN: - if ( _handler != NULL ) - { - int value = token->asInteger(); -#if defined(POCO_HAVE_INT64) - if ( value == std::numeric_limits::max() - || value == std::numeric_limits::min() ) - { - _handler->value(NumberParser::parse64(token->asString())); - } - else - { - _handler->value(token->asInteger()); - } -#else - _handle->value(value); -#endif - } - break; - case Token::KEYWORD_TOKEN: - { - if ( token->tokenString().compare("null") == 0 ) - { - if ( _handler != NULL ) - { - _handler->null(); - } - } - else if ( token->tokenString().compare("true") == 0 ) - { - if ( _handler != NULL ) - { - _handler->value(true); - } - } - else if ( token->tokenString().compare("false") == 0 ) - { - if ( _handler != NULL ) - { - _handler->value(false); - } - } - else - { - throw JSONException(format("Invalid keyword '%s' found", token->asString())); - } - break; - } - case Token::FLOAT_LITERAL_TOKEN: - // Fall through - case Token::DOUBLE_LITERAL_TOKEN: - if ( _handler != NULL ) - { - _handler->value(token->asFloat()); - } - break; - case Token::STRING_LITERAL_TOKEN: - if ( _handler != NULL ) - { - _handler->value(token->tokenString()); - } - break; - case Token::SEPARATOR_TOKEN: - { - if ( token->asChar() == '{' ) - { - readObject(); - } - else if ( token->asChar() == '[' ) - { - readArray(); - } - break; - } - } -} - - -void Parser::readArray() -{ - if ( _handler != NULL ) - { - _handler->startArray(); - } - - if ( readElements(true) ) // First call is special: check for empty array - { - while(readElements()); - } - - if ( _handler != NULL ) - { - _handler->endArray(); - } -} - - -bool Parser::readElements(bool firstCall) -{ - const Token* token = nextToken(); - - if ( firstCall && token->is(Token::SEPARATOR_TOKEN) && token->asChar() == ']' ) - { - // End of array is possible for an empty array - return false; - } - - readValue(token); - - token = nextToken(); - - if ( token->is(Token::SEPARATOR_TOKEN) ) - { - if ( token->asChar() == ']' ) - return false; // End of array - - if ( token->asChar() == ',' ) - return true; - - throw JSONException(format("Invalid separator '%c' found. Expecting , or ]", token->asChar())); - } - - throw JSONException(format("Invalid token '%s' found.", token->asString())); -} - -} } // namespace Poco::JSON +// +// Parser.cpp +// +// $Id$ +// +// Library: JSON +// Package: JSON +// Module: Parser +// +// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/JSON/Parser.h" +#include "Poco/JSON/JSONException.h" +#include "Poco/Ascii.h" +#include "Poco/Token.h" +#undef min +#undef max +#include + + +namespace Poco { +namespace JSON { + + +class SeparatorToken: public Token +{ +public: + SeparatorToken() + { + } + + virtual ~SeparatorToken() + { + } + + Class tokenClass() const + { + return Token::SEPARATOR_TOKEN; + } + + bool start(char c, std::istream& istr) + { + if ( c == '{' + || c == '}' + || c == ']' + || c == '[' + || c == ',' + || c == ':' ) + { + _value = c; + return true; + } + + if ( c == '\'' ) + { + throw JSONException("Invalid quote found"); + } + + else return false; + } + + void finish(std::istream& istr) + { + } +}; + + +class StringToken: public Token +{ +public: + StringToken() + { + } + + virtual ~StringToken() + { + } + + Class tokenClass() const + { + return Token::STRING_LITERAL_TOKEN; + } + + bool start(char c, std::istream& istr) + { + if ( c == '"') + { + _value = ""; // We don't need the quote! + return true; + } + else return false; + } + + void finish(std::istream& istr) + { + int c = istr.get(); + while (c != -1) + { + if ( c == 0 ) + { + throw JSONException("Null byte not allowed"); + } + + if ( 0 < c && c <= 0x1F ) + { + throw JSONException(format("Control character 0x%x not allowed", (unsigned int) c)); + } + + if ( c == '"' ) + break; + + if ( c == '\\' ) // Escaped String + { + c = istr.get(); + switch(c) + { + case '"' : + c = '"'; + break; + case '\\' : + c = '\\'; + break; + case '/' : + c = '/'; + break; + case 'b' : + c = '\b'; + break; + case 'f' : + c = '\f'; + break; + case 'n' : + c = '\n'; + break; + case 'r' : + c = '\r'; + break; + case 't' : + c = '\t'; + break; + case 'u' : // Unicode + { + Poco::Int32 unicode = decodeUnicode(istr); + if ( unicode == 0 ) + { + throw JSONException("\\u0000 is not allowed"); + } + if ( unicode >= 0xD800 && unicode <= 0xDBFF ) + { + c = istr.get(); + if ( c != '\\' ) + { + throw JSONException("Invalid unicode surrogate pair"); + } + c = istr.get(); + if ( c != 'u' ) + { + throw JSONException("Invalid unicode surrogate pair"); + } + Poco::Int32 surrogatePair = decodeUnicode(istr); + if ( 0xDC00 <= surrogatePair && surrogatePair <= 0xDFFF ) + { + unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF); + } + else + { + throw JSONException("Invalid unicode surrogate pair"); + } + } + else if ( 0xDC00 <= unicode && unicode <= 0xDFFF ) + { + throw JSONException("Invalid unicode"); + } + c = unicode; + break; + } + default: + { + throw JSONException(format("Invalid escape '%c' character used", (char) c)); + } + } + } + _value += c; + c = istr.get(); + } + + if ( c == -1 ) + { + throw JSONException("Unterminated string found"); + } + } + + Poco::Int32 decodeUnicode(std::istream& istr) + { + Poco::Int32 value = 0; + + for(int i = 0; i < 4; i++) + { + value <<= 4; + int nc = istr.peek(); + if ( nc == -1 ) + { + throw JSONException("Invalid unicode sequence"); + } + istr.get(); // No EOF, so read the character + + if (nc >= '0' && nc <= '9') + value += nc - '0'; + else if (nc >= 'A' && nc <= 'F') + value += 10 + nc - 'A'; + else if (nc >= 'a' && nc <= 'f') + value += 10 + nc - 'a'; + else + throw JSONException("Invalid unicode sequence. Hexadecimal digit expected"); + } + + return value; + } +}; + + +class KeywordToken : public Token +{ +public: + KeywordToken() + { + } + + virtual ~KeywordToken() + { + } + + Class tokenClass() const + { + return Token::KEYWORD_TOKEN; + } + + bool start(char c, std::istream& istr) + { + if ( Ascii::isAlpha(c) ) + { + _value = c; + return true; + } + return false; + } + + void finish(std::istream& istr) + { + int c = istr.peek(); + while (c != -1 && Ascii::isAlpha(c) ) + { + istr.get(); + _value += c; + c = istr.peek(); + } + } +}; + + +class NumberToken: public Token +{ +public: + NumberToken() : _activeClass(INTEGER_LITERAL_TOKEN) + { + } + + virtual ~NumberToken() + { + } + + Class tokenClass() const + { + return _activeClass; + } + + bool start(char c, std::istream& istr) + { + // Reset the active class to integer + _activeClass = INTEGER_LITERAL_TOKEN; + + if ( c == -1 ) + return false; + + if ( Ascii::isDigit(c) ) + { + if ( c == '0' ) + { + int nc = istr.peek(); + if ( Ascii::isDigit(nc) ) // A digit after a zero is not allowed + { + throw JSONException("Number can't start with a zero"); + } + } + _value = c; + return true; + } + + if ( c == '-' ) + { + _value = c; + + int nc = istr.peek(); + if ( Ascii::isDigit(nc) ) + { + if ( nc == '0' ) + { + _value += '0'; + istr.get(); + + nc = istr.peek(); + if ( Ascii::isDigit(nc) ) // A digit after -0 is not allowed + { + throw JSONException("Number can't start with a zero"); + } + } + return true; + } + } + + return false; + } + + void finish(std::istream& istr) + { + int c; + while( (c = istr.peek()) != -1) + { + if ( Ascii::isDigit(c) ) + { + _value += c; + istr.get(); + } + else + { + switch(c) + { + case '.': // Float + { + if ( _activeClass == Token::FLOAT_LITERAL_TOKEN ) + { + throw JSONException("Invalid float value"); + } + _activeClass = Token::FLOAT_LITERAL_TOKEN; + + _value += c; + istr.get(); + + // After a . we need a digit + c = istr.peek(); + if ( ! Ascii::isDigit(c) ) + { + throw JSONException("Invalid float value"); + } + + break; + } + case 'E': + case 'e': + { + if ( _activeClass == Token::DOUBLE_LITERAL_TOKEN ) + { + throw JSONException("Invalid double value"); + } + _activeClass = Token::DOUBLE_LITERAL_TOKEN; + + // Add the e or E + _value += c; + istr.get(); + + // When the next char is - or + then read the next char + c = istr.peek(); + if ( c == '-' || c == '+' ) + { + _value += c; + istr.get(); + c = istr.peek(); + } + + if ( ! Ascii::isDigit(c) ) + { + throw JSONException("Invalid double value"); + } + + break; + } + default: + return; // End of number token + } + + istr.get(); // If we get here we have a valid character for a number + _value += c; + } + } + } + +private: + Class _activeClass; +}; + + +Parser::Parser() : _tokenizer(), _handler(NULL) +{ + _tokenizer.addToken(new WhitespaceToken()); + _tokenizer.addToken(new InvalidToken()); + _tokenizer.addToken(new SeparatorToken()); + _tokenizer.addToken(new StringToken()); + _tokenizer.addToken(new NumberToken()); + _tokenizer.addToken(new KeywordToken()); +} + + +Parser::~Parser() +{ + +} + + +const Token* Parser::nextToken() +{ + const Token* token = _tokenizer.next(); + if ( token->is(Token::EOF_TOKEN) ) + { + throw JSONException("Unexpected EOF found"); + } + return token; +} + + +void Parser::parse(std::istream& in) +{ + _tokenizer.attachToStream(in); + const Token* token = nextToken(); + + if ( token->is(Token::SEPARATOR_TOKEN) ) + { + // This must be a { or a [ + if ( token->asChar() == '{' ) + { + readObject(); + } + else if ( token->asChar() == '[' ) + { + readArray(); + } + else + { + throw JSONException(format("Invalid separator '%c' found. Expecting { or [", token->asChar())); + } + token = _tokenizer.next(); + if ( ! token->is(Token::EOF_TOKEN) ) + { + throw JSONException(format("EOF expected but found '%s'", token->asString())); + } + } + else + { + throw JSONException(format("Invalid token '%s' found. Expecting { or [", token->asString())); + } +} + + +void Parser::readObject() +{ + if ( _handler != NULL ) + { + _handler->startObject(); + } + + if ( readRow(true) ) // First call is special: check for empty object + { + while(readRow()); + } + + if ( _handler != NULL ) + { + _handler->endObject(); + } +} + + +bool Parser::readRow(bool firstCall) +{ + const Token* token = nextToken(); + + if ( firstCall && token->tokenClass() == Token::SEPARATOR_TOKEN && token->asChar() == '}' ) + { + return false; // End of object is possible for an empty object + } + + if ( token->tokenClass() == Token::STRING_LITERAL_TOKEN ) + { + std::string propertyName = token->tokenString(); + if ( _handler != NULL ) + { + _handler->key(propertyName); + } + + token = nextToken(); + + if ( token->is(Token::SEPARATOR_TOKEN) + && token->asChar() == ':' ) + { + readValue(nextToken()); + + token = nextToken(); + + if ( token->is(Token::SEPARATOR_TOKEN) ) + { + if ( token->asChar() == ',' ) + { + return true; // Read next row + } + else if ( token->asChar() == '}' ) + { + return false; // End of object + } + else + { + throw JSONException(format("Invalid separator '%c' found. Expecting , or }", token->asChar())); + } + } + else + { + throw JSONException(format("Invalid token '%s' found. Expecting , or }", token->asString())); + } + } + else + { + throw JSONException(format("Invalid token '%s' found. Expecting :", token->asString())); + } + } + else + { + throw JSONException(format("Invalid token '%s' found. Expecting key", token->asString())); + } +} + + +void Parser::readValue(const Token* token) +{ + switch(token->tokenClass()) + { + default: + case Token::IDENTIFIER_TOKEN: + case Token::OPERATOR_TOKEN: + case Token::CHAR_LITERAL_TOKEN: + break; + + case Token::INTEGER_LITERAL_TOKEN: + if ( _handler != NULL ) + { + int value = token->asInteger(); +#if defined(POCO_HAVE_INT64) + if ( value == std::numeric_limits::max() + || value == std::numeric_limits::min() ) + { + _handler->value(NumberParser::parse64(token->asString())); + } + else + { + _handler->value(token->asInteger()); + } +#else + _handle->value(value); +#endif + } + break; + case Token::KEYWORD_TOKEN: + { + if ( token->tokenString().compare("null") == 0 ) + { + if ( _handler != NULL ) + { + _handler->null(); + } + } + else if ( token->tokenString().compare("true") == 0 ) + { + if ( _handler != NULL ) + { + _handler->value(true); + } + } + else if ( token->tokenString().compare("false") == 0 ) + { + if ( _handler != NULL ) + { + _handler->value(false); + } + } + else + { + throw JSONException(format("Invalid keyword '%s' found", token->asString())); + } + break; + } + case Token::FLOAT_LITERAL_TOKEN: + // Fall through + case Token::DOUBLE_LITERAL_TOKEN: + if ( _handler != NULL ) + { + _handler->value(token->asFloat()); + } + break; + case Token::STRING_LITERAL_TOKEN: + if ( _handler != NULL ) + { + _handler->value(token->tokenString()); + } + break; + case Token::SEPARATOR_TOKEN: + { + if ( token->asChar() == '{' ) + { + readObject(); + } + else if ( token->asChar() == '[' ) + { + readArray(); + } + break; + } + } +} + + +void Parser::readArray() +{ + if ( _handler != NULL ) + { + _handler->startArray(); + } + + if ( readElements(true) ) // First call is special: check for empty array + { + while(readElements()); + } + + if ( _handler != NULL ) + { + _handler->endArray(); + } +} + + +bool Parser::readElements(bool firstCall) +{ + const Token* token = nextToken(); + + if ( firstCall && token->is(Token::SEPARATOR_TOKEN) && token->asChar() == ']' ) + { + // End of array is possible for an empty array + return false; + } + + readValue(token); + + token = nextToken(); + + if ( token->is(Token::SEPARATOR_TOKEN) ) + { + if ( token->asChar() == ']' ) + return false; // End of array + + if ( token->asChar() == ',' ) + return true; + + throw JSONException(format("Invalid separator '%c' found. Expecting , or ]", token->asChar())); + } + + throw JSONException(format("Invalid token '%s' found.", token->asString())); +} + + +} } // namespace Poco::JSON diff --git a/JSON/testsuite/TestSuite_CE_vs90.vcproj b/JSON/testsuite/TestSuite_CE_vs90.vcproj index ec1c48048..ca2dc8b8e 100644 --- a/JSON/testsuite/TestSuite_CE_vs90.vcproj +++ b/JSON/testsuite/TestSuite_CE_vs90.vcproj @@ -1,477 +1,477 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/testsuite/TestSuite_vs100.vcxproj b/JSON/testsuite/TestSuite_vs100.vcxproj index feccc3c44..1e0c7025d 100644 --- a/JSON/testsuite/TestSuite_vs100.vcxproj +++ b/JSON/testsuite/TestSuite_vs100.vcxproj @@ -1,313 +1,313 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {96CF3103-E49E-3F5E-A11D-6DBCDA043053} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - Application - Static - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Static + MultiByte + + + Application + Static + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + diff --git a/JSON/testsuite/TestSuite_vs100.vcxproj.filters b/JSON/testsuite/TestSuite_vs100.vcxproj.filters index 26c67d27f..609878717 100644 --- a/JSON/testsuite/TestSuite_vs100.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs100.vcxproj.filters @@ -1,30 +1,30 @@ - - - - - {2e15ba20-e9f2-4d61-8e6a-6c6f12cf9277} - - - {33a90edd-4b32-401e-b52a-9115b236ed22} - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - + + + + + {2e15ba20-e9f2-4d61-8e6a-6c6f12cf9277} + + + {33a90edd-4b32-401e-b52a-9115b236ed22} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/JSON/testsuite/TestSuite_vs110.vcxproj b/JSON/testsuite/TestSuite_vs110.vcxproj index 9b5873bac..9e7f445b9 100644 --- a/JSON/testsuite/TestSuite_vs110.vcxproj +++ b/JSON/testsuite/TestSuite_vs110.vcxproj @@ -1,319 +1,319 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {96CF3103-E49E-3F5E-A11D-6DBCDA043053} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + diff --git a/JSON/testsuite/TestSuite_vs110.vcxproj.filters b/JSON/testsuite/TestSuite_vs110.vcxproj.filters index 770907cef..def3bbced 100644 --- a/JSON/testsuite/TestSuite_vs110.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,30 +1,30 @@ - - - - - {37a8e419-2bfa-4348-9bda-4e36426a1859} - - - {eca3dd44-b857-4ec2-b903-90ec10fd9b05} - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - + + + + + {37a8e419-2bfa-4348-9bda-4e36426a1859} + + + {eca3dd44-b857-4ec2-b903-90ec10fd9b05} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/JSON/testsuite/TestSuite_vs71.vcproj b/JSON/testsuite/TestSuite_vs71.vcproj index 99979d1e9..5e537b481 100644 --- a/JSON/testsuite/TestSuite_vs71.vcproj +++ b/JSON/testsuite/TestSuite_vs71.vcproj @@ -1,412 +1,412 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/testsuite/TestSuite_vs80.vcproj b/JSON/testsuite/TestSuite_vs80.vcproj index f2a5eb91d..b5c5e88f0 100644 --- a/JSON/testsuite/TestSuite_vs80.vcproj +++ b/JSON/testsuite/TestSuite_vs80.vcproj @@ -1,452 +1,452 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/testsuite/TestSuite_vs90.vcproj b/JSON/testsuite/TestSuite_vs90.vcproj index 3196c9dd2..efb0f326d 100644 --- a/JSON/testsuite/TestSuite_vs90.vcproj +++ b/JSON/testsuite/TestSuite_vs90.vcproj @@ -1,452 +1,452 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/testsuite/TestSuite_x64_vs100.vcxproj b/JSON/testsuite/TestSuite_x64_vs100.vcxproj index ccd03cdb8..e0ac782dd 100644 --- a/JSON/testsuite/TestSuite_x64_vs100.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs100.vcxproj @@ -1,313 +1,313 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {96CF3103-E49E-3F5E-A11D-6DBCDA043053} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - Application - Static - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Static + MultiByte + + + Application + Static + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + diff --git a/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters index 6310cfa1b..5a530946d 100644 --- a/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -1,30 +1,30 @@ - - - - - {a35aec2a-741c-46e5-a053-73c2a7c753f9} - - - {29e163e0-750e-4c7d-8f62-3ddd2a3bf78f} - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - + + + + + {a35aec2a-741c-46e5-a053-73c2a7c753f9} + + + {29e163e0-750e-4c7d-8f62-3ddd2a3bf78f} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/JSON/testsuite/TestSuite_x64_vs110.vcxproj b/JSON/testsuite/TestSuite_x64_vs110.vcxproj index d07c50ea7..128b663a9 100644 --- a/JSON/testsuite/TestSuite_x64_vs110.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,319 +1,319 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {96CF3103-E49E-3F5E-A11D-6DBCDA043053} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {96CF3103-E49E-3F5E-A11D-6DBCDA043053} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + diff --git a/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters index 4403c4fdb..23fe9d2eb 100644 --- a/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,30 +1,30 @@ - - - - - {7b7fcab4-f979-4078-954c-10e922767868} - - - {571764f5-cf3d-4856-bb7f-cd2dba4a2bd2} - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - + + + + + {7b7fcab4-f979-4078-954c-10e922767868} + + + {571764f5-cf3d-4856-bb7f-cd2dba4a2bd2} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/JSON/testsuite/TestSuite_x64_vs90.vcproj b/JSON/testsuite/TestSuite_x64_vs90.vcproj index e92464ebf..cb4dcda14 100644 --- a/JSON/testsuite/TestSuite_x64_vs90.vcproj +++ b/JSON/testsuite/TestSuite_x64_vs90.vcproj @@ -1,452 +1,452 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/testsuite/src/Driver.cpp b/JSON/testsuite/src/Driver.cpp index bb26d7803..f8c5a4b33 100644 --- a/JSON/testsuite/src/Driver.cpp +++ b/JSON/testsuite/src/Driver.cpp @@ -1,39 +1,39 @@ -// -// Driver.cpp -// -// $Id: //poco/1.4/JSON/testsuite/src/Driver.cpp#1 $ -// -// Console-based test driver for Poco JSON. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "CppUnit/TestRunner.h" -#include "JSONTestSuite.h" - - -CppUnitMain(JSONTestSuite) +// +// Driver.cpp +// +// $Id: //poco/1.4/JSON/testsuite/src/Driver.cpp#1 $ +// +// Console-based test driver for Poco JSON. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "CppUnit/TestRunner.h" +#include "JSONTestSuite.h" + + +CppUnitMain(JSONTestSuite) diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp index 644046c22..6b6d9e998 100644 --- a/JSON/testsuite/src/JSONTest.cpp +++ b/JSON/testsuite/src/JSONTest.cpp @@ -1,837 +1,835 @@ -// -// JSONTest.cpp -// -// $Id: //poco/1.4/XML/testsuite/src/JSONTest.cpp#1 $ -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "JSONTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" - -#include "Poco/JSON/Object.h" -#include "Poco/JSON/Parser.h" -#include "Poco/JSON/Query.h" -#include "Poco/JSON/JSONException.h" -#include "Poco/JSON/Stringifier.h" -#include "Poco/JSON/DefaultHandler.h" -#include "Poco/JSON/Template.h" - -#include "Poco/Path.h" -#include "Poco/Environment.h" -#include "Poco/File.h" -#include "Poco/FileStream.h" -#include "Poco/Glob.h" - -#include - -using namespace Poco::JSON; -using namespace Poco::Dynamic; - - -JSONTest::JSONTest(const std::string& name): CppUnit::TestCase("JSON") -{ - -} - - -JSONTest::~JSONTest() -{ - -} - - -void JSONTest::setUp() -{ -} - - -void JSONTest::tearDown() -{ -} - - -void JSONTest::testNullProperty() -{ - std::string json = "{ \"test\" : null }"; - Parser parser; - - Var result; - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - assert(object->isNull("test")); - Var test = object->get("test"); - assert(test.isEmpty()); -} - - -void JSONTest::testTrueProperty() -{ - std::string json = "{ \"test\" : true }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.type() == typeid(bool)); - bool value = test; - assert(value); -} - - -void JSONTest::testFalseProperty() -{ - std::string json = "{ \"test\" : false }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.type() == typeid(bool)); - bool value = test; - assert(!value); -} - - -void JSONTest::testNumberProperty() -{ - std::string json = "{ \"test\" : 1969 }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isInteger()); - int value = test; - assert(value == 1969); -} - - -void JSONTest::testStringProperty() -{ - std::string json = "{ \"test\" : \"value\" }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isString()); - std::string value = test.convert(); - assert(value.compare("value") == 0); -} - - -void JSONTest::testEmptyObject() -{ - std::string json = "{}"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - assert(object->size() == 0); -} - - -void JSONTest::testDoubleProperty() -{ - std::string json = "{ \"test\" : 123.45 }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isNumeric()); - double value = test; - assert(value == 123.45); -} - - -void JSONTest::testDouble2Property() -{ - std::string json = "{ \"test\" : 12e34 }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isNumeric()); - double value = test; - assert(value >= 1.99e34 && value <= 12.01e34); -} - - -void JSONTest::testDouble3Property() -{ - std::string json = "{ \"test\" : 12e-34 }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isNumeric()); - double value = test; - assert(value == 12e-34); -} - - -void JSONTest::testObjectProperty() -{ - std::string json = "{ \"test\" : { \"property\" : \"value\" } }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.type() == typeid(Object::Ptr)); - object = test.extract(); - - test = object->get("property"); - assert(test.isString()); - std::string value = test.convert(); - assert(value.compare("value") == 0); -} - - -void JSONTest::testEmptyArray() -{ - std::string json = "[]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - assert(array->size() == 0); -} - - -void JSONTest::testNestedArray() -{ - std::string json = "[[[[]]]]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - assert(array->size() == 1); -} - - -void JSONTest::testNullElement() -{ - std::string json = "[ null ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - assert(array->isNull(0)); - Var test = array->get(0); - assert(test.isEmpty()); -} - - -void JSONTest::testTrueElement() -{ - std::string json = "[ true ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Var test = array->get(0); - assert(test.type() == typeid(bool)); - bool value = test; - assert(value); -} - - -void JSONTest::testFalseElement() -{ - std::string json = "[ false ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Var test = array->get(0); - assert(test.type() == typeid(bool)); - bool value = test; - assert(!value); -} - - -void JSONTest::testNumberElement() -{ - std::string json = "[ 1969 ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Var test = array->get(0); - assert(test.isInteger()); - int value = test; - assert(value == 1969); -} - - -void JSONTest::testStringElement() -{ - std::string json = "[ \"value\" ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Var test = array->get(0); - assert(test.isString()); - std::string value = test.convert(); - assert(value.compare("value") == 0); -} - - -void JSONTest::testEmptyObjectElement() -{ - std::string json = "[{}]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Object::Ptr object = array->getObject(0); - assert(object->size() == 0); -} - - -void JSONTest::testDoubleElement() -{ - std::string json = "[ 123.45 ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Var test = array->get(0); - assert(test.isNumeric()); - double value = test; - assert(value == 123.45); -} - - -void JSONTest::testOptValue() -{ - std::string json = "{ }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - int n = object->optValue("test", 123); - assert(n == 123); -} - - -void JSONTest::testQuery() -{ - std::string json = "{ \"name\" : \"Franky\", \"children\" : [ \"Jonas\", \"Ellen\" ] }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Query query(result); - - std::string firstChild = query.findValue("children[0]", ""); - assert(firstChild.compare("Jonas") == 0); -} - - -void JSONTest::testValidJanssonFiles() -{ - Poco::Path pathPattern(getTestFilesPath("valid")); - - std::set paths; - Poco::Glob::glob(pathPattern, paths); - - for(std::set::iterator it = paths.begin(); it != paths.end(); ++it) - { - Poco::Path filePath(*it, "input"); - - if ( filePath.isFile() ) - { - Poco::File inputFile(filePath); - if ( inputFile.exists() ) - { - Poco::FileInputStream fis(filePath.toString()); - std::cout << filePath.toString() << std::endl; - - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(fis); - result = handler.result(); - std::cout << "Ok!" << std::endl; - } - catch(JSONException& jsone) - { - std::string err = jsone.displayText(); - std::cout << "Failed:" << err << std::endl; - fail (err); - } - catch(Poco::Exception& e) - { - std::string err = e.displayText(); - std::cout << "Failed:" << err << std::endl; - fail (err); - } - } - } - } -} - - -void JSONTest::testInvalidJanssonFiles() -{ - Poco::Path pathPattern(getTestFilesPath("invalid")); - - std::set paths; - Poco::Glob::glob(pathPattern, paths); - - for(std::set::iterator it = paths.begin(); it != paths.end(); ++it) - { - Poco::Path filePath(*it, "input"); - - if ( filePath.isFile() ) - { - Poco::File inputFile(filePath); - if ( inputFile.exists() ) - { - Poco::FileInputStream fis(filePath.toString()); - std::cout << filePath.toString() << std::endl; - - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(fis); - result = handler.result(); - // We shouldn't get here. - std::cout << "We didn't get an exception. This is the result: " << result.convert() << std::endl; - fail(result.convert()); - } - catch(JSONException&) - { - continue; - } - catch(Poco::SyntaxException&) - { } - } - } - } -} - - -void JSONTest::testTemplate() -{ - Template tpl; - tpl.parse("Hello world! From \nYou're too old\n"); - - Object::Ptr data = new Object(); - Object::Ptr person = new Object(); - data->set("person", person); - person->set("name", "Franky"); - person->set("toOld", true); - tpl.render(data, std::cout); -} - - -std::string JSONTest::getTestFilesPath(const std::string& type) -{ - std::ostringstream ostr; - ostr << "data/" << type << '/'; - std::string validDir(ostr.str()); - Poco::Path pathPattern(validDir); - if (Poco::File(pathPattern).exists()) - { - validDir += '*'; - return validDir; - } - - ostr.str(""); - ostr << "/JSON/testsuite/data/" << type << '/'; - validDir = Poco::Environment::get("POCO_BASE") + ostr.str(); - pathPattern = validDir; - - if (Poco::File(pathPattern).exists()) - validDir += '*'; - else - throw Poco::NotFoundException("cannot locate directory containing valid JSON test files"); - - return validDir; -} - - -CppUnit::Test* JSONTest::suite() -{ - CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("JSONTest"); - - CppUnit_addTest(pSuite, JSONTest, testNullProperty); - CppUnit_addTest(pSuite, JSONTest, testTrueProperty); - CppUnit_addTest(pSuite, JSONTest, testFalseProperty); - CppUnit_addTest(pSuite, JSONTest, testNumberProperty); - CppUnit_addTest(pSuite, JSONTest, testStringProperty); - CppUnit_addTest(pSuite, JSONTest, testEmptyObject); - CppUnit_addTest(pSuite, JSONTest, testDoubleProperty); - CppUnit_addTest(pSuite, JSONTest, testDouble2Property); - CppUnit_addTest(pSuite, JSONTest, testDouble3Property); - CppUnit_addTest(pSuite, JSONTest, testObjectProperty); - CppUnit_addTest(pSuite, JSONTest, testEmptyArray); - CppUnit_addTest(pSuite, JSONTest, testNestedArray); - CppUnit_addTest(pSuite, JSONTest, testNullElement); - CppUnit_addTest(pSuite, JSONTest, testTrueElement); - CppUnit_addTest(pSuite, JSONTest, testFalseElement); - CppUnit_addTest(pSuite, JSONTest, testNumberElement); - CppUnit_addTest(pSuite, JSONTest, testStringElement); - CppUnit_addTest(pSuite, JSONTest, testEmptyObjectElement); - CppUnit_addTest(pSuite, JSONTest, testDoubleElement); - CppUnit_addTest(pSuite, JSONTest, testOptValue); - CppUnit_addTest(pSuite, JSONTest, testQuery); - CppUnit_addTest(pSuite, JSONTest, testValidJanssonFiles); - CppUnit_addTest(pSuite, JSONTest, testInvalidJanssonFiles); - CppUnit_addTest(pSuite, JSONTest, testTemplate); - - return pSuite; -} +// +// JSONTest.cpp +// +// $Id: //poco/1.4/XML/testsuite/src/JSONTest.cpp#1 $ +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "JSONTest.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" +#include "Poco/JSON/Object.h" +#include "Poco/JSON/Parser.h" +#include "Poco/JSON/Query.h" +#include "Poco/JSON/JSONException.h" +#include "Poco/JSON/Stringifier.h" +#include "Poco/JSON/DefaultHandler.h" +#include "Poco/JSON/Template.h" +#include "Poco/Path.h" +#include "Poco/Environment.h" +#include "Poco/File.h" +#include "Poco/FileStream.h" +#include "Poco/Glob.h" +#include + + +using namespace Poco::JSON; +using namespace Poco::Dynamic; + + +JSONTest::JSONTest(const std::string& name): CppUnit::TestCase("JSON") +{ + +} + + +JSONTest::~JSONTest() +{ + +} + + +void JSONTest::setUp() +{ +} + + +void JSONTest::tearDown() +{ +} + + +void JSONTest::testNullProperty() +{ + std::string json = "{ \"test\" : null }"; + Parser parser; + + Var result; + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + assert(object->isNull("test")); + Var test = object->get("test"); + assert(test.isEmpty()); +} + + +void JSONTest::testTrueProperty() +{ + std::string json = "{ \"test\" : true }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.type() == typeid(bool)); + bool value = test; + assert(value); +} + + +void JSONTest::testFalseProperty() +{ + std::string json = "{ \"test\" : false }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.type() == typeid(bool)); + bool value = test; + assert(!value); +} + + +void JSONTest::testNumberProperty() +{ + std::string json = "{ \"test\" : 1969 }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isInteger()); + int value = test; + assert(value == 1969); +} + + +void JSONTest::testStringProperty() +{ + std::string json = "{ \"test\" : \"value\" }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isString()); + std::string value = test.convert(); + assert(value.compare("value") == 0); +} + + +void JSONTest::testEmptyObject() +{ + std::string json = "{}"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + assert(object->size() == 0); +} + + +void JSONTest::testDoubleProperty() +{ + std::string json = "{ \"test\" : 123.45 }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isNumeric()); + double value = test; + assert(value == 123.45); +} + + +void JSONTest::testDouble2Property() +{ + std::string json = "{ \"test\" : 12e34 }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isNumeric()); + double value = test; + assert(value >= 1.99e34 && value <= 12.01e34); +} + + +void JSONTest::testDouble3Property() +{ + std::string json = "{ \"test\" : 12e-34 }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isNumeric()); + double value = test; + assert(value == 12e-34); +} + + +void JSONTest::testObjectProperty() +{ + std::string json = "{ \"test\" : { \"property\" : \"value\" } }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.type() == typeid(Object::Ptr)); + object = test.extract(); + + test = object->get("property"); + assert(test.isString()); + std::string value = test.convert(); + assert(value.compare("value") == 0); +} + + +void JSONTest::testEmptyArray() +{ + std::string json = "[]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + assert(array->size() == 0); +} + + +void JSONTest::testNestedArray() +{ + std::string json = "[[[[]]]]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + assert(array->size() == 1); +} + + +void JSONTest::testNullElement() +{ + std::string json = "[ null ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + assert(array->isNull(0)); + Var test = array->get(0); + assert(test.isEmpty()); +} + + +void JSONTest::testTrueElement() +{ + std::string json = "[ true ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Var test = array->get(0); + assert(test.type() == typeid(bool)); + bool value = test; + assert(value); +} + + +void JSONTest::testFalseElement() +{ + std::string json = "[ false ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Var test = array->get(0); + assert(test.type() == typeid(bool)); + bool value = test; + assert(!value); +} + + +void JSONTest::testNumberElement() +{ + std::string json = "[ 1969 ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Var test = array->get(0); + assert(test.isInteger()); + int value = test; + assert(value == 1969); +} + + +void JSONTest::testStringElement() +{ + std::string json = "[ \"value\" ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Var test = array->get(0); + assert(test.isString()); + std::string value = test.convert(); + assert(value.compare("value") == 0); +} + + +void JSONTest::testEmptyObjectElement() +{ + std::string json = "[{}]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Object::Ptr object = array->getObject(0); + assert(object->size() == 0); +} + + +void JSONTest::testDoubleElement() +{ + std::string json = "[ 123.45 ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Var test = array->get(0); + assert(test.isNumeric()); + double value = test; + assert(value == 123.45); +} + + +void JSONTest::testOptValue() +{ + std::string json = "{ }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + int n = object->optValue("test", 123); + assert(n == 123); +} + + +void JSONTest::testQuery() +{ + std::string json = "{ \"name\" : \"Franky\", \"children\" : [ \"Jonas\", \"Ellen\" ] }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Query query(result); + + std::string firstChild = query.findValue("children[0]", ""); + assert(firstChild.compare("Jonas") == 0); +} + + +void JSONTest::testValidJanssonFiles() +{ + Poco::Path pathPattern(getTestFilesPath("valid")); + + std::set paths; + Poco::Glob::glob(pathPattern, paths); + + for(std::set::iterator it = paths.begin(); it != paths.end(); ++it) + { + Poco::Path filePath(*it, "input"); + + if ( filePath.isFile() ) + { + Poco::File inputFile(filePath); + if ( inputFile.exists() ) + { + Poco::FileInputStream fis(filePath.toString()); + std::cout << filePath.toString() << std::endl; + + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(fis); + result = handler.result(); + std::cout << "Ok!" << std::endl; + } + catch(JSONException& jsone) + { + std::string err = jsone.displayText(); + std::cout << "Failed:" << err << std::endl; + fail (err); + } + catch(Poco::Exception& e) + { + std::string err = e.displayText(); + std::cout << "Failed:" << err << std::endl; + fail (err); + } + } + } + } +} + + +void JSONTest::testInvalidJanssonFiles() +{ + Poco::Path pathPattern(getTestFilesPath("invalid")); + + std::set paths; + Poco::Glob::glob(pathPattern, paths); + + for(std::set::iterator it = paths.begin(); it != paths.end(); ++it) + { + Poco::Path filePath(*it, "input"); + + if ( filePath.isFile() ) + { + Poco::File inputFile(filePath); + if ( inputFile.exists() ) + { + Poco::FileInputStream fis(filePath.toString()); + std::cout << filePath.toString() << std::endl; + + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(fis); + result = handler.result(); + // We shouldn't get here. + std::cout << "We didn't get an exception. This is the result: " << result.convert() << std::endl; + fail(result.convert()); + } + catch(JSONException&) + { + continue; + } + catch(Poco::SyntaxException&) + { } + } + } + } +} + + +void JSONTest::testTemplate() +{ + Template tpl; + tpl.parse("Hello world! From \nYou're too old\n"); + + Object::Ptr data = new Object(); + Object::Ptr person = new Object(); + data->set("person", person); + person->set("name", "Franky"); + person->set("toOld", true); + tpl.render(data, std::cout); +} + + +std::string JSONTest::getTestFilesPath(const std::string& type) +{ + std::ostringstream ostr; + ostr << "data/" << type << '/'; + std::string validDir(ostr.str()); + Poco::Path pathPattern(validDir); + if (Poco::File(pathPattern).exists()) + { + validDir += '*'; + return validDir; + } + + ostr.str(""); + ostr << "/JSON/testsuite/data/" << type << '/'; + validDir = Poco::Environment::get("POCO_BASE") + ostr.str(); + pathPattern = validDir; + + if (Poco::File(pathPattern).exists()) + validDir += '*'; + else + throw Poco::NotFoundException("cannot locate directory containing valid JSON test files"); + + return validDir; +} + + +CppUnit::Test* JSONTest::suite() +{ + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("JSONTest"); + + CppUnit_addTest(pSuite, JSONTest, testNullProperty); + CppUnit_addTest(pSuite, JSONTest, testTrueProperty); + CppUnit_addTest(pSuite, JSONTest, testFalseProperty); + CppUnit_addTest(pSuite, JSONTest, testNumberProperty); + CppUnit_addTest(pSuite, JSONTest, testStringProperty); + CppUnit_addTest(pSuite, JSONTest, testEmptyObject); + CppUnit_addTest(pSuite, JSONTest, testDoubleProperty); + CppUnit_addTest(pSuite, JSONTest, testDouble2Property); + CppUnit_addTest(pSuite, JSONTest, testDouble3Property); + CppUnit_addTest(pSuite, JSONTest, testObjectProperty); + CppUnit_addTest(pSuite, JSONTest, testEmptyArray); + CppUnit_addTest(pSuite, JSONTest, testNestedArray); + CppUnit_addTest(pSuite, JSONTest, testNullElement); + CppUnit_addTest(pSuite, JSONTest, testTrueElement); + CppUnit_addTest(pSuite, JSONTest, testFalseElement); + CppUnit_addTest(pSuite, JSONTest, testNumberElement); + CppUnit_addTest(pSuite, JSONTest, testStringElement); + CppUnit_addTest(pSuite, JSONTest, testEmptyObjectElement); + CppUnit_addTest(pSuite, JSONTest, testDoubleElement); + CppUnit_addTest(pSuite, JSONTest, testOptValue); + CppUnit_addTest(pSuite, JSONTest, testQuery); + CppUnit_addTest(pSuite, JSONTest, testValidJanssonFiles); + CppUnit_addTest(pSuite, JSONTest, testInvalidJanssonFiles); + CppUnit_addTest(pSuite, JSONTest, testTemplate); + + return pSuite; +} diff --git a/JSON/testsuite/src/JSONTest.h b/JSON/testsuite/src/JSONTest.h index da74187fb..b651cbf65 100644 --- a/JSON/testsuite/src/JSONTest.h +++ b/JSON/testsuite/src/JSONTest.h @@ -1,85 +1,85 @@ -// -// JSONTest.h -// -// $Id: //poco/1.4/JSON/testsuite/src/JSONTest.h#1 $ -// -// Definition of the JSONTest class. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef JSONTest_INCLUDED -#define JSONTest_INCLUDED - - -#include "Poco/JSON/JSON.h" -#include "CppUnit/TestCase.h" - - -class JSONTest: public CppUnit::TestCase -{ -public: - JSONTest(const std::string& name); - ~JSONTest(); - - void testNullProperty(); - void testTrueProperty(); - void testFalseProperty(); - void testNumberProperty(); - void testStringProperty(); - void testEmptyObject(); - void testDoubleProperty(); - void testDouble2Property(); - void testDouble3Property(); - void testObjectProperty(); - void testEmptyArray(); - void testNestedArray(); - void testNullElement(); - void testTrueElement(); - void testFalseElement(); - void testNumberElement(); - void testStringElement(); - void testEmptyObjectElement(); - void testDoubleElement(); - void testOptValue(); - void testQuery(); - void testValidJanssonFiles(); - void testInvalidJanssonFiles(); - void testTemplate(); - void testItunes(); - - void setUp(); - void tearDown(); - - static CppUnit::Test* suite(); - -private: - std::string getTestFilesPath(const std::string& type); -}; - - -#endif // JSONTest_INCLUDED +// +// JSONTest.h +// +// $Id: //poco/1.4/JSON/testsuite/src/JSONTest.h#1 $ +// +// Definition of the JSONTest class. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef JSONTest_INCLUDED +#define JSONTest_INCLUDED + + +#include "Poco/JSON/JSON.h" +#include "CppUnit/TestCase.h" + + +class JSONTest: public CppUnit::TestCase +{ +public: + JSONTest(const std::string& name); + ~JSONTest(); + + void testNullProperty(); + void testTrueProperty(); + void testFalseProperty(); + void testNumberProperty(); + void testStringProperty(); + void testEmptyObject(); + void testDoubleProperty(); + void testDouble2Property(); + void testDouble3Property(); + void testObjectProperty(); + void testEmptyArray(); + void testNestedArray(); + void testNullElement(); + void testTrueElement(); + void testFalseElement(); + void testNumberElement(); + void testStringElement(); + void testEmptyObjectElement(); + void testDoubleElement(); + void testOptValue(); + void testQuery(); + void testValidJanssonFiles(); + void testInvalidJanssonFiles(); + void testTemplate(); + void testItunes(); + + void setUp(); + void tearDown(); + + static CppUnit::Test* suite(); + +private: + std::string getTestFilesPath(const std::string& type); +}; + + +#endif // JSONTest_INCLUDED diff --git a/JSON/testsuite/src/JSONTestSuite.cpp b/JSON/testsuite/src/JSONTestSuite.cpp index c7c222ec3..b5fcaeb72 100644 --- a/JSON/testsuite/src/JSONTestSuite.cpp +++ b/JSON/testsuite/src/JSONTestSuite.cpp @@ -1,44 +1,44 @@ -// -// JSONTestSuite.cpp -// -// $Id: //poco/1.4/JSON/testsuite/src/JSONTestSuite.cpp#1 $ -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "JSONTestSuite.h" -#include "JSONTest.h" - - -CppUnit::Test* JSONTestSuite::suite() -{ - CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("JSONTestSuite"); - - pSuite->addTest(JSONTest::suite()); - - return pSuite; -} +// +// JSONTestSuite.cpp +// +// $Id: //poco/1.4/JSON/testsuite/src/JSONTestSuite.cpp#1 $ +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "JSONTestSuite.h" +#include "JSONTest.h" + + +CppUnit::Test* JSONTestSuite::suite() +{ + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("JSONTestSuite"); + + pSuite->addTest(JSONTest::suite()); + + return pSuite; +} diff --git a/JSON/testsuite/src/JSONTestSuite.h b/JSON/testsuite/src/JSONTestSuite.h index 102e738af..4206a81be 100644 --- a/JSON/testsuite/src/JSONTestSuite.h +++ b/JSON/testsuite/src/JSONTestSuite.h @@ -1,49 +1,49 @@ -// -// JSONTestSuite.h -// -// $Id$ -// -// Definition of the JSONTestSuite class. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef JSONTestSuite_INCLUDED -#define JSONTestSuite_INCLUDED - - -#include "CppUnit/TestSuite.h" - - -class JSONTestSuite -{ -public: - static CppUnit::Test* suite(); -}; - - -#endif // JSONTestSuite_INCLUDED +// +// JSONTestSuite.h +// +// $Id$ +// +// Definition of the JSONTestSuite class. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef JSONTestSuite_INCLUDED +#define JSONTestSuite_INCLUDED + + +#include "CppUnit/TestSuite.h" + + +class JSONTestSuite +{ +public: + static CppUnit::Test* suite(); +}; + + +#endif // JSONTestSuite_INCLUDED diff --git a/JSON/testsuite/src/WinCEDriver.cpp b/JSON/testsuite/src/WinCEDriver.cpp index 08d6061c0..c1ff66a28 100644 --- a/JSON/testsuite/src/WinCEDriver.cpp +++ b/JSON/testsuite/src/WinCEDriver.cpp @@ -1,52 +1,52 @@ -// -// WinCEDriver.cpp -// -// $Id: //poco/1.4/JSON/testsuite/src/WinCEDriver.cpp#1 $ -// -// Console-based test driver for Windows CE. -// -// Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "CppUnit/TestRunner.h" -#include "JSONTestSuite.h" -#include - - -int _tmain(int argc, wchar_t* argv[]) -{ - std::vector args; - for (int i = 0; i < argc; ++i) - { - char buffer[1024]; - std::wcstombs(buffer, argv[i], sizeof(buffer)); - args.push_back(std::string(buffer)); - } - CppUnit::TestRunner runner; - runner.addTest("JSONTestSuite", JSONTestSuite::suite()); - return runner.run(args) ? 0 : 1; -} +// +// WinCEDriver.cpp +// +// $Id: //poco/1.4/JSON/testsuite/src/WinCEDriver.cpp#1 $ +// +// Console-based test driver for Windows CE. +// +// Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "CppUnit/TestRunner.h" +#include "JSONTestSuite.h" +#include + + +int _tmain(int argc, wchar_t* argv[]) +{ + std::vector args; + for (int i = 0; i < argc; ++i) + { + char buffer[1024]; + std::wcstombs(buffer, argv[i], sizeof(buffer)); + args.push_back(std::string(buffer)); + } + CppUnit::TestRunner runner; + runner.addTest("JSONTestSuite", JSONTestSuite::suite()); + return runner.run(args) ? 0 : 1; +} diff --git a/JSON/testsuite/src/WinDriver.cpp b/JSON/testsuite/src/WinDriver.cpp index 725adbb8b..9fb5d3e3d 100644 --- a/JSON/testsuite/src/WinDriver.cpp +++ b/JSON/testsuite/src/WinDriver.cpp @@ -1,50 +1,50 @@ -// -// WinDriver.cpp -// -// $Id: //poco/1.4/JSON/testsuite/src/WinDriver.cpp#1 $ -// -// Windows test driver for Poco JSON. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "WinTestRunner/WinTestRunner.h" -#include "JSONTestSuite.h" - - -class TestDriver: public CppUnit::WinTestRunnerApp -{ - void TestMain() - { - CppUnit::WinTestRunner runner; - runner.addTest(JSONTestSuite::suite()); - runner.run(); - } -}; - - -TestDriver theDriver; +// +// WinDriver.cpp +// +// $Id: //poco/1.4/JSON/testsuite/src/WinDriver.cpp#1 $ +// +// Windows test driver for Poco JSON. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "WinTestRunner/WinTestRunner.h" +#include "JSONTestSuite.h" + + +class TestDriver: public CppUnit::WinTestRunnerApp +{ + void TestMain() + { + CppUnit::WinTestRunner runner; + runner.addTest(JSONTestSuite::suite()); + runner.run(); + } +}; + + +TestDriver theDriver; diff --git a/Net/Net_vs110.sln b/Net/Net_vs110.sln index bc49c653b..305f6bb15 100644 --- a/Net/Net_vs110.sln +++ b/Net/Net_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Net", "Net_vs110.vcxproj", "{B057A1FE-09F7-465E-B8B5-E1B659051D76}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}" - ProjectSection(ProjectDependencies) = postProject - {B057A1FE-09F7-465E-B8B5-E1B659051D76} = {B057A1FE-09F7-465E-B8B5-E1B659051D76} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|Win32.Build.0 = release_shared|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|Win32.Build.0 = release_shared|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Net", "Net_vs110.vcxproj", "{B057A1FE-09F7-465E-B8B5-E1B659051D76}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}" + ProjectSection(ProjectDependencies) = postProject + {B057A1FE-09F7-465E-B8B5-E1B659051D76} = {B057A1FE-09F7-465E-B8B5-E1B659051D76} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|Win32.Build.0 = release_shared|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|Win32.Build.0 = release_shared|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Net/Net_vs110.vcxproj b/Net/Net_vs110.vcxproj index f75edbbb0..e134b16c4 100644 --- a/Net/Net_vs110.vcxproj +++ b/Net/Net_vs110.vcxproj @@ -1,476 +1,476 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Net - {B057A1FE-09F7-465E-B8B5-E1B659051D76} - Net - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoNetd - PocoNetmdd - PocoNetmtd - PocoNet - PocoNetmd - PocoNetmt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoNetd.dll - true - true - ..\bin\PocoNetd.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoNetd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoNet.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoNet.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoNetmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoNetmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoNetmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoNetmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoNetmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoNetmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Net + {B057A1FE-09F7-465E-B8B5-E1B659051D76} + Net + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoNetd + PocoNetmdd + PocoNetmtd + PocoNet + PocoNetmd + PocoNetmt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoNetd.dll + true + true + ..\bin\PocoNetd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoNetd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoNet.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoNet.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoNetmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoNetmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoNetmt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoNetmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoNetmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoNetmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoNetmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + diff --git a/Net/Net_vs110.vcxproj.filters b/Net/Net_vs110.vcxproj.filters index 83be7064f..2a58dba21 100644 --- a/Net/Net_vs110.vcxproj.filters +++ b/Net/Net_vs110.vcxproj.filters @@ -1,693 +1,693 @@ - - - - - {88b508f9-076e-4f63-896f-978172fe8918} - - - {15a8353f-bd11-4736-93ab-ec2091521aa3} - - - {433321e2-70cc-4c3c-8bc8-30fbd1ae73a5} - - - {542b7d1a-c36f-49ec-bf84-e71296e7dc1f} - - - {6ba64e20-8971-4285-9376-9bfb48f00c00} - - - {0bfad08c-82d8-403e-95dd-2834943d8a93} - - - {048a49f1-cfe9-4d05-9587-477832a3e22f} - - - {006e8f63-8d31-4f24-a95b-4da971f0485e} - - - {603f876f-98cf-4653-968b-681025fa0f59} - - - {44f4d194-90a0-43ad-905e-4ee03ebd118d} - - - {bde1cfb1-e931-4f24-80ee-154397837879} - - - {fed31122-0082-4d5e-8094-a9c4f820af39} - - - {5a9d0360-160a-4d5f-8252-ae7b82fefd1b} - - - {1ba58e68-0664-4553-9b8b-3329c4df0724} - - - {48f85270-d833-491f-a68d-d36541f99d31} - - - {4bf62840-f99d-4915-9125-759315d3be09} - - - {aa267629-d879-430e-8b4f-86e20c2d258f} - - - {43df5d03-4705-4c24-a4d2-f5c452dec26b} - - - {35d608e8-3cf9-4207-8617-5105979d6f95} - - - {a71d64f2-1a24-4e2d-8496-a0a66f30b3b5} - - - {4e059fc6-9897-41b8-b34e-b8f83d6b7025} - - - {0855453c-f7d7-4a41-81c6-852a019549eb} - - - {99e23efc-cc28-423d-bc10-fee57916078c} - - - {6a10a18f-80a9-4ad4-9d9c-063d32d8dfa4} - - - {30e6a266-58ae-42ea-864e-bc3c92581f13} - - - {02f2ddf6-e8a5-4889-8fd6-c5e1ccb8e553} - - - {fd8eb857-dff6-4d3e-96df-2ffda6294550} - - - {65f633ed-f550-4521-8d77-786cd241a289} - - - {0f13024a-3ed3-489c-a0ea-077d75e4c566} - - - {59888127-14c5-4a50-a97d-e586e5a0514c} - - - {dbedc324-fe03-4c41-a273-022b5a5170cd} - - - {aaeffeb0-d1d0-4d82-966a-5efc392733fb} - - - {14837134-99f9-4932-8c16-e8fc2cf06959} - - - {3c25c1ab-3295-4661-8183-af56b07cd4e3} - - - {a5c48a8e-cc06-4990-8c8b-fc8aac09548c} - - - {5d8f0dc0-e8d4-4798-ac75-caf2af55f6ff} - - - {abe74806-0c96-4b3f-b53b-276d535280fd} - - - {1a3734b6-3ceb-4d50-bed4-2573f71bc3b2} - - - {485f9a7a-90a8-4479-ae11-d92ce866bfd9} - - - {0e595ff7-6049-4673-98fe-f6593609d425} - - - {cb96a05c-19e3-42f1-b394-8c61c97f03a6} - - - {865a0e39-c61d-47ef-af4a-8ecc4640e5b0} - - - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - HTML\Header Files - - - FTPClient\Header Files - - - FTPClient\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - WebSocket\Header Files - - - WebSocket\Header Files - - - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - HTML\Source Files - - - FTPClient\Source Files - - - FTPClient\Source Files - - - Reactor\Source Files - - - Reactor\Source Files - - - Reactor\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - WebSocket\Source Files - - - WebSocket\Source Files - - - - - + + + + + {88b508f9-076e-4f63-896f-978172fe8918} + + + {15a8353f-bd11-4736-93ab-ec2091521aa3} + + + {433321e2-70cc-4c3c-8bc8-30fbd1ae73a5} + + + {542b7d1a-c36f-49ec-bf84-e71296e7dc1f} + + + {6ba64e20-8971-4285-9376-9bfb48f00c00} + + + {0bfad08c-82d8-403e-95dd-2834943d8a93} + + + {048a49f1-cfe9-4d05-9587-477832a3e22f} + + + {006e8f63-8d31-4f24-a95b-4da971f0485e} + + + {603f876f-98cf-4653-968b-681025fa0f59} + + + {44f4d194-90a0-43ad-905e-4ee03ebd118d} + + + {bde1cfb1-e931-4f24-80ee-154397837879} + + + {fed31122-0082-4d5e-8094-a9c4f820af39} + + + {5a9d0360-160a-4d5f-8252-ae7b82fefd1b} + + + {1ba58e68-0664-4553-9b8b-3329c4df0724} + + + {48f85270-d833-491f-a68d-d36541f99d31} + + + {4bf62840-f99d-4915-9125-759315d3be09} + + + {aa267629-d879-430e-8b4f-86e20c2d258f} + + + {43df5d03-4705-4c24-a4d2-f5c452dec26b} + + + {35d608e8-3cf9-4207-8617-5105979d6f95} + + + {a71d64f2-1a24-4e2d-8496-a0a66f30b3b5} + + + {4e059fc6-9897-41b8-b34e-b8f83d6b7025} + + + {0855453c-f7d7-4a41-81c6-852a019549eb} + + + {99e23efc-cc28-423d-bc10-fee57916078c} + + + {6a10a18f-80a9-4ad4-9d9c-063d32d8dfa4} + + + {30e6a266-58ae-42ea-864e-bc3c92581f13} + + + {02f2ddf6-e8a5-4889-8fd6-c5e1ccb8e553} + + + {fd8eb857-dff6-4d3e-96df-2ffda6294550} + + + {65f633ed-f550-4521-8d77-786cd241a289} + + + {0f13024a-3ed3-489c-a0ea-077d75e4c566} + + + {59888127-14c5-4a50-a97d-e586e5a0514c} + + + {dbedc324-fe03-4c41-a273-022b5a5170cd} + + + {aaeffeb0-d1d0-4d82-966a-5efc392733fb} + + + {14837134-99f9-4932-8c16-e8fc2cf06959} + + + {3c25c1ab-3295-4661-8183-af56b07cd4e3} + + + {a5c48a8e-cc06-4990-8c8b-fc8aac09548c} + + + {5d8f0dc0-e8d4-4798-ac75-caf2af55f6ff} + + + {abe74806-0c96-4b3f-b53b-276d535280fd} + + + {1a3734b6-3ceb-4d50-bed4-2573f71bc3b2} + + + {485f9a7a-90a8-4479-ae11-d92ce866bfd9} + + + {0e595ff7-6049-4673-98fe-f6593609d425} + + + {cb96a05c-19e3-42f1-b394-8c61c97f03a6} + + + {865a0e39-c61d-47ef-af4a-8ecc4640e5b0} + + + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + HTML\Header Files + + + FTPClient\Header Files + + + FTPClient\Header Files + + + Reactor\Header Files + + + Reactor\Header Files + + + Reactor\Header Files + + + Reactor\Header Files + + + Reactor\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + WebSocket\Header Files + + + WebSocket\Header Files + + + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + HTML\Source Files + + + FTPClient\Source Files + + + FTPClient\Source Files + + + Reactor\Source Files + + + Reactor\Source Files + + + Reactor\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + WebSocket\Source Files + + + WebSocket\Source Files + + + + + \ No newline at end of file diff --git a/Net/Net_x64_vs110.sln b/Net/Net_x64_vs110.sln index 93dcd3d9d..786753e85 100644 --- a/Net/Net_x64_vs110.sln +++ b/Net/Net_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Net", "Net_x64_vs110.vcxproj", "{B057A1FE-09F7-465E-B8B5-E1B659051D76}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}" - ProjectSection(ProjectDependencies) = postProject - {B057A1FE-09F7-465E-B8B5-E1B659051D76} = {B057A1FE-09F7-465E-B8B5-E1B659051D76} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|x64.Build.0 = debug_shared|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|x64.ActiveCfg = release_shared|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|x64.Build.0 = release_shared|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|x64.Deploy.0 = release_shared|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|x64.Build.0 = release_static_md|x64 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|x64.Build.0 = debug_shared|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|x64.ActiveCfg = release_shared|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|x64.Build.0 = release_shared|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|x64.Deploy.0 = release_shared|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|x64.Build.0 = release_static_md|x64 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Net", "Net_x64_vs110.vcxproj", "{B057A1FE-09F7-465E-B8B5-E1B659051D76}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}" + ProjectSection(ProjectDependencies) = postProject + {B057A1FE-09F7-465E-B8B5-E1B659051D76} = {B057A1FE-09F7-465E-B8B5-E1B659051D76} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|x64.Build.0 = debug_shared|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|x64.ActiveCfg = release_shared|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|x64.Build.0 = release_shared|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|x64.Deploy.0 = release_shared|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|x64.Build.0 = release_static_md|x64 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|x64.Build.0 = debug_shared|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|x64.ActiveCfg = release_shared|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|x64.Build.0 = release_shared|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|x64.Deploy.0 = release_shared|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|x64.Build.0 = release_static_md|x64 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Net/Net_x64_vs110.vcxproj b/Net/Net_x64_vs110.vcxproj index 9a66b6910..e6ddb8154 100644 --- a/Net/Net_x64_vs110.vcxproj +++ b/Net/Net_x64_vs110.vcxproj @@ -1,474 +1,474 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Net - {B057A1FE-09F7-465E-B8B5-E1B659051D76} - Net - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoNet64d - PocoNetmdd - PocoNetmtd - PocoNet64 - PocoNetmd - PocoNetmt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin64\PocoNet64d.dll - true - true - ..\bin64\PocoNet64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoNetd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin64\PocoNet64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoNet.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoNetmtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoNetmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoNetmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoNetmdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoNetmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoNetmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Net + {B057A1FE-09F7-465E-B8B5-E1B659051D76} + Net + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoNet64d + PocoNetmdd + PocoNetmtd + PocoNet64 + PocoNetmd + PocoNetmt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin64\PocoNet64d.dll + true + true + ..\bin64\PocoNet64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoNetd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin64\PocoNet64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoNet.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoNetmtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoNetmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoNetmt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoNetmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoNetmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoNetmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + diff --git a/Net/Net_x64_vs110.vcxproj.filters b/Net/Net_x64_vs110.vcxproj.filters index 047f89c10..a867c7081 100644 --- a/Net/Net_x64_vs110.vcxproj.filters +++ b/Net/Net_x64_vs110.vcxproj.filters @@ -1,693 +1,693 @@ - - - - - {f5c14a6e-f421-4392-b282-ff5c78811048} - - - {f000a1b0-df38-467f-9d1e-b06f03c7e7be} - - - {7fc5dc26-8b25-4557-8151-ff5727c3a3e1} - - - {cfa3bc22-f1e0-4051-98e1-48b45c08260c} - - - {ef9e853a-e078-47d1-8495-7ebf5a12d6ab} - - - {8e5dc4d7-af79-4d50-aa0e-1863db5a946e} - - - {e218a96c-a9e6-4a00-a6f5-616cf0b8cd70} - - - {39a6e47e-c373-46a4-9797-65ecdba198ad} - - - {5ff338ed-4bb8-458c-89a1-dfeab0b5ecf1} - - - {e08f08f7-d316-4148-ab83-72a28343bc7c} - - - {d8047ab8-d8e9-4b3f-9d15-972bbaf7cb77} - - - {a6ed56b8-b1c9-4ee5-be33-1f476c6c9cb8} - - - {5913ae13-407d-46d4-965e-4e704749287a} - - - {d7de78e6-859c-471c-90c0-6203e6fbc5c3} - - - {48abb7e6-1f49-4441-a50d-65aaaf89df93} - - - {d104e8d6-5227-4478-8ff7-42a1b1a6e828} - - - {e7be3d29-7ded-44d4-8138-08d0c8bbe0ba} - - - {142762c3-465f-49d7-b9fd-f9fe96799d67} - - - {e8b1e4cf-bbff-4c0b-a2da-05b51f3fa17b} - - - {54d8dc43-6251-46db-8ae8-1c55e1d86f1d} - - - {5667e05b-0b10-498f-9fbc-c89f67e4974a} - - - {74834f9a-1e90-4051-a027-433a906a9252} - - - {c4fd5690-f2fc-4088-a010-905f4ea434d6} - - - {b1f23355-95dd-47d8-a8fd-eec837f4537f} - - - {b1f01317-05d1-4a9b-8b5d-7c9f37916d04} - - - {76a13dc7-95cf-4334-8516-f2fe32d675f4} - - - {c4a4e6af-8127-487b-b5e6-c389a2912a0e} - - - {e33482e7-f57c-4d8f-a838-b122e2aab325} - - - {72c401d7-3c6e-4a28-8224-19591609cdff} - - - {568219dc-7876-4ced-b124-71e73a64c6bb} - - - {ad5b9c16-e7b4-43ca-b4d2-9e197ede3ed5} - - - {a5144bfb-efd8-4a8f-bd8f-62a436c2191d} - - - {ebf092f8-033a-43dc-98b0-2dc340f7e617} - - - {fe6221d4-0f2d-4f68-baf0-b9301b8fe88f} - - - {57465ff8-2989-471b-b50a-ed34562a8b4f} - - - {0a319d35-3502-402b-969a-1a0d46c1ca31} - - - {b2c4b363-274c-4458-b480-3052da794996} - - - {97860448-64d5-4043-8863-ab9e304c61ae} - - - {004afbd5-b224-409f-a725-d69d61b312ae} - - - {46d1a77d-35ad-4283-9739-1a25e7008704} - - - {21e3d60a-db44-467a-9032-6b0e2c0d171c} - - - {f40e009f-a900-4907-b60c-5e5b4f4ac9f0} - - - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - HTML\Header Files - - - FTPClient\Header Files - - - FTPClient\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - Logging\Header Files - - - WebSocket\Header Files - - - WebSocket\Header Files - - - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - HTML\Source Files - - - FTPClient\Source Files - - - FTPClient\Source Files - - - Reactor\Source Files - - - Reactor\Source Files - - - Reactor\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - Logging\Source Files - - - WebSocket\Source Files - - - WebSocket\Source Files - - - - - + + + + + {f5c14a6e-f421-4392-b282-ff5c78811048} + + + {f000a1b0-df38-467f-9d1e-b06f03c7e7be} + + + {7fc5dc26-8b25-4557-8151-ff5727c3a3e1} + + + {cfa3bc22-f1e0-4051-98e1-48b45c08260c} + + + {ef9e853a-e078-47d1-8495-7ebf5a12d6ab} + + + {8e5dc4d7-af79-4d50-aa0e-1863db5a946e} + + + {e218a96c-a9e6-4a00-a6f5-616cf0b8cd70} + + + {39a6e47e-c373-46a4-9797-65ecdba198ad} + + + {5ff338ed-4bb8-458c-89a1-dfeab0b5ecf1} + + + {e08f08f7-d316-4148-ab83-72a28343bc7c} + + + {d8047ab8-d8e9-4b3f-9d15-972bbaf7cb77} + + + {a6ed56b8-b1c9-4ee5-be33-1f476c6c9cb8} + + + {5913ae13-407d-46d4-965e-4e704749287a} + + + {d7de78e6-859c-471c-90c0-6203e6fbc5c3} + + + {48abb7e6-1f49-4441-a50d-65aaaf89df93} + + + {d104e8d6-5227-4478-8ff7-42a1b1a6e828} + + + {e7be3d29-7ded-44d4-8138-08d0c8bbe0ba} + + + {142762c3-465f-49d7-b9fd-f9fe96799d67} + + + {e8b1e4cf-bbff-4c0b-a2da-05b51f3fa17b} + + + {54d8dc43-6251-46db-8ae8-1c55e1d86f1d} + + + {5667e05b-0b10-498f-9fbc-c89f67e4974a} + + + {74834f9a-1e90-4051-a027-433a906a9252} + + + {c4fd5690-f2fc-4088-a010-905f4ea434d6} + + + {b1f23355-95dd-47d8-a8fd-eec837f4537f} + + + {b1f01317-05d1-4a9b-8b5d-7c9f37916d04} + + + {76a13dc7-95cf-4334-8516-f2fe32d675f4} + + + {c4a4e6af-8127-487b-b5e6-c389a2912a0e} + + + {e33482e7-f57c-4d8f-a838-b122e2aab325} + + + {72c401d7-3c6e-4a28-8224-19591609cdff} + + + {568219dc-7876-4ced-b124-71e73a64c6bb} + + + {ad5b9c16-e7b4-43ca-b4d2-9e197ede3ed5} + + + {a5144bfb-efd8-4a8f-bd8f-62a436c2191d} + + + {ebf092f8-033a-43dc-98b0-2dc340f7e617} + + + {fe6221d4-0f2d-4f68-baf0-b9301b8fe88f} + + + {57465ff8-2989-471b-b50a-ed34562a8b4f} + + + {0a319d35-3502-402b-969a-1a0d46c1ca31} + + + {b2c4b363-274c-4458-b480-3052da794996} + + + {97860448-64d5-4043-8863-ab9e304c61ae} + + + {004afbd5-b224-409f-a725-d69d61b312ae} + + + {46d1a77d-35ad-4283-9739-1a25e7008704} + + + {21e3d60a-db44-467a-9032-6b0e2c0d171c} + + + {f40e009f-a900-4907-b60c-5e5b4f4ac9f0} + + + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + HTML\Header Files + + + FTPClient\Header Files + + + FTPClient\Header Files + + + Reactor\Header Files + + + Reactor\Header Files + + + Reactor\Header Files + + + Reactor\Header Files + + + Reactor\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + Logging\Header Files + + + WebSocket\Header Files + + + WebSocket\Header Files + + + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + HTML\Source Files + + + FTPClient\Source Files + + + FTPClient\Source Files + + + Reactor\Source Files + + + Reactor\Source Files + + + Reactor\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + Logging\Source Files + + + WebSocket\Source Files + + + WebSocket\Source Files + + + + + \ No newline at end of file diff --git a/Net/samples/EchoServer/EchoServer_vs110.vcxproj b/Net/samples/EchoServer/EchoServer_vs110.vcxproj index 825350d23..835c9992f 100644 --- a/Net/samples/EchoServer/EchoServer_vs110.vcxproj +++ b/Net/samples/EchoServer/EchoServer_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - EchoServer - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7} - EchoServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - EchoServerd - EchoServerd - EchoServerd - EchoServer - EchoServer - EchoServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\EchoServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\EchoServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\EchoServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\EchoServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\EchoServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\EchoServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\EchoServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\EchoServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\EchoServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + EchoServer + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7} + EchoServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + EchoServerd + EchoServerd + EchoServerd + EchoServer + EchoServer + EchoServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\EchoServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\EchoServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\EchoServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\EchoServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\EchoServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\EchoServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\EchoServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\EchoServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\EchoServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + diff --git a/Net/samples/EchoServer/EchoServer_vs110.vcxproj.filters b/Net/samples/EchoServer/EchoServer_vs110.vcxproj.filters index 39149cddf..e47fb6c5b 100644 --- a/Net/samples/EchoServer/EchoServer_vs110.vcxproj.filters +++ b/Net/samples/EchoServer/EchoServer_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {adef2044-baa7-4791-b340-1706e176755c} - - - {3d29e54e-10bb-4213-8fc8-82d7bd4e1b5d} - - - - - Configuration Files - - - - - Source Files - - + + + + + {adef2044-baa7-4791-b340-1706e176755c} + + + {3d29e54e-10bb-4213-8fc8-82d7bd4e1b5d} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj b/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj index 8d1befb28..d4e790eac 100644 --- a/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj +++ b/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - EchoServer - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7} - EchoServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - EchoServerd - EchoServerd - EchoServerd - EchoServer - EchoServer - EchoServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\EchoServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\EchoServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\EchoServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\EchoServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\EchoServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\EchoServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\EchoServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\EchoServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\EchoServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + EchoServer + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7} + EchoServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + EchoServerd + EchoServerd + EchoServerd + EchoServer + EchoServer + EchoServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\EchoServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\EchoServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\EchoServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\EchoServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\EchoServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\EchoServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\EchoServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\EchoServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\EchoServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + diff --git a/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj.filters b/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj.filters index 7ace879d6..2995bda77 100644 --- a/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj.filters +++ b/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {45139019-64c3-4c30-bbef-25d192e85389} - - - {a3c2ecae-5950-457e-917f-c0cd6faaf559} - - - - - Configuration Files - - - - - Source Files - - + + + + + {45139019-64c3-4c30-bbef-25d192e85389} + + + {a3c2ecae-5950-457e-917f-c0cd6faaf559} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj b/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj index 9ff0239b5..c91294c28 100644 --- a/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj +++ b/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - HTTPFormServer - {19B162EB-DDAA-37BA-AE93-7FDED89274DE} - HTTPFormServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - HTTPFormServerd - HTTPFormServerd - HTTPFormServerd - HTTPFormServer - HTTPFormServer - HTTPFormServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\HTTPFormServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\HTTPFormServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\HTTPFormServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\HTTPFormServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\HTTPFormServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\HTTPFormServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\HTTPFormServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\HTTPFormServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\HTTPFormServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + HTTPFormServer + {19B162EB-DDAA-37BA-AE93-7FDED89274DE} + HTTPFormServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + HTTPFormServerd + HTTPFormServerd + HTTPFormServerd + HTTPFormServer + HTTPFormServer + HTTPFormServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\HTTPFormServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\HTTPFormServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\HTTPFormServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\HTTPFormServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\HTTPFormServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\HTTPFormServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\HTTPFormServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\HTTPFormServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\HTTPFormServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + diff --git a/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj.filters b/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj.filters index 33dc2b01a..acab884f2 100644 --- a/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj.filters +++ b/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {12e05a61-fdd1-4469-befb-96a32df027a4} - - - {60d25a03-1e9c-4cc6-a058-f4c9efeeb54f} - - - - - Configuration Files - - - - - Source Files - - + + + + + {12e05a61-fdd1-4469-befb-96a32df027a4} + + + {60d25a03-1e9c-4cc6-a058-f4c9efeeb54f} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj b/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj index 3c7f0d1c2..bfbcf959a 100644 --- a/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj +++ b/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - HTTPFormServer - {19B162EB-DDAA-37BA-AE93-7FDED89274DE} - HTTPFormServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - HTTPFormServerd - HTTPFormServerd - HTTPFormServerd - HTTPFormServer - HTTPFormServer - HTTPFormServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\HTTPFormServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\HTTPFormServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\HTTPFormServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\HTTPFormServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\HTTPFormServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\HTTPFormServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\HTTPFormServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\HTTPFormServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\HTTPFormServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + HTTPFormServer + {19B162EB-DDAA-37BA-AE93-7FDED89274DE} + HTTPFormServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + HTTPFormServerd + HTTPFormServerd + HTTPFormServerd + HTTPFormServer + HTTPFormServer + HTTPFormServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\HTTPFormServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\HTTPFormServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\HTTPFormServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\HTTPFormServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\HTTPFormServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\HTTPFormServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\HTTPFormServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\HTTPFormServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\HTTPFormServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + diff --git a/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj.filters b/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj.filters index c42862341..006b162fd 100644 --- a/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj.filters +++ b/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {1bf85f58-1556-4381-a24e-ca00c788e68d} - - - {9e97e2f3-ca9d-419c-b3ba-3037d3e67ef4} - - - - - Configuration Files - - - - - Source Files - - + + + + + {1bf85f58-1556-4381-a24e-ca00c788e68d} + + + {9e97e2f3-ca9d-419c-b3ba-3037d3e67ef4} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj index b35656eaa..2d63bd437 100644 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj +++ b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - HTTPLoadTest - {A140D236-D64B-370A-A7E7-3000725D9869} - HTTPLoadTest - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - HTTPLoadTestd - HTTPLoadTestd - HTTPLoadTestd - HTTPLoadTest - HTTPLoadTest - HTTPLoadTest - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\HTTPLoadTestd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\HTTPLoadTestd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\HTTPLoadTest.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\HTTPLoadTestd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\HTTPLoadTestd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\HTTPLoadTest.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\HTTPLoadTestd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\HTTPLoadTestd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\HTTPLoadTest.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + HTTPLoadTest + {A140D236-D64B-370A-A7E7-3000725D9869} + HTTPLoadTest + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + HTTPLoadTestd + HTTPLoadTestd + HTTPLoadTestd + HTTPLoadTest + HTTPLoadTest + HTTPLoadTest + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\HTTPLoadTestd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\HTTPLoadTestd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\HTTPLoadTest.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\HTTPLoadTestd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\HTTPLoadTestd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\HTTPLoadTest.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\HTTPLoadTestd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\HTTPLoadTestd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\HTTPLoadTest.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj.filters b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj.filters index 6f11a277a..25d7a28d2 100644 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj.filters +++ b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {08b90c1e-8078-4efa-bd16-049c494692b3} - - - - - Source Files - - + + + + + {08b90c1e-8078-4efa-bd16-049c494692b3} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj b/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj index 3b49b27f9..d2b10956b 100644 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj +++ b/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - HTTPLoadTest - {A140D236-D64B-370A-A7E7-3000725D9869} - HTTPLoadTest - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - HTTPLoadTestd - HTTPLoadTestd - HTTPLoadTestd - HTTPLoadTest - HTTPLoadTest - HTTPLoadTest - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\HTTPLoadTestd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\HTTPLoadTestd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\HTTPLoadTest.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\HTTPLoadTestd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\HTTPLoadTestd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\HTTPLoadTest.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\HTTPLoadTestd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\HTTPLoadTestd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\HTTPLoadTest.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + HTTPLoadTest + {A140D236-D64B-370A-A7E7-3000725D9869} + HTTPLoadTest + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + HTTPLoadTestd + HTTPLoadTestd + HTTPLoadTestd + HTTPLoadTest + HTTPLoadTest + HTTPLoadTest + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\HTTPLoadTestd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\HTTPLoadTestd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\HTTPLoadTest.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\HTTPLoadTestd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\HTTPLoadTestd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\HTTPLoadTest.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\HTTPLoadTestd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\HTTPLoadTestd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\HTTPLoadTest.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj.filters b/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj.filters index 68de5883c..fc9f33a65 100644 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj.filters +++ b/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {b19bb397-1e35-4ed5-acdb-6852f6249e19} - - - - - Source Files - - + + + + + {b19bb397-1e35-4ed5-acdb-6852f6249e19} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj index aba4fa1a6..6c10b9ec6 100644 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj +++ b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - HTTPTimeServer - {18A0143A-444A-38E3-838C-1ACFBE4EE18C} - HTTPTimeServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - HTTPTimeServerd - HTTPTimeServerd - HTTPTimeServerd - HTTPTimeServer - HTTPTimeServer - HTTPTimeServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\HTTPTimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\HTTPTimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\HTTPTimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\HTTPTimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\HTTPTimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\HTTPTimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\HTTPTimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\HTTPTimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\HTTPTimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + HTTPTimeServer + {18A0143A-444A-38E3-838C-1ACFBE4EE18C} + HTTPTimeServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServer + HTTPTimeServer + HTTPTimeServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\HTTPTimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\HTTPTimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\HTTPTimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\HTTPTimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\HTTPTimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\HTTPTimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\HTTPTimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\HTTPTimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\HTTPTimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.filters b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.filters index 133105f30..869204864 100644 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.filters +++ b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {84cf6822-1ddd-4119-a81d-e028cb7c5a76} - - - {0ea646d8-82eb-4956-9e6c-33599623a4bb} - - - - - Configuration Files - - - - - Source Files - - + + + + + {84cf6822-1ddd-4119-a81d-e028cb7c5a76} + + + {0ea646d8-82eb-4956-9e6c-33599623a4bb} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj b/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj index f05eef3a2..5c6e99969 100644 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj +++ b/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - HTTPTimeServer - {18A0143A-444A-38E3-838C-1ACFBE4EE18C} - HTTPTimeServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - HTTPTimeServerd - HTTPTimeServerd - HTTPTimeServerd - HTTPTimeServer - HTTPTimeServer - HTTPTimeServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\HTTPTimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\HTTPTimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\HTTPTimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\HTTPTimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\HTTPTimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\HTTPTimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\HTTPTimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\HTTPTimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\HTTPTimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + HTTPTimeServer + {18A0143A-444A-38E3-838C-1ACFBE4EE18C} + HTTPTimeServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServer + HTTPTimeServer + HTTPTimeServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\HTTPTimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\HTTPTimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\HTTPTimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\HTTPTimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\HTTPTimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\HTTPTimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\HTTPTimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\HTTPTimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\HTTPTimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.filters b/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.filters index 0d4edcdea..d86f4b8c9 100644 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.filters +++ b/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {33f36278-fd8b-48b9-9e2a-ef20cdf4aaba} - - - {5edb902b-33c4-4843-80a1-c178220edc49} - - - - - Configuration Files - - - - - Source Files - - + + + + + {33f36278-fd8b-48b9-9e2a-ef20cdf4aaba} + + + {5edb902b-33c4-4843-80a1-c178220edc49} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/Mail/Mail_vs110.vcxproj b/Net/samples/Mail/Mail_vs110.vcxproj index 463b44e6c..df4cf78aa 100644 --- a/Net/samples/Mail/Mail_vs110.vcxproj +++ b/Net/samples/Mail/Mail_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Mail - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA} - Mail - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Maild - Maild - Maild - Mail - Mail - Mail - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Maild.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Maild.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Mail.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Maild.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Maild.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Mail.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Maild.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Maild.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Mail.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Mail + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA} + Mail + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Maild + Maild + Maild + Mail + Mail + Mail + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Maild.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Maild.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Mail.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Maild.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Maild.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Mail.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Maild.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Maild.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Mail.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + diff --git a/Net/samples/Mail/Mail_vs110.vcxproj.filters b/Net/samples/Mail/Mail_vs110.vcxproj.filters index 51f3c9167..77416760b 100644 --- a/Net/samples/Mail/Mail_vs110.vcxproj.filters +++ b/Net/samples/Mail/Mail_vs110.vcxproj.filters @@ -1,18 +1,18 @@ - - - - - {ca0feefb-d561-4eba-a552-10424a174018} - - - - - Source Files - - - - - Source Files - - + + + + + {ca0feefb-d561-4eba-a552-10424a174018} + + + + + Source Files + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/Mail/Mail_x64_vs110.vcxproj b/Net/samples/Mail/Mail_x64_vs110.vcxproj index e4025d8e8..7a40b8732 100644 --- a/Net/samples/Mail/Mail_x64_vs110.vcxproj +++ b/Net/samples/Mail/Mail_x64_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Mail - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA} - Mail - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Maild - Maild - Maild - Mail - Mail - Mail - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Maild.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Maild.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Mail.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Maild.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Maild.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Mail.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Maild.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Maild.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Mail.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Mail + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA} + Mail + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Maild + Maild + Maild + Mail + Mail + Mail + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Maild.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Maild.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Mail.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Maild.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Maild.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Mail.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Maild.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Maild.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Mail.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + diff --git a/Net/samples/Mail/Mail_x64_vs110.vcxproj.filters b/Net/samples/Mail/Mail_x64_vs110.vcxproj.filters index 4284fdcca..7dce6529a 100644 --- a/Net/samples/Mail/Mail_x64_vs110.vcxproj.filters +++ b/Net/samples/Mail/Mail_x64_vs110.vcxproj.filters @@ -1,18 +1,18 @@ - - - - - {4e84e2ce-fdbc-4421-874b-5ea2bd2dae13} - - - - - Source Files - - - - - Source Files - - + + + + + {4e84e2ce-fdbc-4421-874b-5ea2bd2dae13} + + + + + Source Files + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/Ping/Ping_vs110.vcxproj b/Net/samples/Ping/Ping_vs110.vcxproj index c7d91ddbc..9ee98dd1e 100644 --- a/Net/samples/Ping/Ping_vs110.vcxproj +++ b/Net/samples/Ping/Ping_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Ping - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5} - Ping - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Pingd - Pingd - Pingd - Ping - Ping - Ping - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Pingd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Pingd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Ping.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Pingd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Pingd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Ping.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Pingd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Pingd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Ping.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Ping + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5} + Ping + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Pingd + Pingd + Pingd + Ping + Ping + Ping + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Pingd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Pingd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Ping.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Pingd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Pingd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Ping.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Pingd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Pingd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Ping.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + diff --git a/Net/samples/Ping/Ping_vs110.vcxproj.filters b/Net/samples/Ping/Ping_vs110.vcxproj.filters index 0c0b16541..770d5a13d 100644 --- a/Net/samples/Ping/Ping_vs110.vcxproj.filters +++ b/Net/samples/Ping/Ping_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {4537bee6-e172-4ad0-a101-c66d7711b196} - - - {e4b75de0-d507-4c8f-a300-f9c74a0240c2} - - - - - Configuration Files - - - - - Source Files - - + + + + + {4537bee6-e172-4ad0-a101-c66d7711b196} + + + {e4b75de0-d507-4c8f-a300-f9c74a0240c2} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/Ping/Ping_x64_vs110.vcxproj b/Net/samples/Ping/Ping_x64_vs110.vcxproj index b130ecb5a..855676c27 100644 --- a/Net/samples/Ping/Ping_x64_vs110.vcxproj +++ b/Net/samples/Ping/Ping_x64_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Ping - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5} - Ping - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Pingd - Pingd - Pingd - Ping - Ping - Ping - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Pingd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Pingd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Ping.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Pingd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Pingd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Ping.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Pingd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Pingd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Ping.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Ping + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5} + Ping + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Pingd + Pingd + Pingd + Ping + Ping + Ping + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Pingd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Pingd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Ping.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Pingd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Pingd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Ping.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Pingd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Pingd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Ping.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + diff --git a/Net/samples/Ping/Ping_x64_vs110.vcxproj.filters b/Net/samples/Ping/Ping_x64_vs110.vcxproj.filters index acf60dbdc..08fd1fe23 100644 --- a/Net/samples/Ping/Ping_x64_vs110.vcxproj.filters +++ b/Net/samples/Ping/Ping_x64_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {7eadea6e-8dd8-4ec3-9897-97c9f8086161} - - - {20a352ac-dbec-4833-a0f6-9450886ddd29} - - - - - Configuration Files - - - - - Source Files - - + + + + + {7eadea6e-8dd8-4ec3-9897-97c9f8086161} + + + {20a352ac-dbec-4833-a0f6-9450886ddd29} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/SMTPLogger/Makefile b/Net/samples/SMTPLogger/Makefile index bb18cec95..3155c496a 100644 --- a/Net/samples/SMTPLogger/Makefile +++ b/Net/samples/SMTPLogger/Makefile @@ -1,17 +1,17 @@ -# -# Makefile -# -# $Id: //poco/Main/Net/samples/SMTPLogger/Makefile#2 $ -# -# Makefile for Poco SMTPLogger -# - -include $(POCO_BASE)/build/rules/global - -objects = SMTPLogger - -target = SMTPLogger -target_version = 1 -target_libs = PocoNet PocoFoundation - -include $(POCO_BASE)/build/rules/exec +# +# Makefile +# +# $Id: //poco/Main/Net/samples/SMTPLogger/Makefile#2 $ +# +# Makefile for Poco SMTPLogger +# + +include $(POCO_BASE)/build/rules/global + +objects = SMTPLogger + +target = SMTPLogger +target_version = 1 +target_libs = PocoNet PocoFoundation + +include $(POCO_BASE)/build/rules/exec diff --git a/Net/samples/SMTPLogger/SMTPLogger_CE_vs90.vcproj b/Net/samples/SMTPLogger/SMTPLogger_CE_vs90.vcproj index dcb47907a..b260e9df9 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_CE_vs90.vcproj +++ b/Net/samples/SMTPLogger/SMTPLogger_CE_vs90.vcproj @@ -1,466 +1,466 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs100.vcxproj b/Net/samples/SMTPLogger/SMTPLogger_vs100.vcxproj index aaba9d31b..16336eac4 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs100.vcxproj +++ b/Net/samples/SMTPLogger/SMTPLogger_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - SMTPLogger - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF} - SMTPLogger - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - SMTPLoggerd - SMTPLoggerd - SMTPLoggerd - SMTPLogger - SMTPLogger - SMTPLogger - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\SMTPLoggerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\SMTPLoggerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\SMTPLogger.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\SMTPLoggerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\SMTPLoggerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\SMTPLogger.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\SMTPLoggerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\SMTPLoggerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\SMTPLogger.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + SMTPLogger + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF} + SMTPLogger + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + SMTPLoggerd + SMTPLoggerd + SMTPLoggerd + SMTPLogger + SMTPLogger + SMTPLogger + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\SMTPLoggerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\SMTPLoggerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\SMTPLogger.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\SMTPLoggerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\SMTPLoggerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\SMTPLogger.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\SMTPLoggerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\SMTPLoggerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\SMTPLogger.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs100.vcxproj.filters b/Net/samples/SMTPLogger/SMTPLogger_vs100.vcxproj.filters index 468ff4eae..7f36e675c 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs100.vcxproj.filters +++ b/Net/samples/SMTPLogger/SMTPLogger_vs100.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {d603a5f1-6087-4070-81d5-85521c8092ac} - - - - - Source Files - - + + + + + {d603a5f1-6087-4070-81d5-85521c8092ac} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj b/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj index 61edff706..2febb0979 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj +++ b/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - SMTPLogger - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF} - SMTPLogger - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - SMTPLoggerd - SMTPLoggerd - SMTPLoggerd - SMTPLogger - SMTPLogger - SMTPLogger - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\SMTPLoggerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\SMTPLoggerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\SMTPLogger.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\SMTPLoggerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\SMTPLoggerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\SMTPLogger.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\SMTPLoggerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\SMTPLoggerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\SMTPLogger.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + SMTPLogger + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF} + SMTPLogger + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + SMTPLoggerd + SMTPLoggerd + SMTPLoggerd + SMTPLogger + SMTPLogger + SMTPLogger + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\SMTPLoggerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\SMTPLoggerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\SMTPLogger.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\SMTPLoggerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\SMTPLoggerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\SMTPLogger.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\SMTPLoggerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\SMTPLoggerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\SMTPLogger.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj.filters b/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj.filters index 17b57da91..c040b6989 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj.filters +++ b/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {bddb6c22-10d7-44d1-8f9a-38d7959382ac} - - - - - Source Files - - + + + + + {bddb6c22-10d7-44d1-8f9a-38d7959382ac} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs71.vcproj b/Net/samples/SMTPLogger/SMTPLogger_vs71.vcproj index d5fa6ce47..101d7750e 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs71.vcproj +++ b/Net/samples/SMTPLogger/SMTPLogger_vs71.vcproj @@ -1,393 +1,393 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs80.vcproj b/Net/samples/SMTPLogger/SMTPLogger_vs80.vcproj index 829d7df70..70f1b1286 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs80.vcproj +++ b/Net/samples/SMTPLogger/SMTPLogger_vs80.vcproj @@ -1,433 +1,433 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs90.vcproj b/Net/samples/SMTPLogger/SMTPLogger_vs90.vcproj index e9eb5b958..c6dff57cc 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs90.vcproj +++ b/Net/samples/SMTPLogger/SMTPLogger_vs90.vcproj @@ -1,433 +1,433 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/samples/SMTPLogger/SMTPLogger_x64_vs100.vcxproj b/Net/samples/SMTPLogger/SMTPLogger_x64_vs100.vcxproj index 6cb874f64..90af77510 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_x64_vs100.vcxproj +++ b/Net/samples/SMTPLogger/SMTPLogger_x64_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - SMTPLogger - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF} - SMTPLogger - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - SMTPLoggerd - SMTPLoggerd - SMTPLoggerd - SMTPLogger - SMTPLogger - SMTPLogger - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\SMTPLoggerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\SMTPLoggerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\SMTPLogger.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\SMTPLoggerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\SMTPLoggerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\SMTPLogger.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\SMTPLoggerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\SMTPLoggerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\SMTPLogger.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + SMTPLogger + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF} + SMTPLogger + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + SMTPLoggerd + SMTPLoggerd + SMTPLoggerd + SMTPLogger + SMTPLogger + SMTPLogger + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\SMTPLoggerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\SMTPLoggerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\SMTPLogger.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\SMTPLoggerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\SMTPLoggerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\SMTPLogger.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\SMTPLoggerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\SMTPLoggerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\SMTPLogger.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Net/samples/SMTPLogger/SMTPLogger_x64_vs100.vcxproj.filters b/Net/samples/SMTPLogger/SMTPLogger_x64_vs100.vcxproj.filters index f09a4afb4..53c5b4d5b 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_x64_vs100.vcxproj.filters +++ b/Net/samples/SMTPLogger/SMTPLogger_x64_vs100.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {4080813c-9684-44bc-88e0-12b276cdee0c} - - - - - Source Files - - + + + + + {4080813c-9684-44bc-88e0-12b276cdee0c} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj b/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj index 6a4bb7605..43347394e 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj +++ b/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - SMTPLogger - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF} - SMTPLogger - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - SMTPLoggerd - SMTPLoggerd - SMTPLoggerd - SMTPLogger - SMTPLogger - SMTPLogger - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\SMTPLoggerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\SMTPLoggerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\SMTPLogger.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\SMTPLoggerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\SMTPLoggerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\SMTPLogger.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\SMTPLoggerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\SMTPLoggerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\SMTPLogger.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + SMTPLogger + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF} + SMTPLogger + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + SMTPLoggerd + SMTPLoggerd + SMTPLoggerd + SMTPLogger + SMTPLogger + SMTPLogger + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\SMTPLoggerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\SMTPLoggerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\SMTPLogger.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\SMTPLoggerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\SMTPLoggerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\SMTPLogger.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\SMTPLoggerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\SMTPLoggerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\SMTPLogger.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj.filters b/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj.filters index e42d99ea5..4ca103e54 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj.filters +++ b/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {268a9456-f887-4569-9d96-90c67dff6c87} - - - - - Source Files - - + + + + + {268a9456-f887-4569-9d96-90c67dff6c87} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/SMTPLogger/SMTPLogger_x64_vs90.vcproj b/Net/samples/SMTPLogger/SMTPLogger_x64_vs90.vcproj index 1cf6c84f4..559b4dea4 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_x64_vs90.vcproj +++ b/Net/samples/SMTPLogger/SMTPLogger_x64_vs90.vcproj @@ -1,433 +1,433 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/samples/SMTPLogger/src/SMTPLogger.cpp b/Net/samples/SMTPLogger/src/SMTPLogger.cpp index 32665c269..7b457cbd2 100644 --- a/Net/samples/SMTPLogger/src/SMTPLogger.cpp +++ b/Net/samples/SMTPLogger/src/SMTPLogger.cpp @@ -1,92 +1,92 @@ -// -// Mail.cpp -// -// $Id: //poco/svn/Net/samples/SMTPLogger/src/SMTPLogger.cpp#1 $ -// -// This sample demonstrates the SMTPChannel class. -// -// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Net/MailMessage.h" -#include "Poco/Net/SMTPChannel.h" -#include "Poco/Logger.h" -#include "Poco/Path.h" -#include "Poco/AutoPtr.h" -#include "Poco/Exception.h" -#include - - -using Poco::Net::SMTPChannel; -using Poco::Logger; -using Poco::Path; -using Poco::AutoPtr; -using Poco::Exception; - - -#if defined(POCO_OS_FAMILY_UNIX) -const std::string fileName = "${POCO_BASE}/Net/samples/SMTPLogger/res/logo.gif"; -#elif defined(POCO_OS_FAMILY_WINDOWS) -const std::string fileName = "%POCO_BASE%/Net/samples/SMTPLogger/res/logo.gif"; -#endif - - -int main(int argc, char** argv) -{ - if (argc != 4) - { - Path p(argv[0]); - std::cerr << "usage: " << p.getBaseName() << " " << std::endl; - std::cerr << " Send an email log entry from to ," << std::endl; - std::cerr << " the SMTP server at ." << std::endl; - return 1; - } - - std::string mailhost(argv[1]); - std::string sender(argv[2]); - std::string recipient(argv[3]); - std::string attachment = Path::expand(fileName); - - try - { - AutoPtr pSMTPChannel = new SMTPChannel(mailhost, sender, recipient); - pSMTPChannel->setProperty("attachment", attachment); - pSMTPChannel->setProperty("type", "image/gif"); - pSMTPChannel->setProperty("delete", "false"); - pSMTPChannel->setProperty("throw", "true"); - - Logger& logger = Logger::get("POCO Sample SMTP Logger"); - logger.setChannel(pSMTPChannel.get()); - logger.critical("Critical message"); - } - catch (Exception& exc) - { - std::cerr << exc.displayText() << std::endl; - return 1; - } - return 0; -} +// +// Mail.cpp +// +// $Id: //poco/svn/Net/samples/SMTPLogger/src/SMTPLogger.cpp#1 $ +// +// This sample demonstrates the SMTPChannel class. +// +// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Net/MailMessage.h" +#include "Poco/Net/SMTPChannel.h" +#include "Poco/Logger.h" +#include "Poco/Path.h" +#include "Poco/AutoPtr.h" +#include "Poco/Exception.h" +#include + + +using Poco::Net::SMTPChannel; +using Poco::Logger; +using Poco::Path; +using Poco::AutoPtr; +using Poco::Exception; + + +#if defined(POCO_OS_FAMILY_UNIX) +const std::string fileName = "${POCO_BASE}/Net/samples/SMTPLogger/res/logo.gif"; +#elif defined(POCO_OS_FAMILY_WINDOWS) +const std::string fileName = "%POCO_BASE%/Net/samples/SMTPLogger/res/logo.gif"; +#endif + + +int main(int argc, char** argv) +{ + if (argc != 4) + { + Path p(argv[0]); + std::cerr << "usage: " << p.getBaseName() << " " << std::endl; + std::cerr << " Send an email log entry from to ," << std::endl; + std::cerr << " the SMTP server at ." << std::endl; + return 1; + } + + std::string mailhost(argv[1]); + std::string sender(argv[2]); + std::string recipient(argv[3]); + std::string attachment = Path::expand(fileName); + + try + { + AutoPtr pSMTPChannel = new SMTPChannel(mailhost, sender, recipient); + pSMTPChannel->setProperty("attachment", attachment); + pSMTPChannel->setProperty("type", "image/gif"); + pSMTPChannel->setProperty("delete", "false"); + pSMTPChannel->setProperty("throw", "true"); + + Logger& logger = Logger::get("POCO Sample SMTP Logger"); + logger.setChannel(pSMTPChannel.get()); + logger.critical("Critical message"); + } + catch (Exception& exc) + { + std::cerr << exc.displayText() << std::endl; + return 1; + } + return 0; +} diff --git a/Net/samples/TimeServer/TimeServer_vs110.vcxproj b/Net/samples/TimeServer/TimeServer_vs110.vcxproj index ed3549b13..d3f61376b 100644 --- a/Net/samples/TimeServer/TimeServer_vs110.vcxproj +++ b/Net/samples/TimeServer/TimeServer_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TimeServer - {59EDFD20-9968-30F7-9532-44C08DA58C6E} - TimeServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TimeServerd - TimeServerd - TimeServerd - TimeServer - TimeServer - TimeServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\TimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\TimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\TimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\TimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\TimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\TimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\TimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TimeServer + {59EDFD20-9968-30F7-9532-44C08DA58C6E} + TimeServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TimeServerd + TimeServerd + TimeServerd + TimeServer + TimeServer + TimeServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\TimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\TimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\TimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\TimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\TimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\TimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\TimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + diff --git a/Net/samples/TimeServer/TimeServer_vs110.vcxproj.filters b/Net/samples/TimeServer/TimeServer_vs110.vcxproj.filters index 64da6334e..53001324b 100644 --- a/Net/samples/TimeServer/TimeServer_vs110.vcxproj.filters +++ b/Net/samples/TimeServer/TimeServer_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {bc20e406-567a-446b-aef3-2ead5906ed8e} - - - {c4ac71e8-1ac3-49fe-b6f8-3cb4dbaad19a} - - - - - Source Files - - - - - Configuration Files - - + + + + + {bc20e406-567a-446b-aef3-2ead5906ed8e} + + + {c4ac71e8-1ac3-49fe-b6f8-3cb4dbaad19a} + + + + + Source Files + + + + + Configuration Files + + \ No newline at end of file diff --git a/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj b/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj index f5eadcb17..e0f4c98fa 100644 --- a/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj +++ b/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TimeServer - {59EDFD20-9968-30F7-9532-44C08DA58C6E} - TimeServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TimeServerd - TimeServerd - TimeServerd - TimeServer - TimeServer - TimeServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\TimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TimeServer + {59EDFD20-9968-30F7-9532-44C08DA58C6E} + TimeServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TimeServerd + TimeServerd + TimeServerd + TimeServer + TimeServer + TimeServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\TimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + diff --git a/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters b/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters index d270f2576..7f64a46bc 100644 --- a/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters +++ b/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {6cce5792-2d91-48ce-a4c5-de587efd58a3} - - - {8e5ce662-70f5-41fb-a85d-2e7bbfd81219} - - - - - Source Files - - - - - Configuration Files - - + + + + + {6cce5792-2d91-48ce-a4c5-de587efd58a3} + + + {8e5ce662-70f5-41fb-a85d-2e7bbfd81219} + + + + + Source Files + + + + + Configuration Files + + \ No newline at end of file diff --git a/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj b/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj index 8fbb6906e..4bda9f6b4 100644 --- a/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj +++ b/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj @@ -1,309 +1,309 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TwitterClient - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E} - TwitterClient - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TwitterClientd - TwitterClientd - TwitterClientd - TwitterClient - TwitterClient - TwitterClient - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\TwitterClientd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TwitterClientd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\TwitterClient.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\TwitterClientd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\TwitterClientd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\TwitterClient.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\TwitterClientd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TwitterClientd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\TwitterClient.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TwitterClient + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E} + TwitterClient + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TwitterClientd + TwitterClientd + TwitterClientd + TwitterClient + TwitterClient + TwitterClient + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\TwitterClientd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TwitterClientd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\TwitterClient.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\TwitterClientd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\TwitterClientd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\TwitterClient.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\TwitterClientd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TwitterClientd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\TwitterClient.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + diff --git a/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj.filters b/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj.filters index 28f503a26..7155d5029 100644 --- a/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj.filters +++ b/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj.filters @@ -1,24 +1,24 @@ - - - - - {47c8d32f-111c-4786-b915-2817732b0b8b} - - - {39982a6c-1cf1-4ce5-8510-da3ac8620eff} - - - - - Source Files - - - Source Files - - - - - Header Files - - + + + + + {47c8d32f-111c-4786-b915-2817732b0b8b} + + + {39982a6c-1cf1-4ce5-8510-da3ac8620eff} + + + + + Source Files + + + Source Files + + + + + Header Files + + \ No newline at end of file diff --git a/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj b/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj index f698a3dd5..7f3a02ea4 100644 --- a/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj +++ b/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj @@ -1,309 +1,309 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TwitterClient - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E} - TwitterClient - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TwitterClientd - TwitterClientd - TwitterClientd - TwitterClient - TwitterClient - TwitterClient - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TwitterClientd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TwitterClientd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TwitterClient.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TwitterClientd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\TwitterClientd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TwitterClient.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TwitterClientd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TwitterClientd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TwitterClient.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TwitterClient + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E} + TwitterClient + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TwitterClientd + TwitterClientd + TwitterClientd + TwitterClient + TwitterClient + TwitterClient + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TwitterClientd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TwitterClientd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TwitterClient.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TwitterClientd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\TwitterClientd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TwitterClient.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TwitterClientd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TwitterClientd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TwitterClient.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + + diff --git a/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj.filters b/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj.filters index 4cc1644d0..6c1df2c60 100644 --- a/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj.filters +++ b/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj.filters @@ -1,24 +1,24 @@ - - - - - {5a5f06d7-0b13-4f12-8605-a2323d04b2b0} - - - {51be98a8-c77a-4287-bef8-ba1833619e59} - - - - - Source Files - - - Source Files - - - - - Header Files - - + + + + + {5a5f06d7-0b13-4f12-8605-a2323d04b2b0} + + + {51be98a8-c77a-4287-bef8-ba1833619e59} + + + + + Source Files + + + Source Files + + + + + Header Files + + \ No newline at end of file diff --git a/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj b/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj index 28c03bb8e..970f1ae6f 100644 --- a/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj +++ b/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - WebSocketServer - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C} - WebSocketServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - WebSocketServerd - WebSocketServerd - WebSocketServerd - WebSocketServer - WebSocketServer - WebSocketServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\WebSocketServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\WebSocketServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\WebSocketServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\WebSocketServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\WebSocketServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\WebSocketServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\WebSocketServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\WebSocketServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\WebSocketServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + WebSocketServer + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C} + WebSocketServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + WebSocketServerd + WebSocketServerd + WebSocketServerd + WebSocketServer + WebSocketServer + WebSocketServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\WebSocketServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\WebSocketServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\WebSocketServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\WebSocketServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\WebSocketServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\WebSocketServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\WebSocketServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\WebSocketServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\WebSocketServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj.filters b/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj.filters index 9f801923c..d33670ffd 100644 --- a/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj.filters +++ b/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {aa22bb1c-d96f-4e47-8e4b-ce8c3cf63115} - - - - - Source Files - - + + + + + {aa22bb1c-d96f-4e47-8e4b-ce8c3cf63115} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj b/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj index fa6d9f994..111d299a8 100644 --- a/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj +++ b/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - WebSocketServer - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C} - WebSocketServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - WebSocketServerd - WebSocketServerd - WebSocketServerd - WebSocketServer - WebSocketServer - WebSocketServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\WebSocketServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\WebSocketServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\WebSocketServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\WebSocketServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\WebSocketServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\WebSocketServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\WebSocketServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\WebSocketServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\WebSocketServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + WebSocketServer + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C} + WebSocketServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + WebSocketServerd + WebSocketServerd + WebSocketServerd + WebSocketServer + WebSocketServer + WebSocketServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\WebSocketServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\WebSocketServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\WebSocketServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\WebSocketServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\WebSocketServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\WebSocketServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\WebSocketServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\WebSocketServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\WebSocketServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj.filters b/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj.filters index 51aac7514..dc8d8bf25 100644 --- a/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj.filters +++ b/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {4b0192d3-8154-4739-bdd5-4b096a5d056d} - - - - - Source Files - - + + + + + {4b0192d3-8154-4739-bdd5-4b096a5d056d} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/dict/dict_vs110.vcxproj b/Net/samples/dict/dict_vs110.vcxproj index eaaf4f7cc..9af376d38 100644 --- a/Net/samples/dict/dict_vs110.vcxproj +++ b/Net/samples/dict/dict_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - dict - {90F24341-F59F-385F-A8D6-66AB377FF033} - dict - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - dictd - dictd - dictd - dict - dict - dict - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\dictd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\dictd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\dict.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\dictd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\dictd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\dict.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\dictd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\dictd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\dict.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + dict + {90F24341-F59F-385F-A8D6-66AB377FF033} + dict + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + dictd + dictd + dictd + dict + dict + dict + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\dictd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\dictd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\dict.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\dictd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\dictd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\dict.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\dictd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\dictd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\dict.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Net/samples/dict/dict_vs110.vcxproj.filters b/Net/samples/dict/dict_vs110.vcxproj.filters index 04e214606..99b451e55 100644 --- a/Net/samples/dict/dict_vs110.vcxproj.filters +++ b/Net/samples/dict/dict_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {29801ee7-7c6c-4910-a587-a77818940d89} - - - - - Source Files - - + + + + + {29801ee7-7c6c-4910-a587-a77818940d89} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/dict/dict_x64_vs110.vcxproj b/Net/samples/dict/dict_x64_vs110.vcxproj index 594017624..496c9747e 100644 --- a/Net/samples/dict/dict_x64_vs110.vcxproj +++ b/Net/samples/dict/dict_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - dict - {90F24341-F59F-385F-A8D6-66AB377FF033} - dict - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - dictd - dictd - dictd - dict - dict - dict - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\dictd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\dictd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\dict.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\dictd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\dictd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\dict.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\dictd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\dictd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\dict.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + dict + {90F24341-F59F-385F-A8D6-66AB377FF033} + dict + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + dictd + dictd + dictd + dict + dict + dict + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\dictd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\dictd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\dict.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\dictd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\dictd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\dict.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\dictd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\dictd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\dict.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Net/samples/dict/dict_x64_vs110.vcxproj.filters b/Net/samples/dict/dict_x64_vs110.vcxproj.filters index d0070999d..689e5e168 100644 --- a/Net/samples/dict/dict_x64_vs110.vcxproj.filters +++ b/Net/samples/dict/dict_x64_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {16c0bbf5-9d26-498a-8a8d-6f844e8dd472} - - - - - Source Files - - + + + + + {16c0bbf5-9d26-498a-8a8d-6f844e8dd472} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/download/download_vs110.vcxproj b/Net/samples/download/download_vs110.vcxproj index 65d5dfd11..3914d95e7 100644 --- a/Net/samples/download/download_vs110.vcxproj +++ b/Net/samples/download/download_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - download - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} - download - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - downloadd - downloadd - downloadd - download - download - download - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\downloadd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\downloadd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\download.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\downloadd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\downloadd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\download.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\downloadd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\downloadd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\download.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + download + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} + download + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + downloadd + downloadd + downloadd + download + download + download + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\download.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\download.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\download.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Net/samples/download/download_vs110.vcxproj.filters b/Net/samples/download/download_vs110.vcxproj.filters index ed407cb8a..a4508683b 100644 --- a/Net/samples/download/download_vs110.vcxproj.filters +++ b/Net/samples/download/download_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {8178cf99-4be5-4049-bed2-6e410e991f70} - - - - - Source Files - - + + + + + {8178cf99-4be5-4049-bed2-6e410e991f70} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/download/download_x64_vs110.vcxproj b/Net/samples/download/download_x64_vs110.vcxproj index 254031873..faeba3258 100644 --- a/Net/samples/download/download_x64_vs110.vcxproj +++ b/Net/samples/download/download_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - download - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} - download - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - downloadd - downloadd - downloadd - download - download - download - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\downloadd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\downloadd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\download.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\downloadd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\downloadd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\download.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\downloadd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\downloadd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\download.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + download + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} + download + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + downloadd + downloadd + downloadd + download + download + download + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\download.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\download.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\download.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Net/samples/download/download_x64_vs110.vcxproj.filters b/Net/samples/download/download_x64_vs110.vcxproj.filters index 23939e5b9..0255a4b5b 100644 --- a/Net/samples/download/download_x64_vs110.vcxproj.filters +++ b/Net/samples/download/download_x64_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {466b345c-48bd-4a7a-a48b-0d351ad0ad12} - - - - - Source Files - - + + + + + {466b345c-48bd-4a7a-a48b-0d351ad0ad12} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/httpget/httpget_vs110.vcxproj b/Net/samples/httpget/httpget_vs110.vcxproj index 64e45b878..e63179e23 100644 --- a/Net/samples/httpget/httpget_vs110.vcxproj +++ b/Net/samples/httpget/httpget_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - httpget - {5A299876-BF4E-37B9-922D-4E6FC1FA9520} - httpget - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - httpgetd - httpgetd - httpgetd - httpget - httpget - httpget - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\httpgetd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\httpgetd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\httpget.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\httpgetd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\httpgetd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\httpget.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\httpgetd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\httpgetd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\httpget.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + httpget + {5A299876-BF4E-37B9-922D-4E6FC1FA9520} + httpget + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + httpgetd + httpgetd + httpgetd + httpget + httpget + httpget + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\httpgetd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\httpgetd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\httpget.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\httpgetd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\httpgetd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\httpget.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\httpgetd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\httpgetd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\httpget.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Net/samples/httpget/httpget_vs110.vcxproj.filters b/Net/samples/httpget/httpget_vs110.vcxproj.filters index b12037176..f41fbb05c 100644 --- a/Net/samples/httpget/httpget_vs110.vcxproj.filters +++ b/Net/samples/httpget/httpget_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {c67e25b4-652d-470a-8586-24514233ea2f} - - - - - Source Files - - + + + + + {c67e25b4-652d-470a-8586-24514233ea2f} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/httpget/httpget_x64_vs110.vcxproj b/Net/samples/httpget/httpget_x64_vs110.vcxproj index ad6b72b40..dd008fe37 100644 --- a/Net/samples/httpget/httpget_x64_vs110.vcxproj +++ b/Net/samples/httpget/httpget_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - httpget - {5A299876-BF4E-37B9-922D-4E6FC1FA9520} - httpget - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - httpgetd - httpgetd - httpgetd - httpget - httpget - httpget - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\httpgetd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\httpgetd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\httpget.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\httpgetd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\httpgetd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\httpget.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\httpgetd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\httpgetd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\httpget.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + httpget + {5A299876-BF4E-37B9-922D-4E6FC1FA9520} + httpget + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + httpgetd + httpgetd + httpgetd + httpget + httpget + httpget + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\httpgetd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\httpgetd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\httpget.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\httpgetd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\httpgetd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\httpget.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\httpgetd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\httpgetd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\httpget.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Net/samples/httpget/httpget_x64_vs110.vcxproj.filters b/Net/samples/httpget/httpget_x64_vs110.vcxproj.filters index 54f40be04..b1402b0d1 100644 --- a/Net/samples/httpget/httpget_x64_vs110.vcxproj.filters +++ b/Net/samples/httpget/httpget_x64_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {19654011-65f4-4192-aa70-5fc3bb40f838} - - - - - Source Files - - + + + + + {19654011-65f4-4192-aa70-5fc3bb40f838} + + + + + Source Files + + \ No newline at end of file diff --git a/Net/samples/samples_vs110.sln b/Net/samples/samples_vs110.sln index 353aebb71..16456b26c 100644 --- a/Net/samples/samples_vs110.sln +++ b/Net/samples/samples_vs110.sln @@ -1,277 +1,277 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dict", "dict\dict_vs110.vcxproj", "{90F24341-F59F-385F-A8D6-66AB377FF033}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "download", "download\download_vs110.vcxproj", "{D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EchoServer", "EchoServer\EchoServer_vs110.vcxproj", "{5074CE3E-05F5-31BA-BA79-1AD54C3416F7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPFormServer", "HTTPFormServer\HTTPFormServer_vs110.vcxproj", "{19B162EB-DDAA-37BA-AE93-7FDED89274DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpget", "httpget\httpget_vs110.vcxproj", "{5A299876-BF4E-37B9-922D-4E6FC1FA9520}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPLoadTest", "HTTPLoadTest\HTTPLoadTest_vs110.vcxproj", "{A140D236-D64B-370A-A7E7-3000725D9869}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPTimeServer", "HTTPTimeServer\HTTPTimeServer_vs110.vcxproj", "{18A0143A-444A-38E3-838C-1ACFBE4EE18C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mail", "Mail\Mail_vs110.vcxproj", "{BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ping", "Ping\Ping_vs110.vcxproj", "{154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_vs110.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TwitterClient", "TwitterClient\TwitterClient_vs110.vcxproj", "{CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebSocketServer", "WebSocketServer\WebSocketServer_vs110.vcxproj", "{0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SMTPLogger", "SMTPLogger\SMTPLogger_vs110.vcxproj", "{83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.Build.0 = release_shared|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Build.0 = release_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.Build.0 = release_shared|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.Build.0 = release_shared|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.Build.0 = release_shared|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.Build.0 = release_shared|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Build.0 = release_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Build.0 = release_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.Build.0 = release_shared|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Build.0 = release_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.Build.0 = release_shared|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.Build.0 = release_shared|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.Build.0 = release_shared|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dict", "dict\dict_vs110.vcxproj", "{90F24341-F59F-385F-A8D6-66AB377FF033}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "download", "download\download_vs110.vcxproj", "{D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EchoServer", "EchoServer\EchoServer_vs110.vcxproj", "{5074CE3E-05F5-31BA-BA79-1AD54C3416F7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPFormServer", "HTTPFormServer\HTTPFormServer_vs110.vcxproj", "{19B162EB-DDAA-37BA-AE93-7FDED89274DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpget", "httpget\httpget_vs110.vcxproj", "{5A299876-BF4E-37B9-922D-4E6FC1FA9520}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPLoadTest", "HTTPLoadTest\HTTPLoadTest_vs110.vcxproj", "{A140D236-D64B-370A-A7E7-3000725D9869}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPTimeServer", "HTTPTimeServer\HTTPTimeServer_vs110.vcxproj", "{18A0143A-444A-38E3-838C-1ACFBE4EE18C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mail", "Mail\Mail_vs110.vcxproj", "{BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ping", "Ping\Ping_vs110.vcxproj", "{154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_vs110.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TwitterClient", "TwitterClient\TwitterClient_vs110.vcxproj", "{CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebSocketServer", "WebSocketServer\WebSocketServer_vs110.vcxproj", "{0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SMTPLogger", "SMTPLogger\SMTPLogger_vs110.vcxproj", "{83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.Build.0 = release_shared|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Build.0 = release_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.Build.0 = release_shared|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.Build.0 = release_shared|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.Build.0 = release_shared|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.Build.0 = release_shared|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Build.0 = release_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Build.0 = release_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Build.0 = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.Build.0 = release_shared|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.Build.0 = release_shared|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.Build.0 = release_shared|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Net/samples/samples_x64_vs110.sln b/Net/samples/samples_x64_vs110.sln index cecd123ef..ceb4e2026 100644 --- a/Net/samples/samples_x64_vs110.sln +++ b/Net/samples/samples_x64_vs110.sln @@ -1,277 +1,277 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dict", "dict\dict_x64_vs110.vcxproj", "{90F24341-F59F-385F-A8D6-66AB377FF033}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "download", "download\download_x64_vs110.vcxproj", "{D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EchoServer", "EchoServer\EchoServer_x64_vs110.vcxproj", "{5074CE3E-05F5-31BA-BA79-1AD54C3416F7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPFormServer", "HTTPFormServer\HTTPFormServer_x64_vs110.vcxproj", "{19B162EB-DDAA-37BA-AE93-7FDED89274DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpget", "httpget\httpget_x64_vs110.vcxproj", "{5A299876-BF4E-37B9-922D-4E6FC1FA9520}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPLoadTest", "HTTPLoadTest\HTTPLoadTest_x64_vs110.vcxproj", "{A140D236-D64B-370A-A7E7-3000725D9869}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPTimeServer", "HTTPTimeServer\HTTPTimeServer_x64_vs110.vcxproj", "{18A0143A-444A-38E3-838C-1ACFBE4EE18C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mail", "Mail\Mail_x64_vs110.vcxproj", "{BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ping", "Ping\Ping_x64_vs110.vcxproj", "{154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_x64_vs110.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TwitterClient", "TwitterClient\TwitterClient_x64_vs110.vcxproj", "{CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebSocketServer", "WebSocketServer\WebSocketServer_x64_vs110.vcxproj", "{0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SMTPLogger", "SMTPLogger\SMTPLogger_x64_vs110.vcxproj", "{83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|x64.Build.0 = debug_shared|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|x64.ActiveCfg = release_shared|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|x64.Build.0 = release_shared|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|x64.Deploy.0 = release_shared|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|x64.Build.0 = release_static_md|x64 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.Build.0 = debug_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.ActiveCfg = release_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.Build.0 = release_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.Deploy.0 = release_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Build.0 = release_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|x64.Build.0 = debug_shared|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|x64.ActiveCfg = release_shared|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|x64.Build.0 = release_shared|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|x64.Deploy.0 = release_shared|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|x64.Build.0 = release_static_md|x64 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|x64.Build.0 = debug_shared|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|x64.ActiveCfg = release_shared|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|x64.Build.0 = release_shared|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|x64.Deploy.0 = release_shared|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|x64.Build.0 = release_static_md|x64 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|x64.Build.0 = debug_shared|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|x64.ActiveCfg = release_shared|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|x64.Build.0 = release_shared|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|x64.Deploy.0 = release_shared|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|x64.Build.0 = release_static_md|x64 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|x64.Build.0 = debug_shared|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|x64.ActiveCfg = release_shared|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|x64.Build.0 = release_shared|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|x64.Deploy.0 = release_shared|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|x64.Build.0 = release_static_md|x64 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.Build.0 = debug_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.ActiveCfg = release_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.Build.0 = release_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.Deploy.0 = release_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.Build.0 = release_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.Build.0 = debug_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.ActiveCfg = release_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.Build.0 = release_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.Deploy.0 = release_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Build.0 = release_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|x64.Build.0 = debug_shared|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|x64.ActiveCfg = release_shared|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|x64.Build.0 = release_shared|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|x64.Deploy.0 = release_shared|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|x64.Build.0 = release_static_md|x64 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Build.0 = debug_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.ActiveCfg = release_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Build.0 = release_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Deploy.0 = release_shared|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|x64.Build.0 = release_static_md|x64 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|x64.Build.0 = debug_shared|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|x64.ActiveCfg = release_shared|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|x64.Build.0 = release_shared|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|x64.Deploy.0 = release_shared|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|x64.Build.0 = release_static_md|x64 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|x64.Build.0 = debug_shared|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|x64.ActiveCfg = release_shared|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|x64.Build.0 = release_shared|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|x64.Deploy.0 = release_shared|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|x64.Build.0 = release_static_md|x64 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|x64.Build.0 = debug_shared|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|x64.ActiveCfg = release_shared|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|x64.Build.0 = release_shared|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|x64.Deploy.0 = release_shared|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|x64.Build.0 = release_static_md|x64 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dict", "dict\dict_x64_vs110.vcxproj", "{90F24341-F59F-385F-A8D6-66AB377FF033}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "download", "download\download_x64_vs110.vcxproj", "{D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EchoServer", "EchoServer\EchoServer_x64_vs110.vcxproj", "{5074CE3E-05F5-31BA-BA79-1AD54C3416F7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPFormServer", "HTTPFormServer\HTTPFormServer_x64_vs110.vcxproj", "{19B162EB-DDAA-37BA-AE93-7FDED89274DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpget", "httpget\httpget_x64_vs110.vcxproj", "{5A299876-BF4E-37B9-922D-4E6FC1FA9520}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPLoadTest", "HTTPLoadTest\HTTPLoadTest_x64_vs110.vcxproj", "{A140D236-D64B-370A-A7E7-3000725D9869}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPTimeServer", "HTTPTimeServer\HTTPTimeServer_x64_vs110.vcxproj", "{18A0143A-444A-38E3-838C-1ACFBE4EE18C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mail", "Mail\Mail_x64_vs110.vcxproj", "{BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ping", "Ping\Ping_x64_vs110.vcxproj", "{154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_x64_vs110.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TwitterClient", "TwitterClient\TwitterClient_x64_vs110.vcxproj", "{CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebSocketServer", "WebSocketServer\WebSocketServer_x64_vs110.vcxproj", "{0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SMTPLogger", "SMTPLogger\SMTPLogger_x64_vs110.vcxproj", "{83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|x64.Build.0 = debug_shared|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|x64.ActiveCfg = release_shared|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|x64.Build.0 = release_shared|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|x64.Deploy.0 = release_shared|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|x64.Build.0 = release_static_md|x64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.Build.0 = debug_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.ActiveCfg = release_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.Build.0 = release_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.Deploy.0 = release_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Build.0 = release_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|x64.Build.0 = debug_shared|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|x64.ActiveCfg = release_shared|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|x64.Build.0 = release_shared|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|x64.Deploy.0 = release_shared|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|x64.Build.0 = release_static_md|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|x64.Build.0 = debug_shared|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|x64.ActiveCfg = release_shared|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|x64.Build.0 = release_shared|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|x64.Deploy.0 = release_shared|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|x64.Build.0 = release_static_md|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|x64.Build.0 = debug_shared|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|x64.ActiveCfg = release_shared|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|x64.Build.0 = release_shared|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|x64.Deploy.0 = release_shared|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|x64.Build.0 = release_static_md|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|x64.Build.0 = debug_shared|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|x64.ActiveCfg = release_shared|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|x64.Build.0 = release_shared|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|x64.Deploy.0 = release_shared|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|x64.Build.0 = release_static_md|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.Build.0 = debug_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.ActiveCfg = release_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.Build.0 = release_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.Deploy.0 = release_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.Build.0 = release_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.Build.0 = debug_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.ActiveCfg = release_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.Build.0 = release_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.Deploy.0 = release_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Build.0 = release_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|x64.Build.0 = debug_shared|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|x64.Build.0 = release_shared|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|x64.Build.0 = release_static_md|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Build.0 = debug_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.ActiveCfg = release_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Build.0 = release_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Deploy.0 = release_shared|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|x64.Build.0 = release_static_md|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|x64.Build.0 = debug_shared|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|x64.ActiveCfg = release_shared|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|x64.Build.0 = release_shared|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|x64.Deploy.0 = release_shared|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|x64.Build.0 = release_static_md|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|x64.Build.0 = debug_shared|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|x64.ActiveCfg = release_shared|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|x64.Build.0 = release_shared|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|x64.Deploy.0 = release_shared|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|x64.Build.0 = release_static_md|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|x64.Build.0 = debug_shared|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|x64.ActiveCfg = release_shared|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|x64.Build.0 = release_shared|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|x64.Deploy.0 = release_shared|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|x64.Build.0 = release_static_md|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Net/testsuite/TestSuite_vs110.vcxproj b/Net/testsuite/TestSuite_vs110.vcxproj index 1692b997f..59b128880 100644 --- a/Net/testsuite/TestSuite_vs110.vcxproj +++ b/Net/testsuite/TestSuite_vs110.vcxproj @@ -1,425 +1,425 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/testsuite/TestSuite_vs110.vcxproj.filters b/Net/testsuite/TestSuite_vs110.vcxproj.filters index cc7f00ffe..1cae121b7 100644 --- a/Net/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,483 +1,483 @@ - - - - - {48ca70f9-786b-4493-9a5d-6ea87fbc8045} - - - {7b27113a-9c7b-4e42-b094-f063fa76a6be} - - - {63644439-2d95-429d-af99-9e2df30e9885} - - - {5773c8db-1013-400b-ae3d-8d09abe20808} - - - {65ad36c2-2f99-4d3c-bc41-ec926cce1600} - - - {c3eacb0c-763f-4884-8829-9ac68f02d7ca} - - - {e87975e6-1c4c-4840-9731-dea2698fa17a} - - - {c333645b-e62c-4c42-b138-2a43f6e1729b} - - - {80b63c9a-3767-4bcc-9964-2d11368e2393} - - - {219a3092-f0d8-4e6d-97cd-043a2383cf2d} - - - {9a64f56e-b760-4e2b-b724-11ed963593dd} - - - {054dd0a0-5eb9-44a6-bf36-b451df7c2f49} - - - {59cdac54-609f-4dc5-8196-243a2f18248f} - - - {734418de-08bf-4de5-8b3e-6e2cd3e54594} - - - {1062f6be-f10c-47df-8d94-0a61060d86a9} - - - {ea257d81-66d1-4147-b5c5-2e794a73b420} - - - {f95255e7-cb67-406d-8db9-a9b16148fe98} - - - {48408d36-c6a0-4b79-9b30-274976867bdf} - - - {e7b05308-e6b6-4662-81d9-af8e0c9cd45d} - - - {7ef12770-0229-46a5-836b-5037bbcdd228} - - - {8192788c-358c-4309-a278-6b7575cd4ff2} - - - {61e8851e-0a0a-40f6-9c0d-ec8174c8fa35} - - - {eef545aa-5443-47cd-a739-ae31908f6c25} - - - {41b2b5cb-149e-4f95-8f41-52d3d6c523c8} - - - {71bab8e9-2c1a-4ef4-a51b-e2fbc0f18033} - - - {a28b8a9d-e2c5-4d21-b752-0045a5414eac} - - - {75f0cef6-da4e-4f73-87fa-389a86b5495a} - - - {3deecd78-447c-4059-98b2-5c238b137321} - - - {126bdee4-4ec4-4f4f-a95e-9af62e849619} - - - {71893c8f-9949-4d38-ba3e-993e0f0befa4} - - - {4d7262fa-d505-4531-b66f-e6d9555c8cf0} - - - {cc691761-70e0-469f-8638-feca5de5ad75} - - - {9f4ce2b4-24cb-4eba-a1e1-926f0c714327} - - - {1ba2fc47-9573-4055-a7d3-d1e7115e3eb2} - - - {171276dc-2346-4746-9ff1-04e519c459f0} - - - {98625488-1f08-4ce2-a1be-16596a811b3b} - - - {522d02ea-bcac-4d80-8291-b2617fd01a3c} - - - {ee204760-6414-4a5a-81aa-8d7b4ba16ee7} - - - {3f558096-292d-490c-a0a6-2b87f1f0007e} - - - {e449d0a8-da61-4eb9-b33f-6689db5da998} - - - {ee043df7-781f-4e7b-99c9-75c571ba97df} - - - {56640d20-c9b0-4445-b167-5a5ae14a4b7c} - - - {c2645a28-101a-438f-a6c0-8f9c53e4b38d} - - - {ed6ae9e8-2e31-40ff-8220-2f5e2a5141f6} - - - {dea3bf66-314f-4c92-9a5f-bb3e047e3bfa} - - - {7e0a6c62-ad03-4583-8cb5-9e9febfbb244} - - - {243e661e-059d-497b-a9ec-0d9584b94a98} - - - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - _Suite\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTML\Header Files - - - HTML\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - FTPClient\Header Files - - - FTPClient\Header Files - - - FTPClient\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - Logging\Header Files - - - WebSocket\Header Files - - - WebSocket\Header Files - - - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTML\Source Files - - - HTML\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - FTPClient\Source Files - - - FTPClient\Source Files - - - FTPClient\Source Files - - - Reactor\Source Files - - - Reactor\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - Logging\Source Files - - - WebSocket\Source Files - - - WebSocket\Source Files - - + + + + + {48ca70f9-786b-4493-9a5d-6ea87fbc8045} + + + {7b27113a-9c7b-4e42-b094-f063fa76a6be} + + + {63644439-2d95-429d-af99-9e2df30e9885} + + + {5773c8db-1013-400b-ae3d-8d09abe20808} + + + {65ad36c2-2f99-4d3c-bc41-ec926cce1600} + + + {c3eacb0c-763f-4884-8829-9ac68f02d7ca} + + + {e87975e6-1c4c-4840-9731-dea2698fa17a} + + + {c333645b-e62c-4c42-b138-2a43f6e1729b} + + + {80b63c9a-3767-4bcc-9964-2d11368e2393} + + + {219a3092-f0d8-4e6d-97cd-043a2383cf2d} + + + {9a64f56e-b760-4e2b-b724-11ed963593dd} + + + {054dd0a0-5eb9-44a6-bf36-b451df7c2f49} + + + {59cdac54-609f-4dc5-8196-243a2f18248f} + + + {734418de-08bf-4de5-8b3e-6e2cd3e54594} + + + {1062f6be-f10c-47df-8d94-0a61060d86a9} + + + {ea257d81-66d1-4147-b5c5-2e794a73b420} + + + {f95255e7-cb67-406d-8db9-a9b16148fe98} + + + {48408d36-c6a0-4b79-9b30-274976867bdf} + + + {e7b05308-e6b6-4662-81d9-af8e0c9cd45d} + + + {7ef12770-0229-46a5-836b-5037bbcdd228} + + + {8192788c-358c-4309-a278-6b7575cd4ff2} + + + {61e8851e-0a0a-40f6-9c0d-ec8174c8fa35} + + + {eef545aa-5443-47cd-a739-ae31908f6c25} + + + {41b2b5cb-149e-4f95-8f41-52d3d6c523c8} + + + {71bab8e9-2c1a-4ef4-a51b-e2fbc0f18033} + + + {a28b8a9d-e2c5-4d21-b752-0045a5414eac} + + + {75f0cef6-da4e-4f73-87fa-389a86b5495a} + + + {3deecd78-447c-4059-98b2-5c238b137321} + + + {126bdee4-4ec4-4f4f-a95e-9af62e849619} + + + {71893c8f-9949-4d38-ba3e-993e0f0befa4} + + + {4d7262fa-d505-4531-b66f-e6d9555c8cf0} + + + {cc691761-70e0-469f-8638-feca5de5ad75} + + + {9f4ce2b4-24cb-4eba-a1e1-926f0c714327} + + + {1ba2fc47-9573-4055-a7d3-d1e7115e3eb2} + + + {171276dc-2346-4746-9ff1-04e519c459f0} + + + {98625488-1f08-4ce2-a1be-16596a811b3b} + + + {522d02ea-bcac-4d80-8291-b2617fd01a3c} + + + {ee204760-6414-4a5a-81aa-8d7b4ba16ee7} + + + {3f558096-292d-490c-a0a6-2b87f1f0007e} + + + {e449d0a8-da61-4eb9-b33f-6689db5da998} + + + {ee043df7-781f-4e7b-99c9-75c571ba97df} + + + {56640d20-c9b0-4445-b167-5a5ae14a4b7c} + + + {c2645a28-101a-438f-a6c0-8f9c53e4b38d} + + + {ed6ae9e8-2e31-40ff-8220-2f5e2a5141f6} + + + {dea3bf66-314f-4c92-9a5f-bb3e047e3bfa} + + + {7e0a6c62-ad03-4583-8cb5-9e9febfbb244} + + + {243e661e-059d-497b-a9ec-0d9584b94a98} + + + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + _Suite\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTML\Header Files + + + HTML\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + FTPClient\Header Files + + + FTPClient\Header Files + + + FTPClient\Header Files + + + Reactor\Header Files + + + Reactor\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + Logging\Header Files + + + WebSocket\Header Files + + + WebSocket\Header Files + + + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTML\Source Files + + + HTML\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + FTPClient\Source Files + + + FTPClient\Source Files + + + FTPClient\Source Files + + + Reactor\Source Files + + + Reactor\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + Logging\Source Files + + + WebSocket\Source Files + + + WebSocket\Source Files + + \ No newline at end of file diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj b/Net/testsuite/TestSuite_x64_vs110.vcxproj index 9ca74d400..8f976f003 100644 --- a/Net/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,425 +1,425 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters index 41feafa7f..ea62f3f72 100644 --- a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,483 +1,483 @@ - - - - - {a40de0e6-077d-4016-8961-2d291535fc53} - - - {f4278951-5c77-40e6-90fe-9b594ba13213} - - - {66ea243a-3011-4cfc-8660-77fed04904bb} - - - {290079c2-6e0b-4942-9006-19d78a86323b} - - - {a23fd6b6-53c9-49f8-ba36-6b569cc6d799} - - - {194ca8aa-5d90-4c76-b454-1ccd8eec1beb} - - - {1a67fedb-4c72-4444-9997-fdf081419b72} - - - {8307c619-e5e5-4a7d-b8f4-78261889bcd7} - - - {9316ab7b-1c9e-4771-9587-d484791ccbfe} - - - {37802786-7b41-469b-9b22-dbeda933a83e} - - - {2f36961c-f56c-4758-a331-9abb052aab5c} - - - {4518ba14-79f2-4d66-ab26-09c6adade144} - - - {c5b8787f-c9ee-40e0-aed7-287010dee150} - - - {737526eb-c4ff-4852-9050-f9a2c3aed43a} - - - {0ddb2e9d-f9bf-40a7-be99-ad2657c8159c} - - - {aa332089-2ea6-4078-b2ae-460ada33843e} - - - {9eae516a-6a35-4c1f-8f70-e6b0bf3364d6} - - - {1a491bcb-6b16-4330-8004-8f63012fd297} - - - {cbd512c4-1c6c-4074-a713-07b2836d9560} - - - {dccd80bb-6c44-4aa1-84e0-d53123bed8c1} - - - {dbaff751-c7b4-4d3a-89d0-6bdf664cd968} - - - {455352e6-7d8f-4403-8539-25229146bc3d} - - - {1b536a48-fc9a-4abe-b39e-bbd594d24321} - - - {e71c3da8-ead4-428e-b59c-3fb1c7e87dc0} - - - {4a23e67a-46ed-4064-8557-137f484b0b3c} - - - {4c773167-a5aa-4426-8df7-fa3292ed4ad4} - - - {6f915783-6047-4f5d-b275-5d61022683a4} - - - {1bf3fb9b-e607-4b04-a6c1-23cfc375c637} - - - {db522701-b92f-4e9c-9db8-eec76412fc28} - - - {adbf2dc8-8409-4957-b0d0-a6315bc795a1} - - - {9609a12e-f345-4207-8353-c07de23807f4} - - - {053b7fc8-dd95-46ee-8e74-6999a6715ff9} - - - {55da466b-924f-42dc-a413-b57ad9ed6a29} - - - {d73dff11-fbd6-412a-9b3a-d80fb1b63f99} - - - {85a35477-9bdb-42c2-b2a3-a40c16c6f998} - - - {c86f67b5-41d0-437a-8684-b80e32df6895} - - - {ad17749e-0806-470f-9da5-04c91c2218d7} - - - {18019ebe-8513-4107-b4ff-c6e87d9ff841} - - - {31659994-968d-45bc-aba8-ed5ed0c4cd92} - - - {cbe0c223-ef30-4e88-ac1d-133c7a213bba} - - - {6c3252f7-e24b-4116-8587-fc3615790ba4} - - - {d3597b2a-1553-4bbb-b99d-2f0a6e22ec70} - - - {1171f9e4-57d2-4a36-9e5f-8db13664f946} - - - {4b3de3ae-cd0c-43f3-adcc-1bd73ab18199} - - - {189c65af-e1ff-442e-88d6-235bbfbafeda} - - - {9b27de4e-307e-468e-9358-a68c1a264867} - - - {027a0d27-1419-4c02-9225-83322286c346} - - - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - NetCore\Header Files - - - _Suite\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Sockets\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - Messages\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - HTTP\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - HTTPServer\Header Files - - - HTTPServer\Header Files - - - HTML\Header Files - - - HTML\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - HTTPClient\Header Files - - - FTPClient\Header Files - - - FTPClient\Header Files - - - FTPClient\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - Mail\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - ICMP\Header Files - - - Logging\Header Files - - - WebSocket\Header Files - - - WebSocket\Header Files - - - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Sockets\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - Messages\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - HTTP\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - HTTPServer\Source Files - - - HTTPServer\Source Files - - - HTML\Source Files - - - HTML\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - HTTPClient\Source Files - - - FTPClient\Source Files - - - FTPClient\Source Files - - - FTPClient\Source Files - - - Reactor\Source Files - - - Reactor\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - Mail\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - ICMP\Source Files - - - Logging\Source Files - - - WebSocket\Source Files - - - WebSocket\Source Files - - + + + + + {a40de0e6-077d-4016-8961-2d291535fc53} + + + {f4278951-5c77-40e6-90fe-9b594ba13213} + + + {66ea243a-3011-4cfc-8660-77fed04904bb} + + + {290079c2-6e0b-4942-9006-19d78a86323b} + + + {a23fd6b6-53c9-49f8-ba36-6b569cc6d799} + + + {194ca8aa-5d90-4c76-b454-1ccd8eec1beb} + + + {1a67fedb-4c72-4444-9997-fdf081419b72} + + + {8307c619-e5e5-4a7d-b8f4-78261889bcd7} + + + {9316ab7b-1c9e-4771-9587-d484791ccbfe} + + + {37802786-7b41-469b-9b22-dbeda933a83e} + + + {2f36961c-f56c-4758-a331-9abb052aab5c} + + + {4518ba14-79f2-4d66-ab26-09c6adade144} + + + {c5b8787f-c9ee-40e0-aed7-287010dee150} + + + {737526eb-c4ff-4852-9050-f9a2c3aed43a} + + + {0ddb2e9d-f9bf-40a7-be99-ad2657c8159c} + + + {aa332089-2ea6-4078-b2ae-460ada33843e} + + + {9eae516a-6a35-4c1f-8f70-e6b0bf3364d6} + + + {1a491bcb-6b16-4330-8004-8f63012fd297} + + + {cbd512c4-1c6c-4074-a713-07b2836d9560} + + + {dccd80bb-6c44-4aa1-84e0-d53123bed8c1} + + + {dbaff751-c7b4-4d3a-89d0-6bdf664cd968} + + + {455352e6-7d8f-4403-8539-25229146bc3d} + + + {1b536a48-fc9a-4abe-b39e-bbd594d24321} + + + {e71c3da8-ead4-428e-b59c-3fb1c7e87dc0} + + + {4a23e67a-46ed-4064-8557-137f484b0b3c} + + + {4c773167-a5aa-4426-8df7-fa3292ed4ad4} + + + {6f915783-6047-4f5d-b275-5d61022683a4} + + + {1bf3fb9b-e607-4b04-a6c1-23cfc375c637} + + + {db522701-b92f-4e9c-9db8-eec76412fc28} + + + {adbf2dc8-8409-4957-b0d0-a6315bc795a1} + + + {9609a12e-f345-4207-8353-c07de23807f4} + + + {053b7fc8-dd95-46ee-8e74-6999a6715ff9} + + + {55da466b-924f-42dc-a413-b57ad9ed6a29} + + + {d73dff11-fbd6-412a-9b3a-d80fb1b63f99} + + + {85a35477-9bdb-42c2-b2a3-a40c16c6f998} + + + {c86f67b5-41d0-437a-8684-b80e32df6895} + + + {ad17749e-0806-470f-9da5-04c91c2218d7} + + + {18019ebe-8513-4107-b4ff-c6e87d9ff841} + + + {31659994-968d-45bc-aba8-ed5ed0c4cd92} + + + {cbe0c223-ef30-4e88-ac1d-133c7a213bba} + + + {6c3252f7-e24b-4116-8587-fc3615790ba4} + + + {d3597b2a-1553-4bbb-b99d-2f0a6e22ec70} + + + {1171f9e4-57d2-4a36-9e5f-8db13664f946} + + + {4b3de3ae-cd0c-43f3-adcc-1bd73ab18199} + + + {189c65af-e1ff-442e-88d6-235bbfbafeda} + + + {9b27de4e-307e-468e-9358-a68c1a264867} + + + {027a0d27-1419-4c02-9225-83322286c346} + + + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + NetCore\Header Files + + + _Suite\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Sockets\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + Messages\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + HTTP\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + HTTPServer\Header Files + + + HTTPServer\Header Files + + + HTML\Header Files + + + HTML\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + HTTPClient\Header Files + + + FTPClient\Header Files + + + FTPClient\Header Files + + + FTPClient\Header Files + + + Reactor\Header Files + + + Reactor\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + Mail\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + ICMP\Header Files + + + Logging\Header Files + + + WebSocket\Header Files + + + WebSocket\Header Files + + + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + NetCore\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Sockets\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + Messages\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + HTTP\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + HTTPServer\Source Files + + + HTTPServer\Source Files + + + HTML\Source Files + + + HTML\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + HTTPClient\Source Files + + + FTPClient\Source Files + + + FTPClient\Source Files + + + FTPClient\Source Files + + + Reactor\Source Files + + + Reactor\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + Mail\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + ICMP\Source Files + + + Logging\Source Files + + + WebSocket\Source Files + + + WebSocket\Source Files + + \ No newline at end of file diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.sln b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.sln index f6f95d007..363a6b412 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.sln +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetSSL_OpenSSL", "NetSSL_OpenSSL_vs110.vcxproj", "{5AECC55E-A469-11DA-8DA6-005056C00008}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{B2B88092-5BCE-4AC0-941E-88167138B4A7}" - ProjectSection(ProjectDependencies) = postProject - {5AECC55E-A469-11DA-8DA6-005056C00008} = {5AECC55E-A469-11DA-8DA6-005056C00008} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|Win32.Build.0 = release_shared|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|Win32.Build.0 = release_shared|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetSSL_OpenSSL", "NetSSL_OpenSSL_vs110.vcxproj", "{5AECC55E-A469-11DA-8DA6-005056C00008}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{B2B88092-5BCE-4AC0-941E-88167138B4A7}" + ProjectSection(ProjectDependencies) = postProject + {5AECC55E-A469-11DA-8DA6-005056C00008} = {5AECC55E-A469-11DA-8DA6-005056C00008} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|Win32.Build.0 = release_shared|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|Win32.Build.0 = release_shared|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj index dadf707f9..3e8b8ea39 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj @@ -1,339 +1,339 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - NetSSL_OpenSSL - {5AECC55E-A469-11DA-8DA6-005056C00008} - NetSSL_OpenSSL - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoNetSSLd - PocoNetSSLmdd - PocoNetSSLmtd - PocoNetSSL - PocoNetSSLmd - PocoNetSSLmt - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoNetSSLd.dll - true - true - ..\bin\PocoNetSSLd.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoNetSSLd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoNetSSL.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoNetSSL.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoNetSSLmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoNetSSLmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoNetSSLmt.lib - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoNetSSLmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoNetSSLmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoNetSSLmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + NetSSL_OpenSSL + {5AECC55E-A469-11DA-8DA6-005056C00008} + NetSSL_OpenSSL + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoNetSSLd + PocoNetSSLmdd + PocoNetSSLmtd + PocoNetSSL + PocoNetSSLmd + PocoNetSSLmt + + + + Disabled + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoNetSSLd.dll + true + true + ..\bin\PocoNetSSLd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoNetSSLd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoNetSSL.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoNetSSL.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoNetSSLmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoNetSSLmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoNetSSLmt.lib + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoNetSSLmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoNetSSLmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoNetSSLmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoNetSSLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters index 4eafbf4c5..1df812617 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters @@ -1,213 +1,213 @@ - - - - - {b341b0bd-370f-4585-8562-a74078cc8a94} - - - {d129d83b-8a99-4f61-8186-be9c9d28fb33} - - - {4439c653-71ee-49f2-9496-d2b4c888af32} - - - {17549117-7a16-4066-a6ff-4d4fc1d4a4d0} - - - {588eef25-7426-447e-91be-3d9ac8869234} - - - {dd02d9ab-7e92-4197-a78b-460a0cfb923a} - - - {95227542-ef0f-4d3a-9694-b9a0f9070fb3} - - - {80e81ec9-1c89-47a5-8510-a929e74a7172} - - - {16cb7696-4476-4b76-89c2-ce163be4ed28} - - - {0f3bcd76-c792-4cba-9564-b93b9632b847} - - - {ef555b49-55fa-452a-8ded-0b01a25ff2dc} - - - {f617c9e5-244b-49e3-b532-f14946f6b74d} - - - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - HTTPSClient\Header Files - - - HTTPSClient\Header Files - - - HTTPSClient\Header Files - - - SSLSockets\Header Files - - - SSLSockets\Header Files - - - SSLSockets\Header Files - - - SSLSockets\Header Files - - - SSLSockets\Header Files - - - Mail\Header Files - - - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - HTTPSClient\Source Files - - - HTTPSClient\Source Files - - - HTTPSClient\Source Files - - - SSLSockets\Source Files - - - SSLSockets\Source Files - - - SSLSockets\Source Files - - - SSLSockets\Source Files - - - SSLSockets\Source Files - - - Mail\Source Files - - - - - + + + + + {b341b0bd-370f-4585-8562-a74078cc8a94} + + + {d129d83b-8a99-4f61-8186-be9c9d28fb33} + + + {4439c653-71ee-49f2-9496-d2b4c888af32} + + + {17549117-7a16-4066-a6ff-4d4fc1d4a4d0} + + + {588eef25-7426-447e-91be-3d9ac8869234} + + + {dd02d9ab-7e92-4197-a78b-460a0cfb923a} + + + {95227542-ef0f-4d3a-9694-b9a0f9070fb3} + + + {80e81ec9-1c89-47a5-8510-a929e74a7172} + + + {16cb7696-4476-4b76-89c2-ce163be4ed28} + + + {0f3bcd76-c792-4cba-9564-b93b9632b847} + + + {ef555b49-55fa-452a-8ded-0b01a25ff2dc} + + + {f617c9e5-244b-49e3-b532-f14946f6b74d} + + + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + HTTPSClient\Header Files + + + HTTPSClient\Header Files + + + HTTPSClient\Header Files + + + SSLSockets\Header Files + + + SSLSockets\Header Files + + + SSLSockets\Header Files + + + SSLSockets\Header Files + + + SSLSockets\Header Files + + + Mail\Header Files + + + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + HTTPSClient\Source Files + + + HTTPSClient\Source Files + + + HTTPSClient\Source Files + + + SSLSockets\Source Files + + + SSLSockets\Source Files + + + SSLSockets\Source Files + + + SSLSockets\Source Files + + + SSLSockets\Source Files + + + Mail\Source Files + + + + + \ No newline at end of file diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.sln b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.sln index 189099665..29aa0501a 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.sln +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetSSL_OpenSSL", "NetSSL_OpenSSL_x64_vs110.vcxproj", "{5AECC55E-A469-11DA-8DA6-005056C00008}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{B2B88092-5BCE-4AC0-941E-88167138B4A7}" - ProjectSection(ProjectDependencies) = postProject - {5AECC55E-A469-11DA-8DA6-005056C00008} = {5AECC55E-A469-11DA-8DA6-005056C00008} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|x64.Build.0 = debug_shared|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|x64.ActiveCfg = release_shared|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|x64.Build.0 = release_shared|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|x64.Deploy.0 = release_shared|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64 - {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|x64.Build.0 = debug_shared|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|x64.ActiveCfg = release_shared|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|x64.Build.0 = release_shared|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|x64.Deploy.0 = release_shared|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|x64.Build.0 = release_static_md|x64 - {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetSSL_OpenSSL", "NetSSL_OpenSSL_x64_vs110.vcxproj", "{5AECC55E-A469-11DA-8DA6-005056C00008}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{B2B88092-5BCE-4AC0-941E-88167138B4A7}" + ProjectSection(ProjectDependencies) = postProject + {5AECC55E-A469-11DA-8DA6-005056C00008} = {5AECC55E-A469-11DA-8DA6-005056C00008} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|x64.Build.0 = debug_shared|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|x64.ActiveCfg = release_shared|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|x64.Build.0 = release_shared|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_shared|x64.Deploy.0 = release_shared|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64 + {5AECC55E-A469-11DA-8DA6-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|x64.Build.0 = debug_shared|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|x64.ActiveCfg = release_shared|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|x64.Build.0 = release_shared|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_shared|x64.Deploy.0 = release_shared|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|x64.Build.0 = release_static_md|x64 + {B2B88092-5BCE-4AC0-941E-88167138B4A7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj index 52d52820c..1a6438991 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj @@ -1,337 +1,337 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - NetSSL_OpenSSL - {5AECC55E-A469-11DA-8DA6-005056C00008} - NetSSL_OpenSSL - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoNetSSL64d - PocoNetSSLmdd - PocoNetSSLmtd - PocoNetSSL64 - PocoNetSSLmd - PocoNetSSLmt - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin64\PocoNetSSL64d.dll - true - true - ..\bin64\PocoNetSSL64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoNetSSLd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin64\PocoNetSSL64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoNetSSL.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoNetSSLmtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoNetSSLmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoNetSSLmt.lib - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoNetSSLmdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoNetSSLmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoNetSSLmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + NetSSL_OpenSSL + {5AECC55E-A469-11DA-8DA6-005056C00008} + NetSSL_OpenSSL + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoNetSSL64d + PocoNetSSLmdd + PocoNetSSLmtd + PocoNetSSL64 + PocoNetSSLmd + PocoNetSSLmt + + + + Disabled + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin64\PocoNetSSL64d.dll + true + true + ..\bin64\PocoNetSSL64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoNetSSLd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin64\PocoNetSSL64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoNetSSL.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoNetSSLmtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoNetSSLmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoNetSSLmt.lib + + + + + Disabled + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoNetSSLmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoNetSSLmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoNetSSLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters index dbfeef598..7fa41fbd4 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters @@ -1,213 +1,213 @@ - - - - - {7dea921b-d2b7-4473-af37-0e6f1faa8ad8} - - - {93acc539-4ddc-4220-95fd-355e1dfa801f} - - - {86f3bc56-5e34-49b1-8923-ad524cebf57e} - - - {cacf7506-072f-4c46-a83c-3e6ca19c05b5} - - - {2030e8e5-d090-4e97-8b7f-ccb7113eff1b} - - - {2e38a0b9-79a8-4a8b-a848-aeb435e07c9f} - - - {d29c1d9d-b1af-4b3a-b9df-15e1721ce9bb} - - - {2af6ed6f-4d9e-42ed-9d7c-88a8f3967430} - - - {8808bb3a-19ca-4e04-b06b-320acc1e7ecc} - - - {dac7f847-b3d2-4e21-8220-0026930d1b5f} - - - {433488bb-0ba6-4e59-b71e-13c16e46efd2} - - - {dd986b53-d96c-467c-9dba-aa1eac2f0de1} - - - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - SSLCore\Header Files - - - HTTPSClient\Header Files - - - HTTPSClient\Header Files - - - HTTPSClient\Header Files - - - SSLSockets\Header Files - - - SSLSockets\Header Files - - - SSLSockets\Header Files - - - SSLSockets\Header Files - - - SSLSockets\Header Files - - - Mail\Header Files - - - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - SSLCore\Source Files - - - HTTPSClient\Source Files - - - HTTPSClient\Source Files - - - HTTPSClient\Source Files - - - SSLSockets\Source Files - - - SSLSockets\Source Files - - - SSLSockets\Source Files - - - SSLSockets\Source Files - - - SSLSockets\Source Files - - - Mail\Source Files - - - - - + + + + + {7dea921b-d2b7-4473-af37-0e6f1faa8ad8} + + + {93acc539-4ddc-4220-95fd-355e1dfa801f} + + + {86f3bc56-5e34-49b1-8923-ad524cebf57e} + + + {cacf7506-072f-4c46-a83c-3e6ca19c05b5} + + + {2030e8e5-d090-4e97-8b7f-ccb7113eff1b} + + + {2e38a0b9-79a8-4a8b-a848-aeb435e07c9f} + + + {d29c1d9d-b1af-4b3a-b9df-15e1721ce9bb} + + + {2af6ed6f-4d9e-42ed-9d7c-88a8f3967430} + + + {8808bb3a-19ca-4e04-b06b-320acc1e7ecc} + + + {dac7f847-b3d2-4e21-8220-0026930d1b5f} + + + {433488bb-0ba6-4e59-b71e-13c16e46efd2} + + + {dd986b53-d96c-467c-9dba-aa1eac2f0de1} + + + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + SSLCore\Header Files + + + HTTPSClient\Header Files + + + HTTPSClient\Header Files + + + HTTPSClient\Header Files + + + SSLSockets\Header Files + + + SSLSockets\Header Files + + + SSLSockets\Header Files + + + SSLSockets\Header Files + + + SSLSockets\Header Files + + + Mail\Header Files + + + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + SSLCore\Source Files + + + HTTPSClient\Source Files + + + HTTPSClient\Source Files + + + HTTPSClient\Source Files + + + SSLSockets\Source Files + + + SSLSockets\Source Files + + + SSLSockets\Source Files + + + SSLSockets\Source Files + + + SSLSockets\Source Files + + + Mail\Source Files + + + + + \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj index 4012f34f8..368ded7d1 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - HTTPSTimeServer - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9} - HTTPSTimeServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - HTTPSTimeServerd - HTTPSTimeServerd - HTTPSTimeServerd - HTTPSTimeServer - HTTPSTimeServer - HTTPSTimeServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\HTTPSTimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\HTTPSTimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\HTTPSTimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\HTTPSTimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\HTTPSTimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\HTTPSTimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\HTTPSTimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\HTTPSTimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\HTTPSTimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + HTTPSTimeServer + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9} + HTTPSTimeServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + HTTPSTimeServerd + HTTPSTimeServerd + HTTPSTimeServerd + HTTPSTimeServer + HTTPSTimeServer + HTTPSTimeServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\HTTPSTimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\HTTPSTimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\HTTPSTimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\HTTPSTimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\HTTPSTimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\HTTPSTimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\HTTPSTimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\HTTPSTimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\HTTPSTimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj.filters b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj.filters index 103099ab8..2273763ef 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {32603814-e14d-45c1-81ff-9163db54a721} - - - {febad288-99e2-43a1-bf13-aa0e88fb6edf} - - - - - Configuration Files - - - - - Source Files - - + + + + + {32603814-e14d-45c1-81ff-9163db54a721} + + + {febad288-99e2-43a1-bf13-aa0e88fb6edf} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj index c0953d814..c3980c444 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - HTTPSTimeServer - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9} - HTTPSTimeServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - HTTPSTimeServerd - HTTPSTimeServerd - HTTPSTimeServerd - HTTPSTimeServer - HTTPSTimeServer - HTTPSTimeServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\HTTPSTimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\HTTPSTimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\HTTPSTimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\HTTPSTimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\HTTPSTimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\HTTPSTimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\HTTPSTimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\HTTPSTimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\HTTPSTimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + HTTPSTimeServer + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9} + HTTPSTimeServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + HTTPSTimeServerd + HTTPSTimeServerd + HTTPSTimeServerd + HTTPSTimeServer + HTTPSTimeServer + HTTPSTimeServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\HTTPSTimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\HTTPSTimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\HTTPSTimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\HTTPSTimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\HTTPSTimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\HTTPSTimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\HTTPSTimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\HTTPSTimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\HTTPSTimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj.filters index b4c5bde13..a313cae68 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {0a0bc1f8-072c-4d6c-b1d0-493a744ac00b} - - - {5987cb93-5cc2-492c-924a-f36aba105b46} - - - - - Configuration Files - - - - - Source Files - - + + + + + {0a0bc1f8-072c-4d6c-b1d0-493a744ac00b} + + + {5987cb93-5cc2-492c-924a-f36aba105b46} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj b/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj index 610754bdc..a0228eac9 100644 --- a/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj +++ b/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Mail - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA} - Mail - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Maild - Maild - Maild - Mail - Mail - Mail - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Maild.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Maild.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\Mail.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Maild.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Maild.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\Mail.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Maild.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Maild.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\Mail.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Mail + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA} + Mail + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Maild + Maild + Maild + Mail + Mail + Mail + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Maild.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Maild.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\Mail.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Maild.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Maild.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\Mail.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Maild.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Maild.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\Mail.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj.filters b/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj.filters index d2c04cbd1..c37731d5d 100644 --- a/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj.filters @@ -1,18 +1,18 @@ - - - - - {f257091a-410e-4c45-a6d9-37b44c234498} - - - - - Source Files - - - - - Source Files - - + + + + + {f257091a-410e-4c45-a6d9-37b44c234498} + + + + + Source Files + + + + + Source Files + + \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj b/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj index 9c7f90524..305e0c8c2 100644 --- a/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Mail - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA} - Mail - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Maild - Maild - Maild - Mail - Mail - Mail - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Maild.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Maild.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\Mail.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Maild.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Maild.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\Mail.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Maild.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Maild.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\Mail.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Mail + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA} + Mail + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Maild + Maild + Maild + Mail + Mail + Mail + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Maild.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Maild.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\Mail.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Maild.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Maild.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\Mail.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Maild.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Maild.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\Mail.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj.filters index 259a74563..e47ecfbb9 100644 --- a/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj.filters @@ -1,18 +1,18 @@ - - - - - {6d4de019-6cd5-4cc6-bb9c-5cf7637b1b7c} - - - - - Source Files - - - - - Source Files - - + + + + + {6d4de019-6cd5-4cc6-bb9c-5cf7637b1b7c} + + + + + Source Files + + + + + Source Files + + \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj b/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj index 2e4bf7b43..292803a10 100644 --- a/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj +++ b/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - download - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} - download - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - downloadd - downloadd - downloadd - download - download - download - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\downloadd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\downloadd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\download.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\downloadd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\downloadd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\download.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\downloadd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\downloadd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\download.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + download + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} + download + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + downloadd + downloadd + downloadd + download + download + download + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\download.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\download.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\download.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj.filters b/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj.filters index 18b604245..9dcaf6e83 100644 --- a/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {0d9dfbf4-9f71-4ead-80d6-9abe2a25a518} - - - - - Source Files - - + + + + + {0d9dfbf4-9f71-4ead-80d6-9abe2a25a518} + + + + + Source Files + + \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj b/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj index 14fbd9daf..4e91de468 100644 --- a/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - download - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} - download - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - downloadd - downloadd - downloadd - download - download - download - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\downloadd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\downloadd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\download.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\downloadd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\downloadd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\download.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\downloadd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\downloadd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\download.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + download + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} + download + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + downloadd + downloadd + downloadd + download + download + download + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\download.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\download.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\download.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj.filters index cc85e3652..8743aa47c 100644 --- a/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {7baaa480-1d84-410a-b420-109078ea4a2c} - - - - - Source Files - - + + + + + {7baaa480-1d84-410a-b420-109078ea4a2c} + + + + + Source Files + + \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/samples_vs110.sln b/NetSSL_OpenSSL/samples/samples_vs110.sln index b9eda4530..ed247c027 100644 --- a/NetSSL_OpenSSL/samples/samples_vs110.sln +++ b/NetSSL_OpenSSL/samples/samples_vs110.sln @@ -1,77 +1,77 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "download", "download\download_vs110.vcxproj", "{D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPSTimeServer", "HTTPSTimeServer\HTTPSTimeServer_vs110.vcxproj", "{F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mail", "Mail\Mail_vs110.vcxproj", "{BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Build.0 = release_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|Win32.Build.0 = release_shared|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Build.0 = release_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "download", "download\download_vs110.vcxproj", "{D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPSTimeServer", "HTTPSTimeServer\HTTPSTimeServer_vs110.vcxproj", "{F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mail", "Mail\Mail_vs110.vcxproj", "{BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Build.0 = release_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|Win32.Build.0 = release_shared|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Build.0 = release_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/NetSSL_OpenSSL/samples/samples_x64_vs110.sln b/NetSSL_OpenSSL/samples/samples_x64_vs110.sln index f3a410368..d93b615ca 100644 --- a/NetSSL_OpenSSL/samples/samples_x64_vs110.sln +++ b/NetSSL_OpenSSL/samples/samples_x64_vs110.sln @@ -1,77 +1,77 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "download", "download\download_x64_vs110.vcxproj", "{D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPSTimeServer", "HTTPSTimeServer\HTTPSTimeServer_x64_vs110.vcxproj", "{F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mail", "Mail\Mail_x64_vs110.vcxproj", "{BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.Build.0 = debug_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.ActiveCfg = release_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.Build.0 = release_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.Deploy.0 = release_shared|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Build.0 = release_static_md|x64 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|x64.Build.0 = debug_shared|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|x64.ActiveCfg = release_shared|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|x64.Build.0 = release_shared|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|x64.Deploy.0 = release_shared|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|x64.Build.0 = release_static_md|x64 - {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.Build.0 = debug_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.ActiveCfg = release_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.Build.0 = release_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.Deploy.0 = release_shared|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Build.0 = release_static_md|x64 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "download", "download\download_x64_vs110.vcxproj", "{D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPSTimeServer", "HTTPSTimeServer\HTTPSTimeServer_x64_vs110.vcxproj", "{F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mail", "Mail\Mail_x64_vs110.vcxproj", "{BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.Build.0 = debug_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.ActiveCfg = release_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.Build.0 = release_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|x64.Deploy.0 = release_shared|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Build.0 = release_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|x64.Build.0 = debug_shared|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|x64.ActiveCfg = release_shared|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|x64.Build.0 = release_shared|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|x64.Deploy.0 = release_shared|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|x64.Build.0 = release_static_md|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.Build.0 = debug_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.ActiveCfg = release_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.Build.0 = release_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|x64.Deploy.0 = release_shared|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Build.0 = release_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj index 79bd2ea69..d72bbf32c 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj @@ -1,333 +1,333 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {B2B88092-5BCE-4AC0-941E-88167138B4A7} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {B2B88092-5BCE-4AC0-941E-88167138B4A7} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters index ea110ddcc..7b6effaf3 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,117 +1,117 @@ - - - - - {a84fd8e1-e2d3-44c1-91f9-a5eba304790a} - - - {93ccbf30-e95b-4bf6-a7de-4b62c6d02e57} - - - {f8bfd4a1-7968-4d2a-b000-870f7f2b6952} - - - {a4b883b3-318f-424b-8806-252049056558} - - - {50ab5995-e298-4904-bfc9-88d381b822af} - - - {50b71629-fa72-4d6b-8c9e-1c22713ee2de} - - - {9fa5cecc-d01c-4256-afed-d2f1e7d82090} - - - {682cdb5e-98af-409e-8ab8-91ddfe194222} - - - {bfc30760-8e76-4a3a-a826-5f9e2905007b} - - - {d3c8800c-b278-4340-8efe-343696e2686e} - - - {c9964c99-a290-4fb1-87a9-d1b732ac3a67} - - - {a54263d2-16e2-484c-8642-1ecfd79a50b0} - - - {1d75a615-2511-45af-b407-596a8431e8e3} - - - {4bad92c6-fdae-4e30-b4de-906627dd54a5} - - - {a3f277cf-1c7b-4b54-a39b-1b569ff51423} - - - {5546e0fe-7619-4905-9736-b43ceac95f91} - - - {d8913810-fd05-43bb-bd4c-eff75b4fb207} - - - - - HTTPS\Header Files - - - _Suite\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - HTTPSServer\Header Files - - - HTTPSServer\Header Files - - - HTTPSClient\Header Files - - - HTTPSClient\Header Files - - - HTTPSClient\Header Files - - - - - HTTPS\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - HTTPSServer\Source Files - - - HTTPSServer\Source Files - - - HTTPSClient\Source Files - - - HTTPSClient\Source Files - - - HTTPSClient\Source Files - - + + + + + {a84fd8e1-e2d3-44c1-91f9-a5eba304790a} + + + {93ccbf30-e95b-4bf6-a7de-4b62c6d02e57} + + + {f8bfd4a1-7968-4d2a-b000-870f7f2b6952} + + + {a4b883b3-318f-424b-8806-252049056558} + + + {50ab5995-e298-4904-bfc9-88d381b822af} + + + {50b71629-fa72-4d6b-8c9e-1c22713ee2de} + + + {9fa5cecc-d01c-4256-afed-d2f1e7d82090} + + + {682cdb5e-98af-409e-8ab8-91ddfe194222} + + + {bfc30760-8e76-4a3a-a826-5f9e2905007b} + + + {d3c8800c-b278-4340-8efe-343696e2686e} + + + {c9964c99-a290-4fb1-87a9-d1b732ac3a67} + + + {a54263d2-16e2-484c-8642-1ecfd79a50b0} + + + {1d75a615-2511-45af-b407-596a8431e8e3} + + + {4bad92c6-fdae-4e30-b4de-906627dd54a5} + + + {a3f277cf-1c7b-4b54-a39b-1b569ff51423} + + + {5546e0fe-7619-4905-9736-b43ceac95f91} + + + {d8913810-fd05-43bb-bd4c-eff75b4fb207} + + + + + HTTPS\Header Files + + + _Suite\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + HTTPSServer\Header Files + + + HTTPSServer\Header Files + + + HTTPSClient\Header Files + + + HTTPSClient\Header Files + + + HTTPSClient\Header Files + + + + + HTTPS\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + HTTPSServer\Source Files + + + HTTPSServer\Source Files + + + HTTPSClient\Source Files + + + HTTPSClient\Source Files + + + HTTPSClient\Source Files + + \ No newline at end of file diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj index 50813e330..c92f8f851 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,333 +1,333 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {B2B88092-5BCE-4AC0-941E-88167138B4A7} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {B2B88092-5BCE-4AC0-941E-88167138B4A7} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters index c40b06b6d..46ff41a92 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,117 +1,117 @@ - - - - - {e9540f26-a859-4cc3-881e-3a9aa9099f28} - - - {45869e26-c300-4d11-93a5-a7ccba5ea1c9} - - - {8472b174-1f22-4db8-a625-3fa3e240ddaa} - - - {04faec72-64ff-4813-bf71-f6957c3c9dab} - - - {31ad6c2b-4658-49d9-a893-e96f92f3f5f3} - - - {bd69d3b5-bbad-4126-b297-63c8dcf59ccf} - - - {9ef44efc-1937-42b3-a9fa-2731c68f01ca} - - - {58bba8ed-a163-4d32-9d20-df259e374389} - - - {7ebd8e93-3cdf-4548-a8fa-c9155f3291b9} - - - {7fd15a94-3bdd-4c38-b585-64b4a5336411} - - - {40f9166a-3679-4102-8c67-f2dd2e09e759} - - - {5259c28f-a0e2-4299-a15a-ebb48dbfdcf8} - - - {dcc427da-afec-4765-a3f2-4fe07e344c2c} - - - {8b1dfecd-ddfc-4b33-9fad-ed479af4754a} - - - {09276556-f1ff-48ce-ac54-787809e25101} - - - {10369b33-9566-4e90-8cfd-6692888b6517} - - - {a6da70e1-264c-44d5-b94b-c1178cd9bfcc} - - - - - HTTPS\Header Files - - - _Suite\Header Files - - - TCPServer\Header Files - - - TCPServer\Header Files - - - HTTPSServer\Header Files - - - HTTPSServer\Header Files - - - HTTPSClient\Header Files - - - HTTPSClient\Header Files - - - HTTPSClient\Header Files - - - - - HTTPS\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - - TCPServer\Source Files - - - TCPServer\Source Files - - - HTTPSServer\Source Files - - - HTTPSServer\Source Files - - - HTTPSClient\Source Files - - - HTTPSClient\Source Files - - - HTTPSClient\Source Files - - + + + + + {e9540f26-a859-4cc3-881e-3a9aa9099f28} + + + {45869e26-c300-4d11-93a5-a7ccba5ea1c9} + + + {8472b174-1f22-4db8-a625-3fa3e240ddaa} + + + {04faec72-64ff-4813-bf71-f6957c3c9dab} + + + {31ad6c2b-4658-49d9-a893-e96f92f3f5f3} + + + {bd69d3b5-bbad-4126-b297-63c8dcf59ccf} + + + {9ef44efc-1937-42b3-a9fa-2731c68f01ca} + + + {58bba8ed-a163-4d32-9d20-df259e374389} + + + {7ebd8e93-3cdf-4548-a8fa-c9155f3291b9} + + + {7fd15a94-3bdd-4c38-b585-64b4a5336411} + + + {40f9166a-3679-4102-8c67-f2dd2e09e759} + + + {5259c28f-a0e2-4299-a15a-ebb48dbfdcf8} + + + {dcc427da-afec-4765-a3f2-4fe07e344c2c} + + + {8b1dfecd-ddfc-4b33-9fad-ed479af4754a} + + + {09276556-f1ff-48ce-ac54-787809e25101} + + + {10369b33-9566-4e90-8cfd-6692888b6517} + + + {a6da70e1-264c-44d5-b94b-c1178cd9bfcc} + + + + + HTTPS\Header Files + + + _Suite\Header Files + + + TCPServer\Header Files + + + TCPServer\Header Files + + + HTTPSServer\Header Files + + + HTTPSServer\Header Files + + + HTTPSClient\Header Files + + + HTTPSClient\Header Files + + + HTTPSClient\Header Files + + + + + HTTPS\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + + TCPServer\Source Files + + + TCPServer\Source Files + + + HTTPSServer\Source Files + + + HTTPSServer\Source Files + + + HTTPSClient\Source Files + + + HTTPSClient\Source Files + + + HTTPSClient\Source Files + + \ No newline at end of file diff --git a/PDF/PDF_vs100.sln b/PDF/PDF_vs100.sln index 0f349243c..6aa4da05c 100644 --- a/PDF/PDF_vs100.sln +++ b/PDF/PDF_vs100.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_vs100.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" - ProjectSection(ProjectDependencies) = postProject - {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Build.0 = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_vs100.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" + ProjectSection(ProjectDependencies) = postProject + {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Build.0 = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/PDF_vs100.vcxproj b/PDF/PDF_vs100.vcxproj index eecdacc66..1d843a965 100644 --- a/PDF/PDF_vs100.vcxproj +++ b/PDF/PDF_vs100.vcxproj @@ -1,414 +1,414 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - PDF - {E12E5C71-79A4-495A-848F-F1710111E610} - PDF - Win32Proj - - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoPDFd - PocoPDFmdd - PocoPDFmtd - PocoPDF - PocoPDFmd - PocoPDFmt - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoPDFd.dll - true - true - ..\bin\PocoPDFd.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoPDFd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoPDF.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoPDF.lib - MachineX86 - - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoPDFmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoPDFmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoPDFmt.lib - - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoPDFmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoPDFmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoPDFmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\lib\PocoPDFmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + PDF + {E12E5C71-79A4-495A-848F-F1710111E610} + PDF + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoPDFd + PocoPDFmdd + PocoPDFmtd + PocoPDF + PocoPDFmd + PocoPDFmt + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoPDFd.dll + true + true + ..\bin\PocoPDFd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoPDFd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoPDF.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoPDF.lib + MachineX86 + + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoPDFmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoPDFmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoPDFmt.lib + + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoPDFmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoPDFmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoPDFmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\lib\PocoPDFmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/PDF_vs100.vcxproj.filters b/PDF/PDF_vs100.vcxproj.filters index 71bed38f3..cac09a4cc 100644 --- a/PDF/PDF_vs100.vcxproj.filters +++ b/PDF/PDF_vs100.vcxproj.filters @@ -1,462 +1,462 @@ - - - - - {eb80a6ad-aad6-4651-ac3d-c36452504a0d} - - - {c445cf69-21b2-4ff5-b717-0972e9141776} - - - {536d730a-8130-443a-ae15-dbe7c55a7097} - - - {614ba759-3cbe-4a32-b919-89d12f2ac188} - - - {a5482a28-4397-4593-910e-baaf2a84d3c1} - - - {513f17bc-9951-4f4c-b587-50ec54ee49b0} - - - {64de40e2-ea97-4d6e-a1b0-2cfbff35544e} - - - {02834fd1-4400-4f67-bed3-81293acfaf5e} - - - {081d0f3e-54aa-4309-9cc3-b7d0d669c591} - - - {6b567849-1fb0-427f-b1fa-8cb825d9e301} - - - {583a9f34-6cc9-412d-a9da-0fde56d6a8e3} - - - {22698123-d793-4d94-a738-9fc25fe31dac} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - 3rd Party\PNG\Header Files - - - 3rd Party\PNG\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - + + + + + {eb80a6ad-aad6-4651-ac3d-c36452504a0d} + + + {c445cf69-21b2-4ff5-b717-0972e9141776} + + + {536d730a-8130-443a-ae15-dbe7c55a7097} + + + {614ba759-3cbe-4a32-b919-89d12f2ac188} + + + {a5482a28-4397-4593-910e-baaf2a84d3c1} + + + {513f17bc-9951-4f4c-b587-50ec54ee49b0} + + + {64de40e2-ea97-4d6e-a1b0-2cfbff35544e} + + + {02834fd1-4400-4f67-bed3-81293acfaf5e} + + + {081d0f3e-54aa-4309-9cc3-b7d0d669c591} + + + {6b567849-1fb0-427f-b1fa-8cb825d9e301} + + + {583a9f34-6cc9-412d-a9da-0fde56d6a8e3} + + + {22698123-d793-4d94-a738-9fc25fe31dac} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + 3rd Party\PNG\Header Files + + + 3rd Party\PNG\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + \ No newline at end of file diff --git a/PDF/PDF_vs110.sln b/PDF/PDF_vs110.sln index ad2b861d4..d8e6b5e0e 100644 --- a/PDF/PDF_vs110.sln +++ b/PDF/PDF_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_vs110.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" - ProjectSection(ProjectDependencies) = postProject - {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Build.0 = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_vs110.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" + ProjectSection(ProjectDependencies) = postProject + {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Build.0 = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/PDF_vs110.vcxproj b/PDF/PDF_vs110.vcxproj index 4e534a2bc..f0db8abe9 100644 --- a/PDF/PDF_vs110.vcxproj +++ b/PDF/PDF_vs110.vcxproj @@ -1,420 +1,420 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - PDF - {E12E5C71-79A4-495A-848F-F1710111E610} - PDF - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoPDFd - PocoPDFmdd - PocoPDFmtd - PocoPDF - PocoPDFmd - PocoPDFmt - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoPDFd.dll - true - true - ..\bin\PocoPDFd.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoPDFd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoPDF.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoPDF.lib - MachineX86 - - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoPDFmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoPDFmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoPDFmt.lib - - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoPDFmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoPDFmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoPDFmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\lib\PocoPDFmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + PDF + {E12E5C71-79A4-495A-848F-F1710111E610} + PDF + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoPDFd + PocoPDFmdd + PocoPDFmtd + PocoPDF + PocoPDFmd + PocoPDFmt + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoPDFd.dll + true + true + ..\bin\PocoPDFd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoPDFd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoPDF.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoPDF.lib + MachineX86 + + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoPDFmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoPDFmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoPDFmt.lib + + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoPDFmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoPDFmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoPDFmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\lib\PocoPDFmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/PDF_vs110.vcxproj.filters b/PDF/PDF_vs110.vcxproj.filters index 4ac513e64..13834bb26 100644 --- a/PDF/PDF_vs110.vcxproj.filters +++ b/PDF/PDF_vs110.vcxproj.filters @@ -1,462 +1,462 @@ - - - - - {a29a2343-53b7-4848-8bf6-ebf516c8432d} - - - {49fe1d71-8c1c-4aca-b084-b044cb8837a0} - - - {66e33f55-2ee5-409c-8b19-730f0b093b50} - - - {a0852c74-74ea-41cd-a907-f857f535d4ab} - - - {ed4de118-7998-438e-aa68-1513958bda4f} - - - {602d9217-6670-45a5-9349-07dd42c1a79d} - - - {d474a281-f9f5-4759-8f42-4ace3dd3cc91} - - - {bbbf6bbb-759a-4bdc-bb69-c5c1e94dd7b7} - - - {e81094a6-9792-4d45-90b3-242380085ccd} - - - {e31362a4-8e58-40ac-9ea4-cd47fec60847} - - - {21ff73a5-e37d-47bc-a023-0fddd7c44a40} - - - {0037cd74-a4f5-4327-a3ed-d20d5c4e46a8} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - 3rd Party\PNG\Header Files - - - 3rd Party\PNG\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - + + + + + {a29a2343-53b7-4848-8bf6-ebf516c8432d} + + + {49fe1d71-8c1c-4aca-b084-b044cb8837a0} + + + {66e33f55-2ee5-409c-8b19-730f0b093b50} + + + {a0852c74-74ea-41cd-a907-f857f535d4ab} + + + {ed4de118-7998-438e-aa68-1513958bda4f} + + + {602d9217-6670-45a5-9349-07dd42c1a79d} + + + {d474a281-f9f5-4759-8f42-4ace3dd3cc91} + + + {bbbf6bbb-759a-4bdc-bb69-c5c1e94dd7b7} + + + {e81094a6-9792-4d45-90b3-242380085ccd} + + + {e31362a4-8e58-40ac-9ea4-cd47fec60847} + + + {21ff73a5-e37d-47bc-a023-0fddd7c44a40} + + + {0037cd74-a4f5-4327-a3ed-d20d5c4e46a8} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + 3rd Party\PNG\Header Files + + + 3rd Party\PNG\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + \ No newline at end of file diff --git a/PDF/PDF_vs71.sln b/PDF/PDF_vs71.sln index ca602adee..55a9f6ecc 100644 --- a/PDF/PDF_vs71.sln +++ b/PDF/PDF_vs71.sln @@ -1,50 +1,50 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_vs71.vcproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs71.vcproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" - ProjectSection(ProjectDependencies) = postProject - {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - debug_shared = debug_shared - release_shared = release_shared - debug_static_mt = debug_static_mt - release_static_mt = release_static_mt - debug_static_md = debug_static_md - release_static_md = release_static_md - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared.ActiveCfg = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared.Build.0 = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared.ActiveCfg = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared.Build.0 = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt.Build.0 = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt.ActiveCfg = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt.Build.0 = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md.ActiveCfg = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md.Build.0 = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md.ActiveCfg = release_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md.Build.0 = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared.ActiveCfg = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared.Build.0 = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared.ActiveCfg = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared.Build.0 = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt.Build.0 = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt.ActiveCfg = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt.Build.0 = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md.ActiveCfg = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md.Build.0 = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md.ActiveCfg = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md.Build.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_vs71.vcproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs71.vcproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" + ProjectSection(ProjectDependencies) = postProject + {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + debug_shared = debug_shared + release_shared = release_shared + debug_static_mt = debug_static_mt + release_static_mt = release_static_mt + debug_static_md = debug_static_md + release_static_md = release_static_md + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared.ActiveCfg = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared.Build.0 = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared.ActiveCfg = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared.Build.0 = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt.Build.0 = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt.ActiveCfg = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt.Build.0 = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md.ActiveCfg = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md.Build.0 = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md.ActiveCfg = release_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md.Build.0 = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared.ActiveCfg = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared.Build.0 = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared.ActiveCfg = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared.Build.0 = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt.Build.0 = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt.ActiveCfg = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt.Build.0 = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md.ActiveCfg = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md.Build.0 = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md.ActiveCfg = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md.Build.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/PDF/PDF_vs71.vcproj b/PDF/PDF_vs71.vcproj index 202cbfaab..171347cdb 100644 --- a/PDF/PDF_vs71.vcproj +++ b/PDF/PDF_vs71.vcproj @@ -1,679 +1,679 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/PDF_vs90.sln b/PDF/PDF_vs90.sln index 41e567ec1..6884c61ad 100644 --- a/PDF/PDF_vs90.sln +++ b/PDF/PDF_vs90.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_vs90.vcproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs90.vcproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" - ProjectSection(ProjectDependencies) = postProject - {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Build.0 = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_vs90.vcproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs90.vcproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" + ProjectSection(ProjectDependencies) = postProject + {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Build.0 = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/PDF_vs90.vcproj b/PDF/PDF_vs90.vcproj index 679f1f634..bc04d9b0c 100644 --- a/PDF/PDF_vs90.vcproj +++ b/PDF/PDF_vs90.vcproj @@ -1,699 +1,699 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/PDF_x64_vs100.sln b/PDF/PDF_x64_vs100.sln index 1af2df8e7..7c8d33d80 100644 --- a/PDF/PDF_x64_vs100.sln +++ b/PDF/PDF_x64_vs100.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_x64_vs100.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs100.vcxproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" - ProjectSection(ProjectDependencies) = postProject - {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Build.0 = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.ActiveCfg = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Build.0 = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Deploy.0 = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Build.0 = release_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_x64_vs100.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs100.vcxproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" + ProjectSection(ProjectDependencies) = postProject + {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Build.0 = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.ActiveCfg = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Build.0 = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Deploy.0 = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Build.0 = release_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/PDF_x64_vs100.vcxproj b/PDF/PDF_x64_vs100.vcxproj index 327009683..89e14710d 100644 --- a/PDF/PDF_x64_vs100.vcxproj +++ b/PDF/PDF_x64_vs100.vcxproj @@ -1,412 +1,412 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - PDF - {E12E5C71-79A4-495A-848F-F1710111E610} - PDF - Win32Proj - - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoPDF64d - PocoPDFmdd - PocoPDFmtd - PocoPDF64 - PocoPDFmd - PocoPDFmt - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoPDF64d.dll - true - true - ..\bin64\PocoPDF64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoPDFd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoPDF64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoPDF.lib - MachineX64 - - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoPDFmtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoPDFmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoPDFmt.lib - - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoPDFmdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoPDFmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoPDFmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + PDF + {E12E5C71-79A4-495A-848F-F1710111E610} + PDF + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoPDF64d + PocoPDFmdd + PocoPDFmtd + PocoPDF64 + PocoPDFmd + PocoPDFmt + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoPDF64d.dll + true + true + ..\bin64\PocoPDF64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoPDFd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoPDF64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoPDF.lib + MachineX64 + + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoPDFmtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoPDFmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoPDFmt.lib + + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoPDFmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoPDFmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoPDFmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/PDF_x64_vs100.vcxproj.filters b/PDF/PDF_x64_vs100.vcxproj.filters index dc8fde3c1..c6891d862 100644 --- a/PDF/PDF_x64_vs100.vcxproj.filters +++ b/PDF/PDF_x64_vs100.vcxproj.filters @@ -1,462 +1,462 @@ - - - - - {ace9b429-8955-4c90-b35f-4cf301d3edf2} - - - {e411d4f0-1986-48d2-9ff5-969b96c0ef40} - - - {8d01c769-e22d-44cd-8d24-31e0ad49dcd6} - - - {0efc5ede-9f29-46eb-8578-32ebb0495d31} - - - {b431ef33-6c11-4da5-aa36-aec2e9488564} - - - {afef030b-0563-4ce8-addc-ca6c61bee243} - - - {45ba950e-6ebb-4f82-a8c4-7dd7e52f0bfa} - - - {f6ad2f22-d066-45d7-89ef-45220f5a39f0} - - - {3232997c-d477-4837-ac56-b15ce7337d1d} - - - {a05d2379-fb74-456f-898b-a65579661c39} - - - {dc129a30-834b-4eca-9c9f-e4ec726e3dc8} - - - {afb11505-18c7-49ee-ad68-81932438c279} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - 3rd Party\PNG\Header Files - - - 3rd Party\PNG\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - + + + + + {ace9b429-8955-4c90-b35f-4cf301d3edf2} + + + {e411d4f0-1986-48d2-9ff5-969b96c0ef40} + + + {8d01c769-e22d-44cd-8d24-31e0ad49dcd6} + + + {0efc5ede-9f29-46eb-8578-32ebb0495d31} + + + {b431ef33-6c11-4da5-aa36-aec2e9488564} + + + {afef030b-0563-4ce8-addc-ca6c61bee243} + + + {45ba950e-6ebb-4f82-a8c4-7dd7e52f0bfa} + + + {f6ad2f22-d066-45d7-89ef-45220f5a39f0} + + + {3232997c-d477-4837-ac56-b15ce7337d1d} + + + {a05d2379-fb74-456f-898b-a65579661c39} + + + {dc129a30-834b-4eca-9c9f-e4ec726e3dc8} + + + {afb11505-18c7-49ee-ad68-81932438c279} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + 3rd Party\PNG\Header Files + + + 3rd Party\PNG\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + \ No newline at end of file diff --git a/PDF/PDF_x64_vs110.sln b/PDF/PDF_x64_vs110.sln index acc2d9d40..76c0f9f7d 100644 --- a/PDF/PDF_x64_vs110.sln +++ b/PDF/PDF_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_x64_vs110.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" - ProjectSection(ProjectDependencies) = postProject - {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Build.0 = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.ActiveCfg = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Build.0 = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Deploy.0 = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Build.0 = release_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_x64_vs110.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" + ProjectSection(ProjectDependencies) = postProject + {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Build.0 = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.ActiveCfg = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Build.0 = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Deploy.0 = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Build.0 = release_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/PDF_x64_vs110.vcxproj b/PDF/PDF_x64_vs110.vcxproj index d2abd0da3..9e6d67542 100644 --- a/PDF/PDF_x64_vs110.vcxproj +++ b/PDF/PDF_x64_vs110.vcxproj @@ -1,418 +1,418 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - PDF - {E12E5C71-79A4-495A-848F-F1710111E610} - PDF - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoPDF64d - PocoPDFmdd - PocoPDFmtd - PocoPDF64 - PocoPDFmd - PocoPDFmt - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoPDF64d.dll - true - true - ..\bin64\PocoPDF64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoPDFd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoPDF64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoPDF.lib - MachineX64 - - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoPDFmtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoPDFmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoPDFmt.lib - - - - - Disabled - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoPDFmdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoPDFmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoPDFmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + PDF + {E12E5C71-79A4-495A-848F-F1710111E610} + PDF + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoPDF64d + PocoPDFmdd + PocoPDFmtd + PocoPDF64 + PocoPDFmd + PocoPDFmt + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoPDF64d.dll + true + true + ..\bin64\PocoPDF64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoPDFd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;PDF_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoPDF64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoPDF.lib + MachineX64 + + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoPDFmtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoPDFmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoPDFmt.lib + + + + + Disabled + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoPDFmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoPDFmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\PDF;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoPDFmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/PDF_x64_vs110.vcxproj.filters b/PDF/PDF_x64_vs110.vcxproj.filters index 20f74fce7..33ea84506 100644 --- a/PDF/PDF_x64_vs110.vcxproj.filters +++ b/PDF/PDF_x64_vs110.vcxproj.filters @@ -1,462 +1,462 @@ - - - - - {07872aee-558b-4b0c-90a0-f1ebb4b151e1} - - - {4c1733bd-b1d1-4356-a7cd-1c51fd0786cf} - - - {dde33cbe-a24e-4cde-849b-fff6c84d6289} - - - {257adace-5acc-40ce-9e13-aa89e337ad29} - - - {da1aef32-96b1-4d78-85cf-1c8d72cf6baf} - - - {e6e63fe8-4ed8-493e-8e0b-dcbff019ec91} - - - {cd6f5183-2c61-4be2-b3bc-8cc31757eb3f} - - - {fc199e0b-da39-4e04-8ba3-826ee72319c9} - - - {93551a02-d1b5-426d-b61c-0f277d0bfe2a} - - - {c1551d52-b11f-4ded-9339-b714943c52fd} - - - {e6eada70-700c-4417-9a33-dff99a290372} - - - {3679ad2c-3f85-495e-aefe-34ca6e8135b6} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\PNG\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\zlib\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - 3rd Party\HARU\Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - 3rd Party\PNG\Header Files - - - 3rd Party\PNG\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\zlib\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - - 3rd Party\HARU\Header Files - - + + + + + {07872aee-558b-4b0c-90a0-f1ebb4b151e1} + + + {4c1733bd-b1d1-4356-a7cd-1c51fd0786cf} + + + {dde33cbe-a24e-4cde-849b-fff6c84d6289} + + + {257adace-5acc-40ce-9e13-aa89e337ad29} + + + {da1aef32-96b1-4d78-85cf-1c8d72cf6baf} + + + {e6e63fe8-4ed8-493e-8e0b-dcbff019ec91} + + + {cd6f5183-2c61-4be2-b3bc-8cc31757eb3f} + + + {fc199e0b-da39-4e04-8ba3-826ee72319c9} + + + {93551a02-d1b5-426d-b61c-0f277d0bfe2a} + + + {c1551d52-b11f-4ded-9339-b714943c52fd} + + + {e6eada70-700c-4417-9a33-dff99a290372} + + + {3679ad2c-3f85-495e-aefe-34ca6e8135b6} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\PNG\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\zlib\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + 3rd Party\HARU\Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + 3rd Party\PNG\Header Files + + + 3rd Party\PNG\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\zlib\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + + 3rd Party\HARU\Header Files + + \ No newline at end of file diff --git a/PDF/PDF_x64_vs90.sln b/PDF/PDF_x64_vs90.sln index 24090f4dc..bade21bef 100644 --- a/PDF/PDF_x64_vs90.sln +++ b/PDF/PDF_x64_vs90.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_x64_vs90.vcproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" - ProjectSection(ProjectDependencies) = postProject - {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Build.0 = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.ActiveCfg = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Build.0 = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Deploy.0 = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Build.0 = release_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 - {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDF", "PDF_x64_vs90.vcproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{24134877-368D-11DB-9FBC-00123FC423B5}" + ProjectSection(ProjectDependencies) = postProject + {E12E5C71-79A4-495A-848F-F1710111E610} = {E12E5C71-79A4-495A-848F-F1710111E610} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Build.0 = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.ActiveCfg = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Build.0 = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Deploy.0 = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Build.0 = release_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 + {24134877-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/PDF_x64_vs90.vcproj b/PDF/PDF_x64_vs90.vcproj index a304db953..0e8415423 100644 --- a/PDF/PDF_x64_vs90.vcproj +++ b/PDF/PDF_x64_vs90.vcproj @@ -1,704 +1,704 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/samples/Image/Image_vs100.vcxproj b/PDF/samples/Image/Image_vs100.vcxproj index 41c5b505b..8167a3a38 100644 --- a/PDF/samples/Image/Image_vs100.vcxproj +++ b/PDF/samples/Image/Image_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Image - {DA74060D-73AF-3E8F-A804-FBC960DAC393} - Image - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Imaged - Imaged - Imaged - Image - Image - Image - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Imaged.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Imaged.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Image.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Imaged.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Imaged.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Image.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Imaged.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Imaged.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Image.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Image + {DA74060D-73AF-3E8F-A804-FBC960DAC393} + Image + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Imaged + Imaged + Imaged + Image + Image + Image + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Imaged.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Imaged.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Image.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Imaged.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Imaged.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Image.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Imaged.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Imaged.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Image.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + \ No newline at end of file diff --git a/PDF/samples/Image/Image_vs100.vcxproj.filters b/PDF/samples/Image/Image_vs100.vcxproj.filters index c8ec8db26..f8b1a85a9 100644 --- a/PDF/samples/Image/Image_vs100.vcxproj.filters +++ b/PDF/samples/Image/Image_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {c27ac1cc-89e1-4cc4-a48a-2fc71cec31e4} - - - {a4b345a2-2632-418e-bf96-58777e3aadee} - - - - - Source Files - - + + + + + {c27ac1cc-89e1-4cc4-a48a-2fc71cec31e4} + + + {a4b345a2-2632-418e-bf96-58777e3aadee} + + + + + Source Files + + \ No newline at end of file diff --git a/PDF/samples/Image/Image_vs110.vcxproj b/PDF/samples/Image/Image_vs110.vcxproj index 8d44eb300..12359b2de 100644 --- a/PDF/samples/Image/Image_vs110.vcxproj +++ b/PDF/samples/Image/Image_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Image - {DA74060D-73AF-3E8F-A804-FBC960DAC393} - Image - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Imaged - Imaged - Imaged - Image - Image - Image - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Imaged.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Imaged.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Image.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Imaged.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Imaged.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Image.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Imaged.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Imaged.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Image.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Image + {DA74060D-73AF-3E8F-A804-FBC960DAC393} + Image + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Imaged + Imaged + Imaged + Image + Image + Image + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Imaged.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Imaged.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Image.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Imaged.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Imaged.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Image.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Imaged.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Imaged.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Image.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/PDF/samples/Image/Image_vs110.vcxproj.filters b/PDF/samples/Image/Image_vs110.vcxproj.filters index b1ed4d4a3..fbb443ee1 100644 --- a/PDF/samples/Image/Image_vs110.vcxproj.filters +++ b/PDF/samples/Image/Image_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {5d1177cf-b38a-427f-8629-b616a697f272} - - - {fca6d858-3c2c-494b-bcdb-666d83d5bd4c} - - - - - Source Files - - + + + + + {5d1177cf-b38a-427f-8629-b616a697f272} + + + {fca6d858-3c2c-494b-bcdb-666d83d5bd4c} + + + + + Source Files + + \ No newline at end of file diff --git a/PDF/samples/Image/Image_vs71.vcproj b/PDF/samples/Image/Image_vs71.vcproj index 80cbffd47..df0f95faf 100644 --- a/PDF/samples/Image/Image_vs71.vcproj +++ b/PDF/samples/Image/Image_vs71.vcproj @@ -1,395 +1,395 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/samples/Image/Image_vs90.vcproj b/PDF/samples/Image/Image_vs90.vcproj index 53a9eeff9..2935bd4aa 100644 --- a/PDF/samples/Image/Image_vs90.vcproj +++ b/PDF/samples/Image/Image_vs90.vcproj @@ -1,554 +1,554 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/samples/Image/Image_x64_vs100.vcxproj b/PDF/samples/Image/Image_x64_vs100.vcxproj index ac8ead01a..009de058f 100644 --- a/PDF/samples/Image/Image_x64_vs100.vcxproj +++ b/PDF/samples/Image/Image_x64_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Image - {DA74060D-73AF-3E8F-A804-FBC960DAC393} - Image - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Imaged - Imaged - Imaged - Image - Image - Image - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Imaged.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Imaged.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Image.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Imaged.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Imaged.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Image.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Imaged.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Imaged.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Image.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Image + {DA74060D-73AF-3E8F-A804-FBC960DAC393} + Image + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Imaged + Imaged + Imaged + Image + Image + Image + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Imaged.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Imaged.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Image.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Imaged.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Imaged.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Image.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Imaged.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Imaged.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Image.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/PDF/samples/Image/Image_x64_vs100.vcxproj.filters b/PDF/samples/Image/Image_x64_vs100.vcxproj.filters index 92d9e5253..6a4d1ec66 100644 --- a/PDF/samples/Image/Image_x64_vs100.vcxproj.filters +++ b/PDF/samples/Image/Image_x64_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {54a679d0-325f-4873-91fb-74a0ad57632b} - - - {4d586625-5e68-4351-83f5-4331aeeff25f} - - - - - Source Files - - + + + + + {54a679d0-325f-4873-91fb-74a0ad57632b} + + + {4d586625-5e68-4351-83f5-4331aeeff25f} + + + + + Source Files + + \ No newline at end of file diff --git a/PDF/samples/Image/Image_x64_vs110.vcxproj b/PDF/samples/Image/Image_x64_vs110.vcxproj index 6335d84d5..921f37e96 100644 --- a/PDF/samples/Image/Image_x64_vs110.vcxproj +++ b/PDF/samples/Image/Image_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Image - {DA74060D-73AF-3E8F-A804-FBC960DAC393} - Image - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Imaged - Imaged - Imaged - Image - Image - Image - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Imaged.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Imaged.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Image.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Imaged.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Imaged.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Image.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Imaged.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Imaged.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Image.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Image + {DA74060D-73AF-3E8F-A804-FBC960DAC393} + Image + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Imaged + Imaged + Imaged + Image + Image + Image + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Imaged.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Imaged.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Image.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Imaged.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Imaged.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Image.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Imaged.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Imaged.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Image.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/PDF/samples/Image/Image_x64_vs110.vcxproj.filters b/PDF/samples/Image/Image_x64_vs110.vcxproj.filters index 4bb31af3a..9e61fe19b 100644 --- a/PDF/samples/Image/Image_x64_vs110.vcxproj.filters +++ b/PDF/samples/Image/Image_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {2d50ffa6-8611-423f-bc3d-e022540f7fa7} - - - {302a396f-cf09-4dab-96e3-b43a2f57f04a} - - - - - Source Files - - + + + + + {2d50ffa6-8611-423f-bc3d-e022540f7fa7} + + + {302a396f-cf09-4dab-96e3-b43a2f57f04a} + + + + + Source Files + + \ No newline at end of file diff --git a/PDF/samples/Image/Image_x64_vs90.vcproj b/PDF/samples/Image/Image_x64_vs90.vcproj index 3e3a8be1b..7f047183f 100644 --- a/PDF/samples/Image/Image_x64_vs90.vcproj +++ b/PDF/samples/Image/Image_x64_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/samples/Text/Text_vs100.vcxproj b/PDF/samples/Text/Text_vs100.vcxproj index 3a4506cc8..3f55d0915 100644 --- a/PDF/samples/Text/Text_vs100.vcxproj +++ b/PDF/samples/Text/Text_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Text - {0DE18C25-1694-3598-831D-4FA48D113606} - Text - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Textd - Textd - Textd - Text - Text - Text - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Textd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Textd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Text.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Textd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Textd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Text.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Textd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Textd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Text.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Text + {0DE18C25-1694-3598-831D-4FA48D113606} + Text + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Textd + Textd + Textd + Text + Text + Text + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Textd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Textd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Text.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Textd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Textd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Text.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Textd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Textd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Text.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + \ No newline at end of file diff --git a/PDF/samples/Text/Text_vs100.vcxproj.filters b/PDF/samples/Text/Text_vs100.vcxproj.filters index a3f832937..4c2866ac8 100644 --- a/PDF/samples/Text/Text_vs100.vcxproj.filters +++ b/PDF/samples/Text/Text_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {714a0aba-a8b7-4ae1-ad96-e514c7974ad2} - - - {aca0ad17-d71f-4520-85d3-10ed233ccc43} - - - - - Source Files - - + + + + + {714a0aba-a8b7-4ae1-ad96-e514c7974ad2} + + + {aca0ad17-d71f-4520-85d3-10ed233ccc43} + + + + + Source Files + + \ No newline at end of file diff --git a/PDF/samples/Text/Text_vs110.vcxproj b/PDF/samples/Text/Text_vs110.vcxproj index ab3d3afe3..9369662cb 100644 --- a/PDF/samples/Text/Text_vs110.vcxproj +++ b/PDF/samples/Text/Text_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Text - {0DE18C25-1694-3598-831D-4FA48D113606} - Text - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Textd - Textd - Textd - Text - Text - Text - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Textd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Textd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Text.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Textd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Textd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Text.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Textd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Textd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Text.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Text + {0DE18C25-1694-3598-831D-4FA48D113606} + Text + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Textd + Textd + Textd + Text + Text + Text + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Textd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Textd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Text.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Textd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Textd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Text.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Textd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Textd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Text.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/PDF/samples/Text/Text_vs110.vcxproj.filters b/PDF/samples/Text/Text_vs110.vcxproj.filters index 19f97c491..58505cc51 100644 --- a/PDF/samples/Text/Text_vs110.vcxproj.filters +++ b/PDF/samples/Text/Text_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {9dea2c6a-ea03-4b1e-b50e-02f0183f66c1} - - - {3cfc8ff4-1ad3-4e05-b447-881d70eb8769} - - - - - Source Files - - + + + + + {9dea2c6a-ea03-4b1e-b50e-02f0183f66c1} + + + {3cfc8ff4-1ad3-4e05-b447-881d70eb8769} + + + + + Source Files + + \ No newline at end of file diff --git a/PDF/samples/Text/Text_vs71.vcproj b/PDF/samples/Text/Text_vs71.vcproj index e7901eb64..841affe7e 100644 --- a/PDF/samples/Text/Text_vs71.vcproj +++ b/PDF/samples/Text/Text_vs71.vcproj @@ -1,395 +1,395 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/samples/Text/Text_vs90.vcproj b/PDF/samples/Text/Text_vs90.vcproj index 79850b77c..a7cdb2dcc 100644 --- a/PDF/samples/Text/Text_vs90.vcproj +++ b/PDF/samples/Text/Text_vs90.vcproj @@ -1,554 +1,554 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/samples/Text/Text_x64_vs100.vcxproj b/PDF/samples/Text/Text_x64_vs100.vcxproj index 84df11456..337470384 100644 --- a/PDF/samples/Text/Text_x64_vs100.vcxproj +++ b/PDF/samples/Text/Text_x64_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Text - {0DE18C25-1694-3598-831D-4FA48D113606} - Text - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Textd - Textd - Textd - Text - Text - Text - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Textd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Textd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Text.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Textd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Textd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Text.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Textd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Textd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Text.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Text + {0DE18C25-1694-3598-831D-4FA48D113606} + Text + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Textd + Textd + Textd + Text + Text + Text + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Textd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Textd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Text.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Textd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Textd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Text.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Textd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Textd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Text.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/PDF/samples/Text/Text_x64_vs100.vcxproj.filters b/PDF/samples/Text/Text_x64_vs100.vcxproj.filters index 7f46463ef..6d188dc00 100644 --- a/PDF/samples/Text/Text_x64_vs100.vcxproj.filters +++ b/PDF/samples/Text/Text_x64_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {cd55f5b8-b266-4595-af56-e412b0f68233} - - - {9ccab622-66c8-4a54-8aff-2c92551d1ebc} - - - - - Source Files - - + + + + + {cd55f5b8-b266-4595-af56-e412b0f68233} + + + {9ccab622-66c8-4a54-8aff-2c92551d1ebc} + + + + + Source Files + + \ No newline at end of file diff --git a/PDF/samples/Text/Text_x64_vs110.vcxproj b/PDF/samples/Text/Text_x64_vs110.vcxproj index 5cf0f4dfa..ed0d3d568 100644 --- a/PDF/samples/Text/Text_x64_vs110.vcxproj +++ b/PDF/samples/Text/Text_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Text - {0DE18C25-1694-3598-831D-4FA48D113606} - Text - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Textd - Textd - Textd - Text - Text - Text - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Textd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Textd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Text.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Textd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Textd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Text.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Textd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Textd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Text.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Text + {0DE18C25-1694-3598-831D-4FA48D113606} + Text + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Textd + Textd + Textd + Text + Text + Text + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Textd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Textd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Text.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Textd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Textd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Text.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Textd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Textd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Text.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/PDF/samples/Text/Text_x64_vs110.vcxproj.filters b/PDF/samples/Text/Text_x64_vs110.vcxproj.filters index 794528161..6ce538b88 100644 --- a/PDF/samples/Text/Text_x64_vs110.vcxproj.filters +++ b/PDF/samples/Text/Text_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {e8d1ae7b-5e41-4f5e-8a77-2efa361c856a} - - - {96d12496-bf30-4119-aee1-6c9c0051282e} - - - - - Source Files - - + + + + + {e8d1ae7b-5e41-4f5e-8a77-2efa361c856a} + + + {96d12496-bf30-4119-aee1-6c9c0051282e} + + + + + Source Files + + \ No newline at end of file diff --git a/PDF/samples/Text/Text_x64_vs90.vcproj b/PDF/samples/Text/Text_x64_vs90.vcproj index 7ff83ed7f..a5bd13f6a 100644 --- a/PDF/samples/Text/Text_x64_vs90.vcproj +++ b/PDF/samples/Text/Text_x64_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/samples/samples_vs100.sln b/PDF/samples/samples_vs100.sln index ac6301423..aceecf655 100644 --- a/PDF/samples/samples_vs100.sln +++ b/PDF/samples/samples_vs100.sln @@ -1,57 +1,57 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_vs100.vcxproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_vs100.vcxproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Build.0 = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Build.0 = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_vs100.vcxproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_vs100.vcxproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Build.0 = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Build.0 = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/samples/samples_vs110.sln b/PDF/samples/samples_vs110.sln index 0a745cc70..8a52010cd 100644 --- a/PDF/samples/samples_vs110.sln +++ b/PDF/samples/samples_vs110.sln @@ -1,57 +1,57 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_vs110.vcxproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_vs110.vcxproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Build.0 = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Build.0 = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_vs110.vcxproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_vs110.vcxproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Build.0 = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Build.0 = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/samples/samples_vs71.sln b/PDF/samples/samples_vs71.sln index 0fbe44b79..c052b1237 100644 --- a/PDF/samples/samples_vs71.sln +++ b/PDF/samples/samples_vs71.sln @@ -1,49 +1,49 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_vs71.vcproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_vs71.vcproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - debug_shared = debug_shared - release_shared = release_shared - debug_static_mt = debug_static_mt - release_static_mt = release_static_mt - debug_static_md = debug_static_md - release_static_md = release_static_md - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared.ActiveCfg = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared.Build.0 = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared.ActiveCfg = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared.Build.0 = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt.Build.0 = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt.ActiveCfg = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt.Build.0 = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md.ActiveCfg = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md.Build.0 = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md.ActiveCfg = release_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md.Build.0 = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared.ActiveCfg = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared.Build.0 = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared.ActiveCfg = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared.Build.0 = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt.Build.0 = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt.ActiveCfg = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt.Build.0 = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md.ActiveCfg = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md.Build.0 = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md.ActiveCfg = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md.Build.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_vs71.vcproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_vs71.vcproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + debug_shared = debug_shared + release_shared = release_shared + debug_static_mt = debug_static_mt + release_static_mt = release_static_mt + debug_static_md = debug_static_md + release_static_md = release_static_md + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared.ActiveCfg = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared.Build.0 = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared.ActiveCfg = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared.Build.0 = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt.Build.0 = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt.ActiveCfg = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt.Build.0 = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md.ActiveCfg = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md.Build.0 = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md.ActiveCfg = release_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md.Build.0 = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared.ActiveCfg = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared.Build.0 = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared.ActiveCfg = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared.Build.0 = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt.Build.0 = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt.ActiveCfg = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt.Build.0 = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md.ActiveCfg = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md.Build.0 = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md.ActiveCfg = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md.Build.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/PDF/samples/samples_vs90.sln b/PDF/samples/samples_vs90.sln index 54fdec492..81f0e7d9f 100644 --- a/PDF/samples/samples_vs90.sln +++ b/PDF/samples/samples_vs90.sln @@ -1,57 +1,57 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_vs90.vcproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_vs90.vcproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Build.0 = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Build.0 = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_vs90.vcproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_vs90.vcproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Build.0 = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Build.0 = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/samples/samples_x64_vs100.sln b/PDF/samples/samples_x64_vs100.sln index fde098da0..d8f97676b 100644 --- a/PDF/samples/samples_x64_vs100.sln +++ b/PDF/samples/samples_x64_vs100.sln @@ -1,57 +1,57 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_x64_vs100.vcxproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_x64_vs100.vcxproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Build.0 = debug_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.ActiveCfg = release_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Build.0 = release_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Deploy.0 = release_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Build.0 = release_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Build.0 = debug_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.ActiveCfg = release_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Build.0 = release_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Deploy.0 = release_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Build.0 = release_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_x64_vs100.vcxproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_x64_vs100.vcxproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Build.0 = debug_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.ActiveCfg = release_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Build.0 = release_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Deploy.0 = release_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Build.0 = release_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Build.0 = debug_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.ActiveCfg = release_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Build.0 = release_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Deploy.0 = release_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Build.0 = release_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/samples/samples_x64_vs110.sln b/PDF/samples/samples_x64_vs110.sln index d1a00b7ab..d04f817be 100644 --- a/PDF/samples/samples_x64_vs110.sln +++ b/PDF/samples/samples_x64_vs110.sln @@ -1,57 +1,57 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_x64_vs110.vcxproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_x64_vs110.vcxproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Build.0 = debug_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.ActiveCfg = release_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Build.0 = release_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Deploy.0 = release_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Build.0 = release_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Build.0 = debug_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.ActiveCfg = release_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Build.0 = release_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Deploy.0 = release_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Build.0 = release_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_x64_vs110.vcxproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_x64_vs110.vcxproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Build.0 = debug_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.ActiveCfg = release_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Build.0 = release_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Deploy.0 = release_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Build.0 = release_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Build.0 = debug_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.ActiveCfg = release_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Build.0 = release_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Deploy.0 = release_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Build.0 = release_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/samples/samples_x64_vs90.sln b/PDF/samples/samples_x64_vs90.sln index 8f02deb3a..df9799df1 100644 --- a/PDF/samples/samples_x64_vs90.sln +++ b/PDF/samples/samples_x64_vs90.sln @@ -1,57 +1,57 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_x64_vs90.vcproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_x64_vs90.vcproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Build.0 = debug_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.ActiveCfg = release_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Build.0 = release_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Deploy.0 = release_shared|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Build.0 = release_static_md|x64 - {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Build.0 = debug_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.ActiveCfg = release_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Build.0 = release_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Deploy.0 = release_shared|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Build.0 = release_static_md|x64 - {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Image", "Image\Image_x64_vs90.vcproj", "{DA74060D-73AF-3E8F-A804-FBC960DAC393}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Text", "Text\Text_x64_vs90.vcproj", "{0DE18C25-1694-3598-831D-4FA48D113606}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Build.0 = debug_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.ActiveCfg = release_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Build.0 = release_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_shared|x64.Deploy.0 = release_shared|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Build.0 = release_static_md|x64 + {DA74060D-73AF-3E8F-A804-FBC960DAC393}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Build.0 = debug_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.ActiveCfg = release_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Build.0 = release_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_shared|x64.Deploy.0 = release_shared|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Build.0 = release_static_md|x64 + {0DE18C25-1694-3598-831D-4FA48D113606}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PDF/testsuite/TestSuite_vs100.vcxproj b/PDF/testsuite/TestSuite_vs100.vcxproj index 2a60fb823..8d6b9ff7e 100644 --- a/PDF/testsuite/TestSuite_vs100.vcxproj +++ b/PDF/testsuite/TestSuite_vs100.vcxproj @@ -1,313 +1,313 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {24134877-368D-11DB-9FBC-00123FC423B5} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - Application - Static - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {24134877-368D-11DB-9FBC-00123FC423B5} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Static + MultiByte + + + Application + Static + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + diff --git a/PDF/testsuite/TestSuite_vs100.vcxproj.filters b/PDF/testsuite/TestSuite_vs100.vcxproj.filters index 922431481..baac2f1e8 100644 --- a/PDF/testsuite/TestSuite_vs100.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs100.vcxproj.filters @@ -1,48 +1,48 @@ - - - - - {e3981631-b150-42e5-b72d-24f18dfc15bd} - - - {00367054-c7fe-402c-84a8-4618cd40700b} - - - {1a484f3a-f88b-445b-a9b4-24c7e96c6795} - - - {7aab07df-3e08-41d1-b5a9-0c272e289c2a} - - - {c9260ce8-cdae-4439-82b5-b0a96d0f69aa} - - - {ccf5806e-4b99-4d64-8010-4d105a992d0b} - - - {d9762295-fde1-48cc-9e2c-aec40622c517} - - - {d2557d8b-a6c5-4daf-a21d-dace78294d37} - - - - - PDFCore\Header Files - - - _Suite\Header Files - - - - - PDFCore\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {e3981631-b150-42e5-b72d-24f18dfc15bd} + + + {00367054-c7fe-402c-84a8-4618cd40700b} + + + {1a484f3a-f88b-445b-a9b4-24c7e96c6795} + + + {7aab07df-3e08-41d1-b5a9-0c272e289c2a} + + + {c9260ce8-cdae-4439-82b5-b0a96d0f69aa} + + + {ccf5806e-4b99-4d64-8010-4d105a992d0b} + + + {d9762295-fde1-48cc-9e2c-aec40622c517} + + + {d2557d8b-a6c5-4daf-a21d-dace78294d37} + + + + + PDFCore\Header Files + + + _Suite\Header Files + + + + + PDFCore\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/PDF/testsuite/TestSuite_vs110.vcxproj b/PDF/testsuite/TestSuite_vs110.vcxproj index 59ecdf6fb..084b9f9d9 100644 --- a/PDF/testsuite/TestSuite_vs110.vcxproj +++ b/PDF/testsuite/TestSuite_vs110.vcxproj @@ -1,319 +1,319 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {24134877-368D-11DB-9FBC-00123FC423B5} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {24134877-368D-11DB-9FBC-00123FC423B5} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + diff --git a/PDF/testsuite/TestSuite_vs110.vcxproj.filters b/PDF/testsuite/TestSuite_vs110.vcxproj.filters index 48b4f8072..6660a5a90 100644 --- a/PDF/testsuite/TestSuite_vs110.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,48 +1,48 @@ - - - - - {6225c178-ac72-449b-8b07-ca221cabf46b} - - - {aa758f8a-fc4d-4007-86ca-4ef9bc06d7b7} - - - {cb766ecd-f968-4321-91ee-009e9130d0d2} - - - {5c2685e1-d80f-4b6e-8e80-716545b50a78} - - - {032517f3-322e-47e1-990e-2d7fd25477ff} - - - {62722250-c4f1-4ea0-bed9-eb75664c3f3e} - - - {bb359112-d04b-4e85-ad4a-ccb738b73507} - - - {af0ec106-9c01-4985-8724-9289f33764e5} - - - - - PDFCore\Header Files - - - _Suite\Header Files - - - - - PDFCore\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {6225c178-ac72-449b-8b07-ca221cabf46b} + + + {aa758f8a-fc4d-4007-86ca-4ef9bc06d7b7} + + + {cb766ecd-f968-4321-91ee-009e9130d0d2} + + + {5c2685e1-d80f-4b6e-8e80-716545b50a78} + + + {032517f3-322e-47e1-990e-2d7fd25477ff} + + + {62722250-c4f1-4ea0-bed9-eb75664c3f3e} + + + {bb359112-d04b-4e85-ad4a-ccb738b73507} + + + {af0ec106-9c01-4985-8724-9289f33764e5} + + + + + PDFCore\Header Files + + + _Suite\Header Files + + + + + PDFCore\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/PDF/testsuite/TestSuite_vs71.vcproj b/PDF/testsuite/TestSuite_vs71.vcproj index a60153b71..d987f0ccc 100644 --- a/PDF/testsuite/TestSuite_vs71.vcproj +++ b/PDF/testsuite/TestSuite_vs71.vcproj @@ -1,430 +1,430 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/testsuite/TestSuite_vs90.vcproj b/PDF/testsuite/TestSuite_vs90.vcproj index 5029011eb..58e723807 100644 --- a/PDF/testsuite/TestSuite_vs90.vcproj +++ b/PDF/testsuite/TestSuite_vs90.vcproj @@ -1,470 +1,470 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PDF/testsuite/TestSuite_x64_vs100.vcxproj b/PDF/testsuite/TestSuite_x64_vs100.vcxproj index c57e65bfb..4f000b141 100644 --- a/PDF/testsuite/TestSuite_x64_vs100.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs100.vcxproj @@ -1,313 +1,313 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {24134877-368D-11DB-9FBC-00123FC423B5} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - Application - Static - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Dynamic - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {24134877-368D-11DB-9FBC-00123FC423B5} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Static + MultiByte + + + Application + Static + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + diff --git a/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters index b471969e7..1deaa445e 100644 --- a/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -1,48 +1,48 @@ - - - - - {598e891b-83da-4acd-ab1b-3539b63e1045} - - - {adb92887-0e9d-473e-9695-9f2a28922d14} - - - {fb5c62b9-f8e9-4de3-a1bb-09f2970dee1e} - - - {0707530f-4fae-430e-ad5a-84bb0661632c} - - - {2f4d4a68-9153-408f-afbb-2c12529f5592} - - - {a373eb1a-02fc-4314-ba9b-1400c6e1033a} - - - {3d8caa71-4959-45ff-80bd-dc5dc5e636c5} - - - {1966e5b3-9cd1-40b6-a41d-f2fb04461d43} - - - - - PDFCore\Header Files - - - _Suite\Header Files - - - - - PDFCore\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {598e891b-83da-4acd-ab1b-3539b63e1045} + + + {adb92887-0e9d-473e-9695-9f2a28922d14} + + + {fb5c62b9-f8e9-4de3-a1bb-09f2970dee1e} + + + {0707530f-4fae-430e-ad5a-84bb0661632c} + + + {2f4d4a68-9153-408f-afbb-2c12529f5592} + + + {a373eb1a-02fc-4314-ba9b-1400c6e1033a} + + + {3d8caa71-4959-45ff-80bd-dc5dc5e636c5} + + + {1966e5b3-9cd1-40b6-a41d-f2fb04461d43} + + + + + PDFCore\Header Files + + + _Suite\Header Files + + + + + PDFCore\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/PDF/testsuite/TestSuite_x64_vs110.vcxproj b/PDF/testsuite/TestSuite_x64_vs110.vcxproj index 086b3b1d9..46567ae09 100644 --- a/PDF/testsuite/TestSuite_x64_vs110.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,319 +1,319 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {24134877-368D-11DB-9FBC-00123FC423B5} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {24134877-368D-11DB-9FBC-00123FC423B5} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + diff --git a/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters index 34fe59b2c..8aee34bfe 100644 --- a/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,48 +1,48 @@ - - - - - {03e49ef9-7539-43eb-aac1-2c3c3c78a143} - - - {97e3ef7d-c660-496a-85c5-557176a37d09} - - - {e73ce49b-f2c1-43e5-8063-35e6245f4cbd} - - - {2351566b-243e-47c5-8354-56346cf9d6af} - - - {e4131147-27fc-4206-b7fe-e333e360e584} - - - {4fdc67a8-c9d2-453e-8d99-79f2c5d30c0b} - - - {f72497cf-0203-48e2-9ae5-aec197ed8102} - - - {0989eddd-5c56-437e-b64e-6003ea81d411} - - - - - PDFCore\Header Files - - - _Suite\Header Files - - - - - PDFCore\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {03e49ef9-7539-43eb-aac1-2c3c3c78a143} + + + {97e3ef7d-c660-496a-85c5-557176a37d09} + + + {e73ce49b-f2c1-43e5-8063-35e6245f4cbd} + + + {2351566b-243e-47c5-8354-56346cf9d6af} + + + {e4131147-27fc-4206-b7fe-e333e360e584} + + + {4fdc67a8-c9d2-453e-8d99-79f2c5d30c0b} + + + {f72497cf-0203-48e2-9ae5-aec197ed8102} + + + {0989eddd-5c56-437e-b64e-6003ea81d411} + + + + + PDFCore\Header Files + + + _Suite\Header Files + + + + + PDFCore\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/PDF/testsuite/TestSuite_x64_vs90.vcproj b/PDF/testsuite/TestSuite_x64_vs90.vcproj index 3fc6a6467..5f664fe4f 100644 --- a/PDF/testsuite/TestSuite_x64_vs90.vcproj +++ b/PDF/testsuite/TestSuite_x64_vs90.vcproj @@ -1,470 +1,470 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PageCompiler/File2Page/File2Page_vs110.sln b/PageCompiler/File2Page/File2Page_vs110.sln index 471b19a2b..f304a959e 100644 --- a/PageCompiler/File2Page/File2Page_vs110.sln +++ b/PageCompiler/File2Page/File2Page_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File2Page", "File2Page_vs110.vcxproj", "{8BD05B6C-A179-40F1-BD17-6EA813055883}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|Win32.Build.0 = release_shared|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File2Page", "File2Page_vs110.vcxproj", "{8BD05B6C-A179-40F1-BD17-6EA813055883}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|Win32.Build.0 = release_shared|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PageCompiler/File2Page/File2Page_vs110.vcxproj b/PageCompiler/File2Page/File2Page_vs110.vcxproj index f8af34c4a..6994fc58b 100644 --- a/PageCompiler/File2Page/File2Page_vs110.vcxproj +++ b/PageCompiler/File2Page/File2Page_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - File2Page - {8BD05B6C-A179-40F1-BD17-6EA813055883} - File2Page - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - f2cpspd - f2cpspd - f2cpspd - f2cpsp - f2cpsp - f2cpsp - - - - Disabled - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\f2cpspd.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\f2cpspd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\f2cpsp.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\f2cpspd.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\f2cpspd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\f2cpsp.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\f2cpspd.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\f2cpspd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\f2cpsp.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + File2Page + {8BD05B6C-A179-40F1-BD17-6EA813055883} + File2Page + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + f2cpspd + f2cpspd + f2cpspd + f2cpsp + f2cpsp + f2cpsp + + + + Disabled + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\f2cpspd.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\f2cpspd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\f2cpsp.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\f2cpspd.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\f2cpspd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\f2cpsp.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\f2cpspd.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\f2cpspd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\f2cpsp.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/PageCompiler/File2Page/File2Page_vs110.vcxproj.filters b/PageCompiler/File2Page/File2Page_vs110.vcxproj.filters index ca29228bc..acd48435e 100644 --- a/PageCompiler/File2Page/File2Page_vs110.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {39c32274-e377-43c2-b19c-6c488833e312} - - - {b9b9a794-8d51-4600-b41b-7f3df029eb09} - - - - - Source Files - - + + + + + {39c32274-e377-43c2-b19c-6c488833e312} + + + {b9b9a794-8d51-4600-b41b-7f3df029eb09} + + + + + Source Files + + \ No newline at end of file diff --git a/PageCompiler/File2Page/File2Page_x64_vs110.sln b/PageCompiler/File2Page/File2Page_x64_vs110.sln index 4a058f065..744700e90 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs110.sln +++ b/PageCompiler/File2Page/File2Page_x64_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File2Page", "File2Page_x64_vs110.vcxproj", "{8BD05B6C-A179-40F1-BD17-6EA813055883}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|x64.Build.0 = debug_shared|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|x64.ActiveCfg = release_shared|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|x64.Build.0 = release_shared|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|x64.Deploy.0 = release_shared|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|x64.Build.0 = release_static_md|x64 - {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File2Page", "File2Page_x64_vs110.vcxproj", "{8BD05B6C-A179-40F1-BD17-6EA813055883}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|x64.Build.0 = debug_shared|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|x64.ActiveCfg = release_shared|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|x64.Build.0 = release_shared|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_shared|x64.Deploy.0 = release_shared|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|x64.Build.0 = release_static_md|x64 + {8BD05B6C-A179-40F1-BD17-6EA813055883}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj b/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj index 149d69d64..38a0500df 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj +++ b/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - File2Page - {8BD05B6C-A179-40F1-BD17-6EA813055883} - File2Page - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - f2cpspd - f2cpspd - f2cpspd - f2cpsp - f2cpsp - f2cpsp - - - - Disabled - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\f2cpspd.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\f2cpspd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\f2cpsp.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\f2cpspd.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\f2cpspd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\f2cpsp.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\f2cpspd.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\f2cpspd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\f2cpsp.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + File2Page + {8BD05B6C-A179-40F1-BD17-6EA813055883} + File2Page + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + f2cpspd + f2cpspd + f2cpspd + f2cpsp + f2cpsp + f2cpsp + + + + Disabled + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\f2cpspd.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\f2cpspd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\f2cpsp.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\f2cpspd.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\f2cpspd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\f2cpsp.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\f2cpspd.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\f2cpspd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\f2cpsp.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.filters b/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.filters index e2d04d493..4d8ac5156 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {da9c20c1-0fd6-48f4-a147-bc716a6a0dd5} - - - {88334625-6178-444f-9f53-e6894d8733de} - - - - - Source Files - - + + + + + {da9c20c1-0fd6-48f4-a147-bc716a6a0dd5} + + + {88334625-6178-444f-9f53-e6894d8733de} + + + + + Source Files + + \ No newline at end of file diff --git a/PageCompiler/PageCompiler_vs110.sln b/PageCompiler/PageCompiler_vs110.sln index 5e2584213..0db52c6a6 100644 --- a/PageCompiler/PageCompiler_vs110.sln +++ b/PageCompiler/PageCompiler_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PageCompiler", "PageCompiler_vs110.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Build.0 = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PageCompiler", "PageCompiler_vs110.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Build.0 = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PageCompiler/PageCompiler_vs110.vcxproj b/PageCompiler/PageCompiler_vs110.vcxproj index 5aabab555..7dfa4d8c7 100644 --- a/PageCompiler/PageCompiler_vs110.vcxproj +++ b/PageCompiler/PageCompiler_vs110.vcxproj @@ -1,320 +1,320 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - PageCompiler - {E12E5C71-79A4-495A-848F-F1710111E610} - PageCompiler - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - cpspcd - cpspcd - cpspcd - cpspc - cpspc - cpspc - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\cpspcd.exe - ..\lib;%(AdditionalLibraryDirectories) - true - true - bin\cpspcd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\cpspc.exe - ..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\cpspcd.exe - ..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\cpspcd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\cpspc.exe - ..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\cpspcd.exe - ..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\cpspcd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\cpspc.exe - ..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + PageCompiler + {E12E5C71-79A4-495A-848F-F1710111E610} + PageCompiler + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + cpspcd + cpspcd + cpspcd + cpspc + cpspc + cpspc + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\cpspcd.exe + ..\lib;%(AdditionalLibraryDirectories) + true + true + bin\cpspcd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\cpspc.exe + ..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\cpspcd.exe + ..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\cpspcd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\cpspc.exe + ..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\cpspcd.exe + ..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\cpspcd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\cpspc.exe + ..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PageCompiler/PageCompiler_vs110.vcxproj.filters b/PageCompiler/PageCompiler_vs110.vcxproj.filters index 2686ab1e2..d4c92e4eb 100644 --- a/PageCompiler/PageCompiler_vs110.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs110.vcxproj.filters @@ -1,56 +1,56 @@ - - - - - {135421cd-bca9-4ff3-bca2-41b5e16b6354} - - - {c0b27c6e-46d3-4bba-a3d2-71d0f15c24d9} - - - {af908e50-9d83-4103-a27a-cd60158dffbf} - - - - - Configuration Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + + + + + {135421cd-bca9-4ff3-bca2-41b5e16b6354} + + + {c0b27c6e-46d3-4bba-a3d2-71d0f15c24d9} + + + {af908e50-9d83-4103-a27a-cd60158dffbf} + + + + + Configuration Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/PageCompiler/PageCompiler_x64_vs110.sln b/PageCompiler/PageCompiler_x64_vs110.sln index b888fb5de..3d8474144 100644 --- a/PageCompiler/PageCompiler_x64_vs110.sln +++ b/PageCompiler/PageCompiler_x64_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PageCompiler", "PageCompiler_x64_vs110.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Build.0 = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.ActiveCfg = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Build.0 = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Deploy.0 = release_shared|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Build.0 = release_static_md|x64 - {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PageCompiler", "PageCompiler_x64_vs110.vcxproj", "{E12E5C71-79A4-495A-848F-F1710111E610}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Build.0 = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.ActiveCfg = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Build.0 = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_shared|x64.Deploy.0 = release_shared|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Build.0 = release_static_md|x64 + {E12E5C71-79A4-495A-848F-F1710111E610}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PageCompiler/PageCompiler_x64_vs110.vcxproj b/PageCompiler/PageCompiler_x64_vs110.vcxproj index 80325c4bc..fd6606233 100644 --- a/PageCompiler/PageCompiler_x64_vs110.vcxproj +++ b/PageCompiler/PageCompiler_x64_vs110.vcxproj @@ -1,320 +1,320 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - PageCompiler - {E12E5C71-79A4-495A-848F-F1710111E610} - PageCompiler - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - cpspcd - cpspcd - cpspcd - cpspc - cpspc - cpspc - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\cpspcd.exe - ..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\cpspcd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\cpspc.exe - ..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\cpspcd.exe - ..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\cpspcd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\cpspc.exe - ..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\cpspcd.exe - ..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\cpspcd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\cpspc.exe - ..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + PageCompiler + {E12E5C71-79A4-495A-848F-F1710111E610} + PageCompiler + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + cpspcd + cpspcd + cpspcd + cpspc + cpspc + cpspc + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\cpspcd.exe + ..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\cpspcd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\cpspc.exe + ..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\cpspcd.exe + ..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\cpspcd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\cpspc.exe + ..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\cpspcd.exe + ..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\cpspcd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\cpspc.exe + ..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PageCompiler/PageCompiler_x64_vs110.vcxproj.filters b/PageCompiler/PageCompiler_x64_vs110.vcxproj.filters index cff58fcd9..d6481c525 100644 --- a/PageCompiler/PageCompiler_x64_vs110.vcxproj.filters +++ b/PageCompiler/PageCompiler_x64_vs110.vcxproj.filters @@ -1,56 +1,56 @@ - - - - - {4c3fed14-d99f-4ae6-af8e-78cf9336cfcd} - - - {3c5b219a-584b-46dc-9ca9-1ab27d87de50} - - - {c509e57f-fb29-4759-bc3b-8af0f2d51160} - - - - - Configuration Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + + + + + {4c3fed14-d99f-4ae6-af8e-78cf9336cfcd} + + + {3c5b219a-584b-46dc-9ca9-1ab27d87de50} + + + {c509e57f-fb29-4759-bc3b-8af0f2d51160} + + + + + Configuration Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj index 268a7e248..7704d3527 100644 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj +++ b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj @@ -1,312 +1,312 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - HTTPTimeServer - {18A0143A-444A-38E3-838C-1ACFBE4EE18C} - HTTPTimeServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - HTTPTimeServerd - HTTPTimeServerd - HTTPTimeServerd - HTTPTimeServer - HTTPTimeServer - HTTPTimeServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\HTTPTimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\HTTPTimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\HTTPTimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\HTTPTimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\HTTPTimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\HTTPTimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\HTTPTimeServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\HTTPTimeServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\HTTPTimeServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + HTTPTimeServer + {18A0143A-444A-38E3-838C-1ACFBE4EE18C} + HTTPTimeServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServer + HTTPTimeServer + HTTPTimeServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\HTTPTimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\HTTPTimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\HTTPTimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\HTTPTimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\HTTPTimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\HTTPTimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\HTTPTimeServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\HTTPTimeServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\HTTPTimeServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + + + + diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.filters b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.filters index 93b452d18..2aa4094fa 100644 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.filters +++ b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.filters @@ -1,32 +1,32 @@ - - - - - {773eaebf-7fa6-4e09-bee4-84e7dea76d73} - - - {96ac36ee-5a43-4e14-b017-f7f44cb36fed} - - - {7e4eeef7-f291-4173-a958-c6d074184964} - - - - - Page Files - - - - - Source Files - - - Generated Files - - - - - Generated Files - - + + + + + {773eaebf-7fa6-4e09-bee4-84e7dea76d73} + + + {96ac36ee-5a43-4e14-b017-f7f44cb36fed} + + + {7e4eeef7-f291-4173-a958-c6d074184964} + + + + + Page Files + + + + + Source Files + + + Generated Files + + + + + Generated Files + + \ No newline at end of file diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj index 6bfcabc4d..f41fd5f2d 100644 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj +++ b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj @@ -1,312 +1,312 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - HTTPTimeServer - {18A0143A-444A-38E3-838C-1ACFBE4EE18C} - HTTPTimeServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - HTTPTimeServerd - HTTPTimeServerd - HTTPTimeServerd - HTTPTimeServer - HTTPTimeServer - HTTPTimeServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\HTTPTimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\HTTPTimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\HTTPTimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\HTTPTimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\HTTPTimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\HTTPTimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\HTTPTimeServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\HTTPTimeServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\HTTPTimeServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + HTTPTimeServer + {18A0143A-444A-38E3-838C-1ACFBE4EE18C} + HTTPTimeServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServer + HTTPTimeServer + HTTPTimeServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\HTTPTimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\HTTPTimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\HTTPTimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\HTTPTimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\HTTPTimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\HTTPTimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\HTTPTimeServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\HTTPTimeServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\HTTPTimeServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + + + + + diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.filters b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.filters index f5b82cb44..ead19dbf8 100644 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.filters +++ b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.filters @@ -1,32 +1,32 @@ - - - - - {ea425ee6-4472-434d-802a-71524b905331} - - - {c5e4b7ab-e7ca-40d4-9f0b-11aa7c549cad} - - - {5ccb17f9-7ce4-47b4-81a0-649fd15abbfd} - - - - - Page Files - - - - - Source Files - - - Generated Files - - - - - Generated Files - - + + + + + {ea425ee6-4472-434d-802a-71524b905331} + + + {c5e4b7ab-e7ca-40d4-9f0b-11aa7c549cad} + + + {5ccb17f9-7ce4-47b4-81a0-649fd15abbfd} + + + + + Page Files + + + + + Source Files + + + Generated Files + + + + + Generated Files + + \ No newline at end of file diff --git a/PageCompiler/samples/samples_vs110.sln b/PageCompiler/samples/samples_vs110.sln index 4d852e798..c3ecf845e 100644 --- a/PageCompiler/samples/samples_vs110.sln +++ b/PageCompiler/samples/samples_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPTimeServer", "HTTPTimeServer\HTTPTimeServer_vs110.vcxproj", "{18A0143A-444A-38E3-838C-1ACFBE4EE18C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Build.0 = release_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPTimeServer", "HTTPTimeServer\HTTPTimeServer_vs110.vcxproj", "{18A0143A-444A-38E3-838C-1ACFBE4EE18C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Build.0 = release_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PageCompiler/samples/samples_x64_vs110.sln b/PageCompiler/samples/samples_x64_vs110.sln index 2b1e7a862..234fe0f65 100644 --- a/PageCompiler/samples/samples_x64_vs110.sln +++ b/PageCompiler/samples/samples_x64_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPTimeServer", "HTTPTimeServer\HTTPTimeServer_x64_vs110.vcxproj", "{18A0143A-444A-38E3-838C-1ACFBE4EE18C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.Build.0 = debug_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.ActiveCfg = release_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.Build.0 = release_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.Deploy.0 = release_shared|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.Build.0 = release_static_md|x64 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPTimeServer", "HTTPTimeServer\HTTPTimeServer_x64_vs110.vcxproj", "{18A0143A-444A-38E3-838C-1ACFBE4EE18C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.Build.0 = debug_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.ActiveCfg = release_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.Build.0 = release_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|x64.Deploy.0 = release_shared|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.Build.0 = release_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PocoDoc/PocoDoc_vs110.sln b/PocoDoc/PocoDoc_vs110.sln index e8421fe3e..b52510931 100644 --- a/PocoDoc/PocoDoc_vs110.sln +++ b/PocoDoc/PocoDoc_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PocoDoc", "PocoDoc_vs110.vcxproj", "{18BCF3CC-9474-4D1C-9445-F783A49D886B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|Win32.Build.0 = release_shared|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PocoDoc", "PocoDoc_vs110.vcxproj", "{18BCF3CC-9474-4D1C-9445-F783A49D886B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|Win32.Build.0 = release_shared|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PocoDoc/PocoDoc_vs110.vcxproj b/PocoDoc/PocoDoc_vs110.vcxproj index 8428246bb..e7348f623 100644 --- a/PocoDoc/PocoDoc_vs110.vcxproj +++ b/PocoDoc/PocoDoc_vs110.vcxproj @@ -1,309 +1,309 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - PocoDoc - {18BCF3CC-9474-4D1C-9445-F783A49D886B} - PocoDoc - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - PocoDocd - PocoDocd - PocoDocd - PocoDoc - PocoDoc - PocoDoc - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\PocoDocd.exe - ..\lib;%(AdditionalLibraryDirectories) - true - true - bin\PocoDocd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\PocoDoc.exe - ..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\PocoDocd.exe - ..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\PocoDocd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\PocoDoc.exe - ..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\PocoDocd.exe - ..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\PocoDocd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\PocoDoc.exe - ..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + PocoDoc + {18BCF3CC-9474-4D1C-9445-F783A49D886B} + PocoDoc + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + PocoDocd + PocoDocd + PocoDocd + PocoDoc + PocoDoc + PocoDoc + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\PocoDocd.exe + ..\lib;%(AdditionalLibraryDirectories) + true + true + bin\PocoDocd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\PocoDoc.exe + ..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\PocoDocd.exe + ..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\PocoDocd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\PocoDoc.exe + ..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\PocoDocd.exe + ..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\PocoDocd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\PocoDoc.exe + ..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + diff --git a/PocoDoc/PocoDoc_vs110.vcxproj.filters b/PocoDoc/PocoDoc_vs110.vcxproj.filters index ec90b2f11..75ff278b9 100644 --- a/PocoDoc/PocoDoc_vs110.vcxproj.filters +++ b/PocoDoc/PocoDoc_vs110.vcxproj.filters @@ -1,36 +1,36 @@ - - - - - {771853f0-e680-4f7b-b5ea-ea5d471ce1e3} - - - {8b7445d5-ed16-472a-9066-11ee333bb379} - - - {83109a19-82b5-4f39-bfc4-47914f1c7272} - - - {6596ce33-e8e8-4e9c-971b-9b8d0866d091} - - - {b85175f9-c1a7-4a44-8857-bb26f177c703} - - - {47b18104-e867-4a72-83e2-7442a5ec21b0} - - - - - App\Source Files - - - DocWriter\Source Files - - - - - DocWriter\Header Files - - + + + + + {771853f0-e680-4f7b-b5ea-ea5d471ce1e3} + + + {8b7445d5-ed16-472a-9066-11ee333bb379} + + + {83109a19-82b5-4f39-bfc4-47914f1c7272} + + + {6596ce33-e8e8-4e9c-971b-9b8d0866d091} + + + {b85175f9-c1a7-4a44-8857-bb26f177c703} + + + {47b18104-e867-4a72-83e2-7442a5ec21b0} + + + + + App\Source Files + + + DocWriter\Source Files + + + + + DocWriter\Header Files + + \ No newline at end of file diff --git a/PocoDoc/PocoDoc_x64_vs110.sln b/PocoDoc/PocoDoc_x64_vs110.sln index 5a6985300..2520712c8 100644 --- a/PocoDoc/PocoDoc_x64_vs110.sln +++ b/PocoDoc/PocoDoc_x64_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PocoDoc", "PocoDoc_x64_vs110.vcxproj", "{18BCF3CC-9474-4D1C-9445-F783A49D886B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|x64.Build.0 = debug_shared|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|x64.ActiveCfg = release_shared|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|x64.Build.0 = release_shared|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|x64.Deploy.0 = release_shared|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|x64.Build.0 = release_static_md|x64 - {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PocoDoc", "PocoDoc_x64_vs110.vcxproj", "{18BCF3CC-9474-4D1C-9445-F783A49D886B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|x64.Build.0 = debug_shared|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|x64.ActiveCfg = release_shared|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|x64.Build.0 = release_shared|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_shared|x64.Deploy.0 = release_shared|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|x64.Build.0 = release_static_md|x64 + {18BCF3CC-9474-4D1C-9445-F783A49D886B}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PocoDoc/PocoDoc_x64_vs110.vcxproj b/PocoDoc/PocoDoc_x64_vs110.vcxproj index 99701ec9e..21840201f 100644 --- a/PocoDoc/PocoDoc_x64_vs110.vcxproj +++ b/PocoDoc/PocoDoc_x64_vs110.vcxproj @@ -1,309 +1,309 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - PocoDoc - {18BCF3CC-9474-4D1C-9445-F783A49D886B} - PocoDoc - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - PocoDocd - PocoDocd - PocoDocd - PocoDoc - PocoDoc - PocoDoc - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\PocoDocd.exe - ..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\PocoDocd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\PocoDoc.exe - ..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\PocoDocd.exe - ..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\PocoDocd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\PocoDoc.exe - ..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\PocoDocd.exe - ..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\PocoDocd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\PocoDoc.exe - ..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + PocoDoc + {18BCF3CC-9474-4D1C-9445-F783A49D886B} + PocoDoc + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + PocoDocd + PocoDocd + PocoDocd + PocoDoc + PocoDoc + PocoDoc + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\PocoDocd.exe + ..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\PocoDocd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\PocoDoc.exe + ..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\PocoDocd.exe + ..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\PocoDocd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\PocoDoc.exe + ..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\PocoDocd.exe + ..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\PocoDocd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;..\CppParser\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\PocoDoc.exe + ..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + + diff --git a/PocoDoc/PocoDoc_x64_vs110.vcxproj.filters b/PocoDoc/PocoDoc_x64_vs110.vcxproj.filters index 6d2bcdf4a..21a15ebdb 100644 --- a/PocoDoc/PocoDoc_x64_vs110.vcxproj.filters +++ b/PocoDoc/PocoDoc_x64_vs110.vcxproj.filters @@ -1,36 +1,36 @@ - - - - - {3212334a-241f-47aa-8f98-e7a327066448} - - - {b3d6dc29-3fe1-4f7f-a5fb-4e1612d5a7af} - - - {1ff7bb56-51f6-4ba7-91dd-fb2832f2c725} - - - {d5f6de71-c0fc-4ee2-a6ac-3bd10f795a8f} - - - {de1af46b-c71e-4a73-9779-19c13e36beef} - - - {cf907247-a214-4b39-8b8c-5f484136cc15} - - - - - App\Source Files - - - DocWriter\Source Files - - - - - DocWriter\Header Files - - + + + + + {3212334a-241f-47aa-8f98-e7a327066448} + + + {b3d6dc29-3fe1-4f7f-a5fb-4e1612d5a7af} + + + {1ff7bb56-51f6-4ba7-91dd-fb2832f2c725} + + + {d5f6de71-c0fc-4ee2-a6ac-3bd10f795a8f} + + + {de1af46b-c71e-4a73-9779-19c13e36beef} + + + {cf907247-a214-4b39-8b8c-5f484136cc15} + + + + + App\Source Files + + + DocWriter\Source Files + + + + + DocWriter\Header Files + + \ No newline at end of file diff --git a/ProGen/ProGen_vs110.sln b/ProGen/ProGen_vs110.sln index 061454923..1d328da4a 100644 --- a/ProGen/ProGen_vs110.sln +++ b/ProGen/ProGen_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProGen", "ProGen_vs110.vcxproj", "{48D690D9-6520-4F30-A298-3132548716D0}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|Win32.Build.0 = release_shared|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProGen", "ProGen_vs110.vcxproj", "{48D690D9-6520-4F30-A298-3132548716D0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|Win32.Build.0 = release_shared|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ProGen/ProGen_vs110.vcxproj b/ProGen/ProGen_vs110.vcxproj index 0669c4646..3a2e62774 100644 --- a/ProGen/ProGen_vs110.vcxproj +++ b/ProGen/ProGen_vs110.vcxproj @@ -1,312 +1,312 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - ProGen - {48D690D9-6520-4F30-A298-3132548716D0} - ProGen - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - progend - progend - progend - progen - progen - progen - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\progend.exe - ..\lib;%(AdditionalLibraryDirectories) - true - true - bin\progend.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\progen.exe - ..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\progend.exe - ..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\progend.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\progen.exe - ..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\progend.exe - ..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\progend.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\progen.exe - ..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + ProGen + {48D690D9-6520-4F30-A298-3132548716D0} + ProGen + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + progend + progend + progend + progen + progen + progen + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\progend.exe + ..\lib;%(AdditionalLibraryDirectories) + true + true + bin\progend.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\progen.exe + ..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\progend.exe + ..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\progend.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\progen.exe + ..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\progend.exe + ..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\progend.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\progen.exe + ..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + + + + diff --git a/ProGen/ProGen_vs110.vcxproj.filters b/ProGen/ProGen_vs110.vcxproj.filters index a75dc0e00..eac24c938 100644 --- a/ProGen/ProGen_vs110.vcxproj.filters +++ b/ProGen/ProGen_vs110.vcxproj.filters @@ -1,32 +1,32 @@ - - - - - {f7f62bd0-d5a2-477b-8326-ba6b1b04196e} - - - {c6f2fb7b-8d31-4c49-805a-4dc2583a6df6} - - - {c2fc710b-cd32-4f8b-b1ae-106dba9a4a52} - - - - - Configuration Files - - - - - Source Files - - - Source Files - - - - - Header Files - - + + + + + {f7f62bd0-d5a2-477b-8326-ba6b1b04196e} + + + {c6f2fb7b-8d31-4c49-805a-4dc2583a6df6} + + + {c2fc710b-cd32-4f8b-b1ae-106dba9a4a52} + + + + + Configuration Files + + + + + Source Files + + + Source Files + + + + + Header Files + + \ No newline at end of file diff --git a/ProGen/ProGen_x64_vs110.sln b/ProGen/ProGen_x64_vs110.sln index 44b7a8c04..0df0c5dbe 100644 --- a/ProGen/ProGen_x64_vs110.sln +++ b/ProGen/ProGen_x64_vs110.sln @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProGen", "ProGen_x64_vs110.vcxproj", "{48D690D9-6520-4F30-A298-3132548716D0}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|x64.Build.0 = debug_shared|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|x64.ActiveCfg = release_shared|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|x64.Build.0 = release_shared|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|x64.Deploy.0 = release_shared|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|x64.Build.0 = release_static_md|x64 - {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProGen", "ProGen_x64_vs110.vcxproj", "{48D690D9-6520-4F30-A298-3132548716D0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|x64.Build.0 = debug_shared|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|x64.ActiveCfg = release_shared|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|x64.Build.0 = release_shared|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.release_shared|x64.Deploy.0 = release_shared|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|x64.Build.0 = release_static_md|x64 + {48D690D9-6520-4F30-A298-3132548716D0}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ProGen/ProGen_x64_vs110.vcxproj b/ProGen/ProGen_x64_vs110.vcxproj index 6e1380d49..20cdec254 100644 --- a/ProGen/ProGen_x64_vs110.vcxproj +++ b/ProGen/ProGen_x64_vs110.vcxproj @@ -1,312 +1,312 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - ProGen - {48D690D9-6520-4F30-A298-3132548716D0} - ProGen - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - progend - progend - progend - progen - progen - progen - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\progend.exe - ..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\progend.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\progen.exe - ..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\progend.exe - ..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\progend.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\progen.exe - ..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\progend.exe - ..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\progend.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\progen.exe - ..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + ProGen + {48D690D9-6520-4F30-A298-3132548716D0} + ProGen + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + progend + progend + progend + progen + progen + progen + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\progend.exe + ..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\progend.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\progen.exe + ..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\progend.exe + ..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\progend.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\progen.exe + ..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\progend.exe + ..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\progend.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\progen.exe + ..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + + + + + diff --git a/ProGen/ProGen_x64_vs110.vcxproj.filters b/ProGen/ProGen_x64_vs110.vcxproj.filters index f7f79982f..c4aba860d 100644 --- a/ProGen/ProGen_x64_vs110.vcxproj.filters +++ b/ProGen/ProGen_x64_vs110.vcxproj.filters @@ -1,32 +1,32 @@ - - - - - {f3f03781-81b7-4c0f-be83-f2f8a475d7b3} - - - {0c813b4e-1010-4f79-ac2d-c902b838d4eb} - - - {a9e3c43d-ef42-419e-ae16-77a148842726} - - - - - Configuration Files - - - - - Source Files - - - Source Files - - - - - Header Files - - + + + + + {f3f03781-81b7-4c0f-be83-f2f8a475d7b3} + + + {0c813b4e-1010-4f79-ac2d-c902b838d4eb} + + + {a9e3c43d-ef42-419e-ae16-77a148842726} + + + + + Configuration Files + + + + + Source Files + + + Source Files + + + + + Header Files + + \ No newline at end of file diff --git a/Util/Util_vs110.sln b/Util/Util_vs110.sln index 2adf6990f..968eab23d 100644 --- a/Util/Util_vs110.sln +++ b/Util/Util_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Util_vs110.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{E40E738C-447B-40F4-A878-EBA9A2459270}" - ProjectSection(ProjectDependencies) = postProject - {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|Win32.Build.0 = release_shared|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|Win32.Build.0 = release_shared|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Util_vs110.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{E40E738C-447B-40F4-A878-EBA9A2459270}" + ProjectSection(ProjectDependencies) = postProject + {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|Win32.Build.0 = release_shared|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|Win32.Build.0 = release_shared|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Util/Util_vs110.vcxproj b/Util/Util_vs110.vcxproj index c41cd8aab..1aef83fd6 100644 --- a/Util/Util_vs110.vcxproj +++ b/Util/Util_vs110.vcxproj @@ -1,353 +1,353 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Util - {6FF56CDB-787A-4714-A28C-919003F9FA6C} - Util - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoUtild - PocoUtilmdd - PocoUtilmtd - PocoUtil - PocoUtilmd - PocoUtilmt - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoUtild.dll - true - true - ..\bin\PocoUtild.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoUtild.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoUtil.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoUtil.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoUtilmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoUtilmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoUtilmt.lib - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoUtilmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoUtilmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoUtilmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\lib\PocoUtilmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Util + {6FF56CDB-787A-4714-A28C-919003F9FA6C} + Util + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoUtild + PocoUtilmdd + PocoUtilmtd + PocoUtil + PocoUtilmd + PocoUtilmt + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoUtild.dll + true + true + ..\bin\PocoUtild.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoUtild.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoUtil.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoUtil.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoUtilmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoUtilmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoUtilmt.lib + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoUtilmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoUtilmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoUtilmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\lib\PocoUtilmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + diff --git a/Util/Util_vs110.vcxproj.filters b/Util/Util_vs110.vcxproj.filters index 0dd2d9384..538d146e9 100644 --- a/Util/Util_vs110.vcxproj.filters +++ b/Util/Util_vs110.vcxproj.filters @@ -1,252 +1,252 @@ - - - - - {89e9ce11-ef4e-4522-b64c-3fc09d60b20d} - - - {156806be-c474-4d64-bec4-ffeadcd98d13} - - - {844b2a7e-f5e6-405c-aad9-f03733101921} - - - {d62f79bc-ccea-4daa-933a-0c7ff378741a} - - - {483d1cf7-75ae-42a9-9419-952aff09a273} - - - {0da3117d-a768-4645-bfa2-b31da6f82d2e} - - - {2256319c-ab94-4c9d-a4c7-04cfdd69d43e} - - - {1c655d58-0b99-44ed-b438-c1b4e0d0b5a4} - - - {178ae833-3e0e-425d-a0a7-f9dc380c8e53} - - - {3b4f671f-700e-4494-950d-e44a8c872e8f} - - - {919595ec-6642-4f7a-9610-3c0ce28bdfe3} - - - {1760f260-f9ae-4742-b617-63763a97dbc9} - - - {88d98533-a6be-4f87-8710-25a7e4c33184} - - - {95d0f5af-b5f6-4c87-817c-d0548dcc0151} - - - {01883964-e333-425d-a58b-92c61fdb06f4} - - - {2dcd1e34-74e6-4124-aff0-442071980135} - - - {5beeca2c-1644-4d10-ad2f-3c0ce80ec492} - - - {25a264ac-c7e8-4f40-81e6-8e54815231ca} - - - - - Application\Header Files - - - Application\Header Files - - - Application\Header Files - - - Application\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Windows\Header Files - - - Windows\Header Files - - - Windows\Header Files - - - Util\Header Files - - - Timer\Header Files - - - Timer\Header Files - - - Timer\Header Files - - - - - Application\Source Files - - - Application\Source Files - - - Application\Source Files - - - Application\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Windows\Source Files - - - Windows\Source Files - - - Windows\Source Files - - - Timer\Source Files - - - Timer\Source Files - - - - - + + + + + {89e9ce11-ef4e-4522-b64c-3fc09d60b20d} + + + {156806be-c474-4d64-bec4-ffeadcd98d13} + + + {844b2a7e-f5e6-405c-aad9-f03733101921} + + + {d62f79bc-ccea-4daa-933a-0c7ff378741a} + + + {483d1cf7-75ae-42a9-9419-952aff09a273} + + + {0da3117d-a768-4645-bfa2-b31da6f82d2e} + + + {2256319c-ab94-4c9d-a4c7-04cfdd69d43e} + + + {1c655d58-0b99-44ed-b438-c1b4e0d0b5a4} + + + {178ae833-3e0e-425d-a0a7-f9dc380c8e53} + + + {3b4f671f-700e-4494-950d-e44a8c872e8f} + + + {919595ec-6642-4f7a-9610-3c0ce28bdfe3} + + + {1760f260-f9ae-4742-b617-63763a97dbc9} + + + {88d98533-a6be-4f87-8710-25a7e4c33184} + + + {95d0f5af-b5f6-4c87-817c-d0548dcc0151} + + + {01883964-e333-425d-a58b-92c61fdb06f4} + + + {2dcd1e34-74e6-4124-aff0-442071980135} + + + {5beeca2c-1644-4d10-ad2f-3c0ce80ec492} + + + {25a264ac-c7e8-4f40-81e6-8e54815231ca} + + + + + Application\Header Files + + + Application\Header Files + + + Application\Header Files + + + Application\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Windows\Header Files + + + Windows\Header Files + + + Windows\Header Files + + + Util\Header Files + + + Timer\Header Files + + + Timer\Header Files + + + Timer\Header Files + + + + + Application\Source Files + + + Application\Source Files + + + Application\Source Files + + + Application\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Windows\Source Files + + + Windows\Source Files + + + Windows\Source Files + + + Timer\Source Files + + + Timer\Source Files + + + + + \ No newline at end of file diff --git a/Util/Util_x64_vs110.sln b/Util/Util_x64_vs110.sln index 0974303a6..78ab620ec 100644 --- a/Util/Util_x64_vs110.sln +++ b/Util/Util_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Util_x64_vs110.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{E40E738C-447B-40F4-A878-EBA9A2459270}" - ProjectSection(ProjectDependencies) = postProject - {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|x64.Build.0 = debug_shared|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|x64.ActiveCfg = release_shared|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|x64.Build.0 = release_shared|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|x64.Deploy.0 = release_shared|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|x64.Build.0 = release_static_md|x64 - {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|x64.Build.0 = debug_shared|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|x64.ActiveCfg = release_shared|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|x64.Build.0 = release_shared|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|x64.Deploy.0 = release_shared|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|x64.Build.0 = release_static_md|x64 - {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Util_x64_vs110.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{E40E738C-447B-40F4-A878-EBA9A2459270}" + ProjectSection(ProjectDependencies) = postProject + {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|x64.Build.0 = debug_shared|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|x64.ActiveCfg = release_shared|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|x64.Build.0 = release_shared|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_shared|x64.Deploy.0 = release_shared|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|x64.Build.0 = release_static_md|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|x64.Build.0 = debug_shared|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|x64.ActiveCfg = release_shared|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|x64.Build.0 = release_shared|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_shared|x64.Deploy.0 = release_shared|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|x64.Build.0 = release_static_md|x64 + {E40E738C-447B-40F4-A878-EBA9A2459270}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Util/Util_x64_vs110.vcxproj b/Util/Util_x64_vs110.vcxproj index 06c8409e1..96d81c3b5 100644 --- a/Util/Util_x64_vs110.vcxproj +++ b/Util/Util_x64_vs110.vcxproj @@ -1,351 +1,351 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Util - {6FF56CDB-787A-4714-A28C-919003F9FA6C} - Util - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoUtil64d - PocoUtilmdd - PocoUtilmtd - PocoUtil64 - PocoUtilmd - PocoUtilmt - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoUtil64d.dll - true - true - ..\bin64\PocoUtil64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoUtild.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoUtil64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoUtil.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoUtilmtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoUtilmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoUtilmt.lib - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoUtilmdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoUtilmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoUtilmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Util + {6FF56CDB-787A-4714-A28C-919003F9FA6C} + Util + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoUtil64d + PocoUtilmdd + PocoUtilmtd + PocoUtil64 + PocoUtilmd + PocoUtilmt + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoUtil64d.dll + true + true + ..\bin64\PocoUtil64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoUtild.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Util_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoUtil64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoUtil.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoUtilmtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoUtilmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoUtilmt.lib + + + + + Disabled + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoUtilmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoUtilmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoUtilmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + + + diff --git a/Util/Util_x64_vs110.vcxproj.filters b/Util/Util_x64_vs110.vcxproj.filters index 79e2a2247..fb0f22360 100644 --- a/Util/Util_x64_vs110.vcxproj.filters +++ b/Util/Util_x64_vs110.vcxproj.filters @@ -1,252 +1,252 @@ - - - - - {4c938dec-886a-4f6a-9ed5-4ca1657dbb99} - - - {4787091a-0354-479e-a461-506d8a10561a} - - - {b6a1fc30-ca3f-4aa6-ba85-44236719b644} - - - {7c5e16b0-aeed-4edc-a833-e63222608753} - - - {082b5405-76ba-4702-bd37-0ad2a4d7322b} - - - {e1b1df08-f3f9-41d7-a4b9-01c5be32b9f0} - - - {8c5319cc-29c7-4ffd-8d62-8e473eea41da} - - - {a5b7fd99-b18f-421b-ab5d-039165656b0d} - - - {460de766-40ce-4cf7-9c0b-d8ac1310f150} - - - {5095120f-8346-4d3c-bde1-e9f1bee4127d} - - - {9e27a9f0-cad5-465c-a634-63b05d50cc54} - - - {b7cfb77b-6cbe-4550-9069-dfde6945b109} - - - {659bdab4-9562-434f-a0f3-fe23549c8dd1} - - - {4ba7a51a-8b12-4bb5-939d-3b478c7e5568} - - - {7cc4bd54-d915-4f8c-a58e-0b803da6da9e} - - - {d7c1b76f-6913-4f4a-9e3a-dd3e2329f0d8} - - - {f707c2cd-4c56-47b2-8a84-9e8af1b8edef} - - - {e4b18ce1-b54c-43f4-b052-c62055dbe030} - - - - - Application\Header Files - - - Application\Header Files - - - Application\Header Files - - - Application\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Windows\Header Files - - - Windows\Header Files - - - Windows\Header Files - - - Util\Header Files - - - Timer\Header Files - - - Timer\Header Files - - - Timer\Header Files - - - - - Application\Source Files - - - Application\Source Files - - - Application\Source Files - - - Application\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Windows\Source Files - - - Windows\Source Files - - - Windows\Source Files - - - Timer\Source Files - - - Timer\Source Files - - - - - + + + + + {4c938dec-886a-4f6a-9ed5-4ca1657dbb99} + + + {4787091a-0354-479e-a461-506d8a10561a} + + + {b6a1fc30-ca3f-4aa6-ba85-44236719b644} + + + {7c5e16b0-aeed-4edc-a833-e63222608753} + + + {082b5405-76ba-4702-bd37-0ad2a4d7322b} + + + {e1b1df08-f3f9-41d7-a4b9-01c5be32b9f0} + + + {8c5319cc-29c7-4ffd-8d62-8e473eea41da} + + + {a5b7fd99-b18f-421b-ab5d-039165656b0d} + + + {460de766-40ce-4cf7-9c0b-d8ac1310f150} + + + {5095120f-8346-4d3c-bde1-e9f1bee4127d} + + + {9e27a9f0-cad5-465c-a634-63b05d50cc54} + + + {b7cfb77b-6cbe-4550-9069-dfde6945b109} + + + {659bdab4-9562-434f-a0f3-fe23549c8dd1} + + + {4ba7a51a-8b12-4bb5-939d-3b478c7e5568} + + + {7cc4bd54-d915-4f8c-a58e-0b803da6da9e} + + + {d7c1b76f-6913-4f4a-9e3a-dd3e2329f0d8} + + + {f707c2cd-4c56-47b2-8a84-9e8af1b8edef} + + + {e4b18ce1-b54c-43f4-b052-c62055dbe030} + + + + + Application\Header Files + + + Application\Header Files + + + Application\Header Files + + + Application\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Windows\Header Files + + + Windows\Header Files + + + Windows\Header Files + + + Util\Header Files + + + Timer\Header Files + + + Timer\Header Files + + + Timer\Header Files + + + + + Application\Source Files + + + Application\Source Files + + + Application\Source Files + + + Application\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Windows\Source Files + + + Windows\Source Files + + + Windows\Source Files + + + Timer\Source Files + + + Timer\Source Files + + + + + \ No newline at end of file diff --git a/Util/include/Poco/Util/JSONConfiguration.h b/Util/include/Poco/Util/JSONConfiguration.h index 88f7443c7..cdf83272c 100644 --- a/Util/include/Poco/Util/JSONConfiguration.h +++ b/Util/include/Poco/Util/JSONConfiguration.h @@ -1,160 +1,162 @@ -// -// JSONConfiguration.h -// -// $Id$ -// -// Library: Util -// Package: Util -// Module: JSONConfiguration -// -// Definition of the JSONConfiguration class. -// -// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef Util_JSONConfiguration_INCLUDED -#define Util_JSONConfiguration_INCLUDED - - -#include - -#include "Poco/Util/AbstractConfiguration.h" -#include "Poco/JSON/Object.h" - -namespace Poco { -namespace Util { - -class Util_API JSONConfiguration : public AbstractConfiguration - /// This configuration class extracts configuration properties - /// from a JSON object. An XPath-like syntax for property - /// names is supported to allow full access to the JSON object. - /// - /// Given the following JSON object as an example: - /// { - /// "config" : { - /// "prop1" : "value1", - /// "prop2" : 10, - /// "prop3" : [ - /// "element1", - /// "element2" - /// ], - /// "prop4" : { - /// "prop5" : false, - /// "prop6" : null - /// } - /// } - /// } - /// The following property names would be valid and would - /// yield the shown values: - /// - /// config.prop1 --> "value1" - /// config.prop3[1] --> "element2" - /// config.prop4.prop5 --> false -{ -public: - - JSONConfiguration(); - /// Creates an empty configuration - - - JSONConfiguration(const std::string& path); - /// Creates a configuration and loads the JSON structure from the given file - - - JSONConfiguration(std::istream& istr); - /// Creates a configuration and loads the JSON structure from the given stream - - - JSONConfiguration(const JSON::Object::Ptr& object); - /// Creates a configuration from the given JSON object - - - virtual ~JSONConfiguration(); - /// Destructor - - - void load(const std::string& path); - /// Loads the configuration from the given file - - - void load(std::istream& istr); - /// Loads the configuration from the given stream - - - void loadEmpty(const std::string& root); - /// Loads an empty object containing only a root object with the given name. - - - void save(std::ostream& ostr, unsigned int indent = 2) const; - /// Saves the configuration to the given stream - - - virtual void setInt(const std::string& key, int value); - - - virtual void setBool(const std::string& key, bool value); - - - virtual void setDouble(const std::string& key, double value); - - +// +// JSONConfiguration.h +// +// $Id$ +// +// Library: Util +// Package: Util +// Module: JSONConfiguration +// +// Definition of the JSONConfiguration class. +// +// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Util_JSONConfiguration_INCLUDED +#define Util_JSONConfiguration_INCLUDED + + +#include "Poco/Util/AbstractConfiguration.h" +#include "Poco/JSON/Object.h" +#include + + +namespace Poco { +namespace Util { + + +class Util_API JSONConfiguration : public AbstractConfiguration + /// This configuration class extracts configuration properties + /// from a JSON object. An XPath-like syntax for property + /// names is supported to allow full access to the JSON object. + /// + /// Given the following JSON object as an example: + /// { + /// "config" : { + /// "prop1" : "value1", + /// "prop2" : 10, + /// "prop3" : [ + /// "element1", + /// "element2" + /// ], + /// "prop4" : { + /// "prop5" : false, + /// "prop6" : null + /// } + /// } + /// } + /// The following property names would be valid and would + /// yield the shown values: + /// + /// config.prop1 --> "value1" + /// config.prop3[1] --> "element2" + /// config.prop4.prop5 --> false +{ +public: + + JSONConfiguration(); + /// Creates an empty configuration + + + JSONConfiguration(const std::string& path); + /// Creates a configuration and loads the JSON structure from the given file + + + JSONConfiguration(std::istream& istr); + /// Creates a configuration and loads the JSON structure from the given stream + + + JSONConfiguration(const JSON::Object::Ptr& object); + /// Creates a configuration from the given JSON object + + + virtual ~JSONConfiguration(); + /// Destructor + + + void load(const std::string& path); + /// Loads the configuration from the given file + + + void load(std::istream& istr); + /// Loads the configuration from the given stream + + + void loadEmpty(const std::string& root); + /// Loads an empty object containing only a root object with the given name. + + + void save(std::ostream& ostr, unsigned int indent = 2) const; + /// Saves the configuration to the given stream + + + virtual void setInt(const std::string& key, int value); + + + virtual void setBool(const std::string& key, bool value); + + + virtual void setDouble(const std::string& key, double value); + + virtual void setString(const std::string& key, const std::string& value); virtual void removeRaw(const std::string& key); - - -protected: - - bool getRaw(const std::string & key, std::string & value) const; - - - void setRaw(const std::string& key, const std::string& value); - - - void enumerate(const std::string& key, Keys& range) const; - - -private: - - - JSON::Object::Ptr findStart(const std::string& key, std::string& lastPart); - - - void getIndexes(std::string& name, std::vector& indexes); - - - void setValue(const std::string& key, const Poco::DynamicAny& value); - - - JSON::Object::Ptr _object; -}; - -} } // namespace Poco::Util - - -#endif // Util_JSONConfiguration_INCLUDED + + +protected: + + bool getRaw(const std::string & key, std::string & value) const; + + + void setRaw(const std::string& key, const std::string& value); + + + void enumerate(const std::string& key, Keys& range) const; + + +private: + + + JSON::Object::Ptr findStart(const std::string& key, std::string& lastPart); + + + void getIndexes(std::string& name, std::vector& indexes); + + + void setValue(const std::string& key, const Poco::DynamicAny& value); + + + JSON::Object::Ptr _object; +}; + + +} } // namespace Poco::Util + + +#endif // Util_JSONConfiguration_INCLUDED diff --git a/Util/samples/SampleApp/SampleApp_vs110.vcxproj b/Util/samples/SampleApp/SampleApp_vs110.vcxproj index abcbd114d..6cf4c3ec0 100644 --- a/Util/samples/SampleApp/SampleApp_vs110.vcxproj +++ b/Util/samples/SampleApp/SampleApp_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - SampleApp - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0} - SampleApp - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - SampleAppd - SampleAppd - SampleAppd - SampleApp - SampleApp - SampleApp - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\SampleAppd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\SampleAppd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\SampleApp.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\SampleAppd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\SampleAppd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\SampleApp.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\SampleAppd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\SampleAppd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\SampleApp.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + SampleApp + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0} + SampleApp + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + SampleAppd + SampleAppd + SampleAppd + SampleApp + SampleApp + SampleApp + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\SampleAppd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\SampleAppd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\SampleApp.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\SampleAppd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\SampleAppd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\SampleApp.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\SampleAppd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\SampleAppd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\SampleApp.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + diff --git a/Util/samples/SampleApp/SampleApp_vs110.vcxproj.filters b/Util/samples/SampleApp/SampleApp_vs110.vcxproj.filters index c942d83d1..51db6e1c6 100644 --- a/Util/samples/SampleApp/SampleApp_vs110.vcxproj.filters +++ b/Util/samples/SampleApp/SampleApp_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {ecdec709-3043-42ea-bb78-bca18e9ea63d} - - - {10ed0610-6ef2-404b-aab6-de7c25640278} - - - - - Configuration Files - - - - - Source Files - - + + + + + {ecdec709-3043-42ea-bb78-bca18e9ea63d} + + + {10ed0610-6ef2-404b-aab6-de7c25640278} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj b/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj index af03820a3..6841bb324 100644 --- a/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj +++ b/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj @@ -1,308 +1,308 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - SampleApp - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0} - SampleApp - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - SampleAppd - SampleAppd - SampleAppd - SampleApp - SampleApp - SampleApp - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\SampleAppd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\SampleAppd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\SampleApp.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\SampleAppd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\SampleAppd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\SampleApp.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\SampleAppd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\SampleAppd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\SampleApp.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + SampleApp + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0} + SampleApp + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + SampleAppd + SampleAppd + SampleAppd + SampleApp + SampleApp + SampleApp + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\SampleAppd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\SampleAppd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\SampleApp.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\SampleAppd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\SampleAppd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\SampleApp.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\SampleAppd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\SampleAppd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\SampleApp.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + + + + diff --git a/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj.filters b/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj.filters index df49ee714..609415568 100644 --- a/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj.filters +++ b/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {cd36f179-d814-42f6-ad4f-294bf3b24c99} - - - {d0728e18-7819-4ae8-b04a-1c30cd9898f8} - - - - - Configuration Files - - - - - Source Files - - + + + + + {cd36f179-d814-42f6-ad4f-294bf3b24c99} + + + {d0728e18-7819-4ae8-b04a-1c30cd9898f8} + + + + + Configuration Files + + + + + Source Files + + \ No newline at end of file diff --git a/Util/samples/SampleServer/SampleServer_vs110.vcxproj b/Util/samples/SampleServer/SampleServer_vs110.vcxproj index 28c2bff9e..2517e8d4c 100644 --- a/Util/samples/SampleServer/SampleServer_vs110.vcxproj +++ b/Util/samples/SampleServer/SampleServer_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - SampleServer - {F475C5DD-0558-37AF-870B-666DE931B7BA} - SampleServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - SampleServerd - SampleServerd - SampleServerd - SampleServer - SampleServer - SampleServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\SampleServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\SampleServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\SampleServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\SampleServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\SampleServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\SampleServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\SampleServerd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\SampleServerd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\SampleServer.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + SampleServer + {F475C5DD-0558-37AF-870B-666DE931B7BA} + SampleServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + SampleServerd + SampleServerd + SampleServerd + SampleServer + SampleServer + SampleServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\SampleServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\SampleServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\SampleServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\SampleServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\SampleServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\SampleServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\SampleServerd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\SampleServerd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\SampleServer.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Util/samples/SampleServer/SampleServer_vs110.vcxproj.filters b/Util/samples/SampleServer/SampleServer_vs110.vcxproj.filters index c3f17835a..074618935 100644 --- a/Util/samples/SampleServer/SampleServer_vs110.vcxproj.filters +++ b/Util/samples/SampleServer/SampleServer_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {70f6b8c3-f47b-4c8c-ad79-edbe3b79ca6f} - - - {1397ae7c-6030-4c12-a549-073ad79d3e77} - - - - - Source Files - - + + + + + {70f6b8c3-f47b-4c8c-ad79-edbe3b79ca6f} + + + {1397ae7c-6030-4c12-a549-073ad79d3e77} + + + + + Source Files + + \ No newline at end of file diff --git a/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj b/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj index dfb17e7bd..c7bfb7000 100644 --- a/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj +++ b/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - SampleServer - {F475C5DD-0558-37AF-870B-666DE931B7BA} - SampleServer - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - SampleServerd - SampleServerd - SampleServerd - SampleServer - SampleServer - SampleServer - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\SampleServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\SampleServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\SampleServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\SampleServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\SampleServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\SampleServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\SampleServerd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\SampleServerd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\SampleServer.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + SampleServer + {F475C5DD-0558-37AF-870B-666DE931B7BA} + SampleServer + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + SampleServerd + SampleServerd + SampleServerd + SampleServer + SampleServer + SampleServer + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\SampleServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\SampleServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\SampleServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\SampleServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\SampleServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\SampleServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\SampleServerd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\SampleServerd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\SampleServer.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj.filters b/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj.filters index c8aa87431..406350293 100644 --- a/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj.filters +++ b/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {1b0de7da-5b71-4152-8455-eeb91b6c22b3} - - - {c89fd413-c8bd-4c68-86b1-6993b5d0616b} - - - - - Source Files - - + + + + + {1b0de7da-5b71-4152-8455-eeb91b6c22b3} + + + {c89fd413-c8bd-4c68-86b1-6993b5d0616b} + + + + + Source Files + + \ No newline at end of file diff --git a/Util/samples/Units/Units_CE_vs90.vcproj b/Util/samples/Units/Units_CE_vs90.vcproj index 341f7d4cc..866de15b4 100644 --- a/Util/samples/Units/Units_CE_vs90.vcproj +++ b/Util/samples/Units/Units_CE_vs90.vcproj @@ -1,468 +1,468 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Util/samples/Units/Units_vs100.vcxproj b/Util/samples/Units/Units_vs100.vcxproj index 45e302d49..43180f81d 100644 --- a/Util/samples/Units/Units_vs100.vcxproj +++ b/Util/samples/Units/Units_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Units - {A6800637-61D5-39A3-86AA-E180C73D3120} - Units - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Unitsd - Unitsd - Unitsd - Units - Units - Units - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Unitsd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Unitsd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Units.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Unitsd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Unitsd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Units.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Unitsd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Unitsd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Units.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Units + {A6800637-61D5-39A3-86AA-E180C73D3120} + Units + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Unitsd + Unitsd + Unitsd + Units + Units + Units + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Unitsd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Unitsd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Units.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Unitsd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Unitsd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Units.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Unitsd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Unitsd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Units.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Util/samples/Units/Units_vs100.vcxproj.filters b/Util/samples/Units/Units_vs100.vcxproj.filters index 5b525fe33..56052c283 100644 --- a/Util/samples/Units/Units_vs100.vcxproj.filters +++ b/Util/samples/Units/Units_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {84fd7f9b-40f2-4e3f-ad6b-069968997168} - - - {020a442f-c607-43ea-935a-4cba49478ca1} - - - - - Source Files - - + + + + + {84fd7f9b-40f2-4e3f-ad6b-069968997168} + + + {020a442f-c607-43ea-935a-4cba49478ca1} + + + + + Source Files + + \ No newline at end of file diff --git a/Util/samples/Units/Units_vs110.vcxproj b/Util/samples/Units/Units_vs110.vcxproj index b4ad0d22d..f79b7d65b 100644 --- a/Util/samples/Units/Units_vs110.vcxproj +++ b/Util/samples/Units/Units_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Units - {A6800637-61D5-39A3-86AA-E180C73D3120} - Units - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - Unitsd - Unitsd - Unitsd - Units - Units - Units - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Unitsd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\Unitsd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin\Units.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Unitsd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\Unitsd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_mt\Units.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Unitsd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\Unitsd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin\static_md\Units.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Units + {A6800637-61D5-39A3-86AA-E180C73D3120} + Units + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Unitsd + Unitsd + Unitsd + Units + Units + Units + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Unitsd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Unitsd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Units.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Unitsd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Unitsd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Units.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Unitsd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Unitsd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Units.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Util/samples/Units/Units_vs110.vcxproj.filters b/Util/samples/Units/Units_vs110.vcxproj.filters index e26e5bbc6..701ddfaff 100644 --- a/Util/samples/Units/Units_vs110.vcxproj.filters +++ b/Util/samples/Units/Units_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {1dc8518e-4773-4269-93de-4a6383e845ed} - - - {6df3c059-a00e-406e-bdee-9bcf8e961438} - - - - - Source Files - - + + + + + {1dc8518e-4773-4269-93de-4a6383e845ed} + + + {6df3c059-a00e-406e-bdee-9bcf8e961438} + + + + + Source Files + + \ No newline at end of file diff --git a/Util/samples/Units/Units_vs71.vcproj b/Util/samples/Units/Units_vs71.vcproj index a4b1f6b03..ee9c4ff13 100644 --- a/Util/samples/Units/Units_vs71.vcproj +++ b/Util/samples/Units/Units_vs71.vcproj @@ -1,395 +1,395 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Util/samples/Units/Units_vs80.vcproj b/Util/samples/Units/Units_vs80.vcproj index 368f290eb..139c831a4 100644 --- a/Util/samples/Units/Units_vs80.vcproj +++ b/Util/samples/Units/Units_vs80.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Util/samples/Units/Units_vs90.vcproj b/Util/samples/Units/Units_vs90.vcproj index aedbf49de..145a9b14a 100644 --- a/Util/samples/Units/Units_vs90.vcproj +++ b/Util/samples/Units/Units_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Util/samples/Units/Units_x64_vs100.vcxproj b/Util/samples/Units/Units_x64_vs100.vcxproj index d3e373216..839a9b647 100644 --- a/Util/samples/Units/Units_x64_vs100.vcxproj +++ b/Util/samples/Units/Units_x64_vs100.vcxproj @@ -1,299 +1,299 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Units - {A6800637-61D5-39A3-86AA-E180C73D3120} - Units - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Unitsd - Unitsd - Unitsd - Units - Units - Units - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Unitsd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Unitsd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Units.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Unitsd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Unitsd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Units.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Unitsd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Unitsd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Units.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Units + {A6800637-61D5-39A3-86AA-E180C73D3120} + Units + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Unitsd + Unitsd + Unitsd + Units + Units + Units + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Unitsd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Unitsd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Units.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Unitsd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Unitsd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Units.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Unitsd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Unitsd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Units.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Util/samples/Units/Units_x64_vs100.vcxproj.filters b/Util/samples/Units/Units_x64_vs100.vcxproj.filters index c0442210a..e1b4c445a 100644 --- a/Util/samples/Units/Units_x64_vs100.vcxproj.filters +++ b/Util/samples/Units/Units_x64_vs100.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {b40ec4c5-25e8-442d-be92-e0493020723e} - - - {91b7c4f6-8714-44f0-a55b-697714a39da8} - - - - - Source Files - - + + + + + {b40ec4c5-25e8-442d-be92-e0493020723e} + + + {91b7c4f6-8714-44f0-a55b-697714a39da8} + + + + + Source Files + + \ No newline at end of file diff --git a/Util/samples/Units/Units_x64_vs110.vcxproj b/Util/samples/Units/Units_x64_vs110.vcxproj index 7d60f8f4d..d80a8ff48 100644 --- a/Util/samples/Units/Units_x64_vs110.vcxproj +++ b/Util/samples/Units/Units_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Units - {A6800637-61D5-39A3-86AA-E180C73D3120} - Units - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - Unitsd - Unitsd - Unitsd - Units - Units - Units - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Unitsd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\Unitsd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - bin64\Units.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Unitsd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\Unitsd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_mt\Units.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Unitsd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\Unitsd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - bin64\static_md\Units.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Units + {A6800637-61D5-39A3-86AA-E180C73D3120} + Units + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Unitsd + Unitsd + Unitsd + Units + Units + Units + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Unitsd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Unitsd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Units.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Unitsd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Unitsd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Units.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Unitsd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Unitsd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Units.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Util/samples/Units/Units_x64_vs110.vcxproj.filters b/Util/samples/Units/Units_x64_vs110.vcxproj.filters index a14c8d4a0..03bb0236b 100644 --- a/Util/samples/Units/Units_x64_vs110.vcxproj.filters +++ b/Util/samples/Units/Units_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {9bb6cc92-9dab-47a1-b120-72ab7e016ade} - - - {babea64d-123a-48bf-b56a-8eb952f153a4} - - - - - Source Files - - + + + + + {9bb6cc92-9dab-47a1-b120-72ab7e016ade} + + + {babea64d-123a-48bf-b56a-8eb952f153a4} + + + + + Source Files + + \ No newline at end of file diff --git a/Util/samples/Units/Units_x64_vs90.vcproj b/Util/samples/Units/Units_x64_vs90.vcproj index 33bd8f3c2..a3efba918 100644 --- a/Util/samples/Units/Units_x64_vs90.vcproj +++ b/Util/samples/Units/Units_x64_vs90.vcproj @@ -1,435 +1,435 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Util/samples/Units/src/Units.cpp b/Util/samples/Units/src/Units.cpp index 1ffcd9227..b66393c31 100644 --- a/Util/samples/Units/src/Units.cpp +++ b/Util/samples/Units/src/Units.cpp @@ -1,114 +1,117 @@ -// -// Units.cpp -// -// $Id: //poco/svn/Util/samples/Units/src/Units.cpp#1 $ -// -// This sample demonstrates the Units. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Util/Units.h" -#include - -using namespace Poco::Util::Units::Values; -using namespace Poco::Util::Units::Constants; - -using Poco::Util::Units::square; -using Poco::Util::Units::cube; - -namespace Poco { -namespace Util { -namespace Units { -namespace Units { -typedef Compose, Power > SpecificWeight;// [kN/m^3] -} // namespace Units -namespace Values { -typedef Value SpecificWeight; -} } } } // namespace Poco::Util::Units - - -int main() -{ - std::cout << "One mile is " << km(mile(1)) << std::endl; - // Output: One mile is 1.60934 km - - std::cout << "Flow rate is " << m3(mile(1)*inch(80)*foot(9))/s(minute(5)) << std::endl; - // Output: Flow rate is 29.9026 (m)^3.(s)^-1 - - hour h; - //h = cm(3); // Compile-time error: incompatible units - //h = 4; // Compile-time error: 4 of what? - h = day(4); // Ok: h is 96 hours - - m l = cm(42); - std::cout << cm(42) << " == " << l << " == " << milli(l) << std::endl; - std::cout << "Area of circle with radius " << l << - " is " << mm2(square(l) * pi) << std::endl; - - SpecificWeight sw(9.81); // water - - std::cout << "Volume of a water cube with side size " << m(0.1) << - " is " << liter(cube(m(0.1))) << - " and weighs " << N(sw * cube(m(.1))) << std::endl; - - m radius_equator(6378135); - m radius_pole(6356750); - m3 vol((pi * square(radius_equator) * radius_pole) * 4/3); - - std::cout << "Volume of Earth is " << vol - << " (" << yotta(liter(vol)) << ")" << std::endl; - std::cout << "It takes " << minute(AU/c) << " for a Sun beam to reach Earth." << std::endl; - - - std::cout << std::endl << m(1) << " is:" << std::endl; - std::cout << "-------------" << std::endl; - - std::cout << deca(m(1)) << std::endl; - std::cout << hecto(m(1)) << std::endl; - std::cout << kilo(m(1)) << std::endl; - std::cout << mega(m(1)) << std::endl; - std::cout << giga(m(1)) << std::endl; - std::cout << tera(m(1)) << std::endl; - std::cout << peta(m(1)) << std::endl; - std::cout << exa(m(1)) << std::endl; - std::cout << zetta(m(1)) << std::endl; - std::cout << yotta(m(1)) << std::endl; - - std::cout << deci(m(1)) << std::endl; - std::cout << centi(m(1)) << std::endl; - std::cout << milli(m(1)) << std::endl; - std::cout << micro(m(1)) << std::endl; - std::cout << nano(m(1)) << std::endl; - std::cout << pico(m(1)) << std::endl; - std::cout << femto(m(1)) << std::endl; - std::cout << atto(m(1)) << std::endl; - std::cout << zepto(m(1)) << std::endl; - std::cout << yocto(m(1)) << std::endl; - - return 0; -} +// +// Units.cpp +// +// $Id: //poco/svn/Util/samples/Units/src/Units.cpp#1 $ +// +// This sample demonstrates the Units. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Util/Units.h" +#include + + +using namespace Poco::Util::Units::Values; +using namespace Poco::Util::Units::Constants; + + +using Poco::Util::Units::square; +using Poco::Util::Units::cube; + + +namespace Poco { +namespace Util { +namespace Units { +namespace Units { +typedef Compose, Power > SpecificWeight;// [kN/m^3] +} // namespace Units +namespace Values { +typedef Value SpecificWeight; +} } } } // namespace Poco::Util::Units + + +int main() +{ + std::cout << "One mile is " << km(mile(1)) << std::endl; + // Output: One mile is 1.60934 km + + std::cout << "Flow rate is " << m3(mile(1)*inch(80)*foot(9))/s(minute(5)) << std::endl; + // Output: Flow rate is 29.9026 (m)^3.(s)^-1 + + hour h; + //h = cm(3); // Compile-time error: incompatible units + //h = 4; // Compile-time error: 4 of what? + h = day(4); // Ok: h is 96 hours + + m l = cm(42); + std::cout << cm(42) << " == " << l << " == " << milli(l) << std::endl; + std::cout << "Area of circle with radius " << l << + " is " << mm2(square(l) * pi) << std::endl; + + SpecificWeight sw(9.81); // water + + std::cout << "Volume of a water cube with side size " << m(0.1) << + " is " << liter(cube(m(0.1))) << + " and weighs " << N(sw * cube(m(.1))) << std::endl; + + m radius_equator(6378135); + m radius_pole(6356750); + m3 vol((pi * square(radius_equator) * radius_pole) * 4/3); + + std::cout << "Volume of Earth is " << vol + << " (" << yotta(liter(vol)) << ")" << std::endl; + std::cout << "It takes " << minute(AU/c) << " for a Sun beam to reach Earth." << std::endl; + + + std::cout << std::endl << m(1) << " is:" << std::endl; + std::cout << "-------------" << std::endl; + + std::cout << deca(m(1)) << std::endl; + std::cout << hecto(m(1)) << std::endl; + std::cout << kilo(m(1)) << std::endl; + std::cout << mega(m(1)) << std::endl; + std::cout << giga(m(1)) << std::endl; + std::cout << tera(m(1)) << std::endl; + std::cout << peta(m(1)) << std::endl; + std::cout << exa(m(1)) << std::endl; + std::cout << zetta(m(1)) << std::endl; + std::cout << yotta(m(1)) << std::endl; + + std::cout << deci(m(1)) << std::endl; + std::cout << centi(m(1)) << std::endl; + std::cout << milli(m(1)) << std::endl; + std::cout << micro(m(1)) << std::endl; + std::cout << nano(m(1)) << std::endl; + std::cout << pico(m(1)) << std::endl; + std::cout << femto(m(1)) << std::endl; + std::cout << atto(m(1)) << std::endl; + std::cout << zepto(m(1)) << std::endl; + std::cout << yocto(m(1)) << std::endl; + + return 0; +} diff --git a/Util/samples/pkill/pkill_vs110.vcxproj b/Util/samples/pkill/pkill_vs110.vcxproj index 2a0f8f957..00ebe00f5 100644 --- a/Util/samples/pkill/pkill_vs110.vcxproj +++ b/Util/samples/pkill/pkill_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - pkill - {63EDD785-29E1-3073-87EB-3CE788A4A1DE} - pkill - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - pkilld - pkilld - pkilld - pkill - pkill - pkill - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\pkilld.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\pkilld.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\pkill.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\pkilld.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\pkilld.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\pkill.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\pkilld.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\pkilld.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\pkill.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + pkill + {63EDD785-29E1-3073-87EB-3CE788A4A1DE} + pkill + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + pkilld + pkilld + pkilld + pkill + pkill + pkill + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\pkilld.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\pkilld.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\pkill.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\pkilld.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\pkilld.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\pkill.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\pkilld.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\pkilld.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\pkill.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Util/samples/pkill/pkill_vs110.vcxproj.filters b/Util/samples/pkill/pkill_vs110.vcxproj.filters index 721c03b7c..8fdb8b916 100644 --- a/Util/samples/pkill/pkill_vs110.vcxproj.filters +++ b/Util/samples/pkill/pkill_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {0e604fec-1adc-4e73-bbfb-706ef6b11984} - - - - - Source Files - - + + + + + {0e604fec-1adc-4e73-bbfb-706ef6b11984} + + + + + Source Files + + \ No newline at end of file diff --git a/Util/samples/pkill/pkill_x64_vs110.vcxproj b/Util/samples/pkill/pkill_x64_vs110.vcxproj index 18eff9ef1..c3cb04b49 100644 --- a/Util/samples/pkill/pkill_x64_vs110.vcxproj +++ b/Util/samples/pkill/pkill_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - pkill - {63EDD785-29E1-3073-87EB-3CE788A4A1DE} - pkill - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - pkilld - pkilld - pkilld - pkill - pkill - pkill - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\pkilld.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\pkilld.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\pkill.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\pkilld.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\pkilld.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\pkill.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\pkilld.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\pkilld.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\pkill.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + pkill + {63EDD785-29E1-3073-87EB-3CE788A4A1DE} + pkill + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + pkilld + pkilld + pkilld + pkill + pkill + pkill + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\pkilld.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\pkilld.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\pkill.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\pkilld.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\pkilld.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\pkill.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\pkilld.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\pkilld.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\pkill.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Util/samples/pkill/pkill_x64_vs110.vcxproj.filters b/Util/samples/pkill/pkill_x64_vs110.vcxproj.filters index ac9cf11b3..d7a849586 100644 --- a/Util/samples/pkill/pkill_x64_vs110.vcxproj.filters +++ b/Util/samples/pkill/pkill_x64_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {c13f7968-b19f-4e0f-af08-687e0b4810e9} - - - - - Source Files - - + + + + + {c13f7968-b19f-4e0f-af08-687e0b4810e9} + + + + + Source Files + + \ No newline at end of file diff --git a/Util/samples/samples_vs110.sln b/Util/samples/samples_vs110.sln index cc722de07..3a4146e2b 100644 --- a/Util/samples/samples_vs110.sln +++ b/Util/samples/samples_vs110.sln @@ -1,97 +1,97 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pkill", "pkill\pkill_vs110.vcxproj", "{63EDD785-29E1-3073-87EB-3CE788A4A1DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "SampleApp\SampleApp_vs110.vcxproj", "{C3F12C11-469F-3FB6-8C95-8638F78FF7C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServer\SampleServer_vs110.vcxproj", "{F475C5DD-0558-37AF-870B-666DE931B7BA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_vs110.vcxproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|Win32.Build.0 = release_shared|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|Win32.Build.0 = release_shared|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|Win32.Build.0 = release_shared|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.Build.0 = release_shared|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pkill", "pkill\pkill_vs110.vcxproj", "{63EDD785-29E1-3073-87EB-3CE788A4A1DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "SampleApp\SampleApp_vs110.vcxproj", "{C3F12C11-469F-3FB6-8C95-8638F78FF7C0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServer\SampleServer_vs110.vcxproj", "{F475C5DD-0558-37AF-870B-666DE931B7BA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_vs110.vcxproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|Win32.Build.0 = release_shared|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|Win32.Build.0 = release_shared|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|Win32.Build.0 = release_shared|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.Build.0 = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Util/samples/samples_x64_vs110.sln b/Util/samples/samples_x64_vs110.sln index a72372a2d..bad698b26 100644 --- a/Util/samples/samples_x64_vs110.sln +++ b/Util/samples/samples_x64_vs110.sln @@ -1,97 +1,97 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pkill", "pkill\pkill_x64_vs110.vcxproj", "{63EDD785-29E1-3073-87EB-3CE788A4A1DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "SampleApp\SampleApp_x64_vs110.vcxproj", "{C3F12C11-469F-3FB6-8C95-8638F78FF7C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServer\SampleServer_x64_vs110.vcxproj", "{F475C5DD-0558-37AF-870B-666DE931B7BA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_x64_vs110.vcxproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|x64.Build.0 = debug_shared|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|x64.ActiveCfg = release_shared|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|x64.Build.0 = release_shared|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|x64.Deploy.0 = release_shared|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|x64.Build.0 = release_static_md|x64 - {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|x64.Build.0 = debug_shared|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|x64.ActiveCfg = release_shared|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|x64.Build.0 = release_shared|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|x64.Deploy.0 = release_shared|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|x64.Build.0 = release_static_md|x64 - {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|x64.Build.0 = debug_shared|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|x64.ActiveCfg = release_shared|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|x64.Build.0 = release_shared|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|x64.Deploy.0 = release_shared|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.Build.0 = release_static_md|x64 - {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.Build.0 = debug_shared|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.ActiveCfg = release_shared|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.Build.0 = release_shared|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.Deploy.0 = release_shared|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.Build.0 = release_static_md|x64 - {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pkill", "pkill\pkill_x64_vs110.vcxproj", "{63EDD785-29E1-3073-87EB-3CE788A4A1DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "SampleApp\SampleApp_x64_vs110.vcxproj", "{C3F12C11-469F-3FB6-8C95-8638F78FF7C0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServer\SampleServer_x64_vs110.vcxproj", "{F475C5DD-0558-37AF-870B-666DE931B7BA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_x64_vs110.vcxproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|x64.Build.0 = debug_shared|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|x64.ActiveCfg = release_shared|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|x64.Build.0 = release_shared|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|x64.Deploy.0 = release_shared|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|x64.Build.0 = release_static_md|x64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|x64.Build.0 = debug_shared|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|x64.ActiveCfg = release_shared|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|x64.Build.0 = release_shared|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|x64.Deploy.0 = release_shared|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|x64.Build.0 = release_static_md|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|x64.Build.0 = debug_shared|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|x64.ActiveCfg = release_shared|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|x64.Build.0 = release_shared|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|x64.Deploy.0 = release_shared|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.Build.0 = release_static_md|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.Build.0 = debug_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.ActiveCfg = release_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.Build.0 = release_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.Deploy.0 = release_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.Build.0 = release_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Util/src/JSONConfiguration.cpp b/Util/src/JSONConfiguration.cpp index 218432cb3..28c378af3 100644 --- a/Util/src/JSONConfiguration.cpp +++ b/Util/src/JSONConfiguration.cpp @@ -1,384 +1,406 @@ -// -// JSONConfiguration.cpp -// -// $Id$ -// -// Library: Util -// Package: JSON -// Module: JSONConfiguration -// -// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -#include "Poco/FileStream.h" -#include "Poco/StringTokenizer.h" -#include "Poco/Util/JSONConfiguration.h" -#include "Poco/JSON/Parser.h" -#include "Poco/JSON/Query.h" -#include "Poco/JSON/DefaultHandler.h" -#include "Poco/RegularExpression.h" -#include "Poco/NumberParser.h" - -namespace Poco -{ -namespace Util -{ - -JSONConfiguration::JSONConfiguration() : _object(new JSON::Object()) -{ -} - - -JSONConfiguration::JSONConfiguration(const std::string& path) -{ - load(path); -} - - -JSONConfiguration::JSONConfiguration(std::istream& istr) -{ - load(istr); -} - - -JSONConfiguration::JSONConfiguration(const JSON::Object::Ptr& object) : _object(object) -{ -} - - -JSONConfiguration::~JSONConfiguration() -{ -} - - -void JSONConfiguration::load(const std::string& path) -{ - Poco::FileInputStream fis(path); - load(fis); -} - - -void JSONConfiguration::load(std::istream& istr) -{ - JSON::Parser parser; - JSON::DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(istr); - DynamicAny result = handler.result(); - if ( result.type() == typeid(JSON::Object::Ptr) ) - { - _object = result.extract(); - } -} - - -void JSONConfiguration::loadEmpty(const std::string& root) -{ - _object = new JSON::Object(); - JSON::Object::Ptr rootObject = new JSON::Object(); - _object->set(root, rootObject); -} - - -bool JSONConfiguration::getRaw(const std::string & key, std::string & value) const -{ - JSON::Query query(_object); - Poco::DynamicAny result = query.find(key); - if ( ! result.isEmpty() ) - { - value = result.convert(); - return true; - } - return false; -} - - -void JSONConfiguration::getIndexes(std::string& name, std::vector& indexes) -{ - indexes.clear(); - - RegularExpression::MatchVec matches; - int firstOffset = -1; - int offset = 0; - RegularExpression regex("\\[([0-9]+)\\]"); - while(regex.match(name, offset, matches) > 0 ) - { - if ( firstOffset == -1 ) - { - firstOffset = matches[0].offset; - } - std::string num = name.substr(matches[1].offset, matches[1].length); - indexes.push_back(NumberParser::parse(num)); - offset = matches[0].offset + matches[0].length; - } - - if ( firstOffset != -1 ) - { - name = name.substr(0, firstOffset); - } -} - -JSON::Object::Ptr JSONConfiguration::findStart(const std::string& key, std::string& lastPart) -{ - JSON::Object::Ptr currentObject = _object; - - StringTokenizer tokenizer(key, "."); - lastPart = tokenizer[tokenizer.count() - 1]; - - for(int i = 0; i < tokenizer.count() - 1; ++i) - { - std::vector indexes; - std::string name = tokenizer[i]; - getIndexes(name, indexes); - - DynamicAny result = currentObject->get(name); - - if ( result.isEmpty() ) // Not found - { - if ( indexes.empty() ) // We want an object, create it - { - JSON::Object::Ptr newObject = new JSON::Object(); - currentObject->set(name, newObject); - currentObject = newObject; - } - else // We need an array - { - JSON::Array::Ptr newArray; - JSON::Array::Ptr parentArray; - JSON::Array::Ptr topArray; - for(std::vector::iterator it = indexes.begin(); it != indexes.end(); ++it) - { - newArray = new JSON::Array(); - if ( topArray.isNull() ) - { - topArray = newArray; - } - - if ( ! parentArray.isNull() ) - { - parentArray->add(newArray); - } - - for(int i = 0; i <= *it - 1; ++i) - { - Poco::DynamicAny nullValue; - newArray->add(nullValue); - } - - parentArray = newArray; - } - - currentObject->set(name, topArray); - currentObject = new JSON::Object(); - newArray->add(currentObject); - } - } - else // We have a value - { - if ( indexes.empty() ) // We want an object - { - if ( result.type() == typeid(JSON::Object::Ptr) ) - { - currentObject = result.extract(); - } - else - { - throw SyntaxException("Expected a JSON object"); - } - } - else - { - if ( result.type() == typeid(JSON::Array::Ptr) ) - { - JSON::Array::Ptr arr = result.extract(); - - for(std::vector::iterator it = indexes.begin(); it != indexes.end() - 1; ++it) - { - JSON::Array::Ptr currentArray = arr; - arr = arr->getArray(*it); - if ( arr.isNull() ) - { - arr = new JSON::Array(); - currentArray->add(arr); - } - } - - result = arr->get(*indexes.rbegin()); - if ( result.isEmpty() ) // Index doesn't exist - { - JSON::Object::Ptr newObject = new JSON::Object(); - arr->add(newObject); - currentObject = newObject; - } - else // Index is available - { - if ( result.type() == typeid(JSON::Object::Ptr) ) - { - currentObject = result.extract(); - } - else - { - throw SyntaxException("Expected a JSON object"); - } - } - } - else - { - throw SyntaxException("Expected a JSON array"); - } - } - } - } - return currentObject; -} - -void JSONConfiguration::setValue(const std::string& key, const Poco::DynamicAny& value) -{ - std::string sValue; - value.convert(sValue); - KeyValue kv(key, sValue); - if (eventsEnabled()) - { - propertyChanging(this, kv); - } +// +// JSONConfiguration.cpp +// +// $Id$ +// +// Library: Util +// Package: JSON +// Module: JSONConfiguration +// +// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// - std::string lastPart; - JSON::Object::Ptr parentObject = findStart(key, lastPart); - - std::vector indexes; - getIndexes(lastPart, indexes); - - if ( indexes.empty() ) // No Array - { - parentObject->set(lastPart, value); - } - else - { - DynamicAny result = parentObject->get(lastPart); - if ( result.isEmpty() ) - { - result = JSON::Array::Ptr(new JSON::Array()); - parentObject->set(lastPart, result); - } - else if ( result.type() != typeid(JSON::Array::Ptr) ) - { - throw SyntaxException("Expected a JSON array"); - } - - JSON::Array::Ptr arr = result.extract(); - for(std::vector::iterator it = indexes.begin(); it != indexes.end() - 1; ++it) - { - JSON::Array::Ptr nextArray = arr->getArray(*it); - if ( nextArray.isNull() ) - { - for(int i = arr->size(); i <= *it; ++i) - { - Poco::DynamicAny nullValue; - arr->add(nullValue); - } - nextArray = new JSON::Array(); - arr->add(nextArray); - } - arr = nextArray; - } - arr->add(value); - } - if (eventsEnabled()) - { - propertyChanged(this, kv); - } -} -void JSONConfiguration::setString(const std::string& key, const std::string& value) -{ - setValue(key, value); -} - - -void JSONConfiguration::setRaw(const std::string& key, const std::string& value) +#include "Poco/FileStream.h" +#include "Poco/StringTokenizer.h" +#include "Poco/Util/JSONConfiguration.h" +#include "Poco/JSON/Parser.h" +#include "Poco/JSON/Query.h" +#include "Poco/JSON/DefaultHandler.h" +#include "Poco/RegularExpression.h" +#include "Poco/NumberParser.h" + + +namespace Poco { +namespace Util { + + +JSONConfiguration::JSONConfiguration() : _object(new JSON::Object()) { - setValue(key, value); -} - -void JSONConfiguration::setInt(const std::string& key, int value) -{ - setValue(key, value); -} - -void JSONConfiguration::setBool(const std::string& key, bool value) -{ - setValue(key, value); -} - -void JSONConfiguration::setDouble(const std::string& key, double value) -{ - setValue(key, value); -} - -void JSONConfiguration::enumerate(const std::string& key, Keys& range) const -{ - JSON::Query query(_object); - Poco::DynamicAny result = query.find(key); - if ( result.type() == typeid(JSON::Object::Ptr) ) - { - JSON::Object::Ptr object = result.extract(); - object->getNames(range); - } -} - - -void JSONConfiguration::save(std::ostream& ostr, unsigned int indent) const -{ - _object->stringify(ostr, indent); } -void JSONConfiguration::removeRaw(const std::string& key) + +JSONConfiguration::JSONConfiguration(const std::string& path) { - std::string lastPart; - JSON::Object::Ptr parentObject = findStart(key, lastPart); + load(path); +} + + +JSONConfiguration::JSONConfiguration(std::istream& istr) +{ + load(istr); +} + + +JSONConfiguration::JSONConfiguration(const JSON::Object::Ptr& object) : _object(object) +{ +} + + +JSONConfiguration::~JSONConfiguration() +{ +} + + +void JSONConfiguration::load(const std::string& path) +{ + Poco::FileInputStream fis(path); + load(fis); +} + + +void JSONConfiguration::load(std::istream& istr) +{ + JSON::Parser parser; + JSON::DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(istr); + DynamicAny result = handler.result(); + if ( result.type() == typeid(JSON::Object::Ptr) ) + { + _object = result.extract(); + } +} + + +void JSONConfiguration::loadEmpty(const std::string& root) +{ + _object = new JSON::Object(); + JSON::Object::Ptr rootObject = new JSON::Object(); + _object->set(root, rootObject); +} + + +bool JSONConfiguration::getRaw(const std::string & key, std::string & value) const +{ + JSON::Query query(_object); + Poco::DynamicAny result = query.find(key); + if ( ! result.isEmpty() ) + { + value = result.convert(); + return true; + } + return false; +} + + +void JSONConfiguration::getIndexes(std::string& name, std::vector& indexes) +{ + indexes.clear(); + + RegularExpression::MatchVec matches; + int firstOffset = -1; + int offset = 0; + RegularExpression regex("\\[([0-9]+)\\]"); + while(regex.match(name, offset, matches) > 0 ) + { + if ( firstOffset == -1 ) + { + firstOffset = matches[0].offset; + } + std::string num = name.substr(matches[1].offset, matches[1].length); + indexes.push_back(NumberParser::parse(num)); + offset = matches[0].offset + matches[0].length; + } + + if ( firstOffset != -1 ) + { + name = name.substr(0, firstOffset); + } +} + + +JSON::Object::Ptr JSONConfiguration::findStart(const std::string& key, std::string& lastPart) +{ + JSON::Object::Ptr currentObject = _object; + + StringTokenizer tokenizer(key, "."); + lastPart = tokenizer[tokenizer.count() - 1]; + + for(int i = 0; i < tokenizer.count() - 1; ++i) + { + std::vector indexes; + std::string name = tokenizer[i]; + getIndexes(name, indexes); + + DynamicAny result = currentObject->get(name); + + if ( result.isEmpty() ) // Not found + { + if ( indexes.empty() ) // We want an object, create it + { + JSON::Object::Ptr newObject = new JSON::Object(); + currentObject->set(name, newObject); + currentObject = newObject; + } + else // We need an array + { + JSON::Array::Ptr newArray; + JSON::Array::Ptr parentArray; + JSON::Array::Ptr topArray; + for(std::vector::iterator it = indexes.begin(); it != indexes.end(); ++it) + { + newArray = new JSON::Array(); + if ( topArray.isNull() ) + { + topArray = newArray; + } + + if ( ! parentArray.isNull() ) + { + parentArray->add(newArray); + } + + for(int i = 0; i <= *it - 1; ++i) + { + Poco::DynamicAny nullValue; + newArray->add(nullValue); + } + + parentArray = newArray; + } + + currentObject->set(name, topArray); + currentObject = new JSON::Object(); + newArray->add(currentObject); + } + } + else // We have a value + { + if ( indexes.empty() ) // We want an object + { + if ( result.type() == typeid(JSON::Object::Ptr) ) + { + currentObject = result.extract(); + } + else + { + throw SyntaxException("Expected a JSON object"); + } + } + else + { + if ( result.type() == typeid(JSON::Array::Ptr) ) + { + JSON::Array::Ptr arr = result.extract(); + + for(std::vector::iterator it = indexes.begin(); it != indexes.end() - 1; ++it) + { + JSON::Array::Ptr currentArray = arr; + arr = arr->getArray(*it); + if ( arr.isNull() ) + { + arr = new JSON::Array(); + currentArray->add(arr); + } + } + + result = arr->get(*indexes.rbegin()); + if ( result.isEmpty() ) // Index doesn't exist + { + JSON::Object::Ptr newObject = new JSON::Object(); + arr->add(newObject); + currentObject = newObject; + } + else // Index is available + { + if ( result.type() == typeid(JSON::Object::Ptr) ) + { + currentObject = result.extract(); + } + else + { + throw SyntaxException("Expected a JSON object"); + } + } + } + else + { + throw SyntaxException("Expected a JSON array"); + } + } + } + } + return currentObject; +} + + +void JSONConfiguration::setValue(const std::string& key, const Poco::DynamicAny& value) +{ + + std::string sValue; - std::vector indexes; - getIndexes(lastPart, indexes); - - if ( indexes.empty() ) // No Array - { - parentObject->remove(lastPart); + value.convert(sValue); + KeyValue kv(key, sValue); + + if (eventsEnabled()) + + { + + propertyChanging(this, kv); + } + + std::string lastPart; + JSON::Object::Ptr parentObject = findStart(key, lastPart); + + std::vector indexes; + getIndexes(lastPart, indexes); + + if ( indexes.empty() ) // No Array + { + parentObject->set(lastPart, value); } else { - DynamicAny result = parentObject->get(lastPart); - if ( !result.isEmpty() && result.type() == typeid(JSON::Array::Ptr) ) + DynamicAny result = parentObject->get(lastPart); + if ( result.isEmpty() ) { - JSON::Array::Ptr arr = result.extract(); - for(std::vector::iterator it = indexes.begin(); it != indexes.end() - 1; ++it) - { - arr = arr->getArray(*it); + result = JSON::Array::Ptr(new JSON::Array()); + parentObject->set(lastPart, result); + } + else if ( result.type() != typeid(JSON::Array::Ptr) ) + { + throw SyntaxException("Expected a JSON array"); + } + + JSON::Array::Ptr arr = result.extract(); + for(std::vector::iterator it = indexes.begin(); it != indexes.end() - 1; ++it) + { + JSON::Array::Ptr nextArray = arr->getArray(*it); + if ( nextArray.isNull() ) + { + for(int i = arr->size(); i <= *it; ++i) + { + Poco::DynamicAny nullValue; + arr->add(nullValue); + } + nextArray = new JSON::Array(); + arr->add(nextArray); } - arr->remove(indexes.back()); - } + arr = nextArray; + } + arr->add(value); } -} - -}} // Namespace Poco::Util + + if (eventsEnabled()) + + { + + propertyChanged(this, kv); + } +} + + +void JSONConfiguration::setString(const std::string& key, const std::string& value) +{ + setValue(key, value); +} + + +void JSONConfiguration::setRaw(const std::string& key, const std::string& value) +{ + setValue(key, value); +} + + +void JSONConfiguration::setInt(const std::string& key, int value) +{ + setValue(key, value); +} + + +void JSONConfiguration::setBool(const std::string& key, bool value) +{ + setValue(key, value); +} + + +void JSONConfiguration::setDouble(const std::string& key, double value) +{ + setValue(key, value); +} + + +void JSONConfiguration::enumerate(const std::string& key, Keys& range) const +{ + JSON::Query query(_object); + Poco::DynamicAny result = query.find(key); + if ( result.type() == typeid(JSON::Object::Ptr) ) + { + JSON::Object::Ptr object = result.extract(); + object->getNames(range); + } +} + + +void JSONConfiguration::save(std::ostream& ostr, unsigned int indent) const +{ + _object->stringify(ostr, indent); +} + + +void JSONConfiguration::removeRaw(const std::string& key) + +{ + + std::string lastPart; + JSON::Object::Ptr parentObject = findStart(key, lastPart); + std::vector indexes; + getIndexes(lastPart, indexes); + + if ( indexes.empty() ) // No Array + { + parentObject->remove(lastPart); + } + else + { + DynamicAny result = parentObject->get(lastPart); + if (!result.isEmpty() && result.type() == typeid(JSON::Array::Ptr)) + { + + JSON::Array::Ptr arr = result.extract(); + for(std::vector::iterator it = indexes.begin(); it != indexes.end() - 1; ++it) + { + arr = arr->getArray(*it); + } + arr->remove(indexes.back()); + } + } + +} + + +} } // namespace Poco::Util diff --git a/Util/testsuite/TestSuite_vs110.vcxproj b/Util/testsuite/TestSuite_vs110.vcxproj index 7e0392977..507744a02 100644 --- a/Util/testsuite/TestSuite_vs110.vcxproj +++ b/Util/testsuite/TestSuite_vs110.vcxproj @@ -1,365 +1,365 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {E40E738C-447B-40F4-A878-EBA9A2459270} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {E40E738C-447B-40F4-A878-EBA9A2459270} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Util/testsuite/TestSuite_vs110.vcxproj.filters b/Util/testsuite/TestSuite_vs110.vcxproj.filters index 3ff62c5b5..b41fac995 100644 --- a/Util/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,222 +1,222 @@ - - - - - {96624136-742a-462b-8c99-cb7a525faec2} - - - {dda47104-a126-44de-a247-172d1599fa81} - - - {73d0ebc6-42e3-4e48-99e6-6bbb52dc3c50} - - - {e8bf0a86-f574-404f-9555-509567dce30c} - - - {40aa0b07-0d45-4ed8-b95c-01e2df973dfd} - - - {cd9ec5ca-74b3-4f24-b6cf-9b1c010cf4cb} - - - {9ab5b980-05d6-4d4f-baa3-afc540a501dc} - - - {13630e1b-54ae-486e-bdcd-692c3929c4f7} - - - {e8bbf3d0-c1c4-4609-b1cb-4852fe8a2faa} - - - {ffc21e86-50c6-4ac0-a9d3-ac9f02856267} - - - {967e2436-bd85-4c90-b9bc-19ba5c51d696} - - - {3fb4934f-49ff-4caf-84f4-5f36aa071100} - - - {01e8a2b2-43b4-4980-9945-b3da94e0241c} - - - {d75ed7be-4ff5-40e2-80ae-609a393292d6} - - - {57157104-974d-4ca1-9b8b-bc0f941b9bd9} - - - {81d02b77-bab3-4c09-8be3-fd3e207d22fd} - - - {e13b5136-af54-43ca-a8ff-53d585509239} - - - {87e46c01-367e-4b90-ad50-6d27aedfb565} - - - {49c4dca6-390d-48d7-a57a-997398737f7e} - - - {34e0a806-6ef9-4610-b0ef-d7e74fd2e4e7} - - - - - _Suite\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Windows\Header Files - - - Windows\Header Files - - - Windows\Header Files - - - Timer\Header Files - - - Timer\Header Files - - - - - _Suite\Source Files - - - _Driver\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Windows\Source Files - - - Windows\Source Files - - - Windows\Source Files - - - Timer\Source Files - - - Timer\Source Files - - + + + + + {96624136-742a-462b-8c99-cb7a525faec2} + + + {dda47104-a126-44de-a247-172d1599fa81} + + + {73d0ebc6-42e3-4e48-99e6-6bbb52dc3c50} + + + {e8bf0a86-f574-404f-9555-509567dce30c} + + + {40aa0b07-0d45-4ed8-b95c-01e2df973dfd} + + + {cd9ec5ca-74b3-4f24-b6cf-9b1c010cf4cb} + + + {9ab5b980-05d6-4d4f-baa3-afc540a501dc} + + + {13630e1b-54ae-486e-bdcd-692c3929c4f7} + + + {e8bbf3d0-c1c4-4609-b1cb-4852fe8a2faa} + + + {ffc21e86-50c6-4ac0-a9d3-ac9f02856267} + + + {967e2436-bd85-4c90-b9bc-19ba5c51d696} + + + {3fb4934f-49ff-4caf-84f4-5f36aa071100} + + + {01e8a2b2-43b4-4980-9945-b3da94e0241c} + + + {d75ed7be-4ff5-40e2-80ae-609a393292d6} + + + {57157104-974d-4ca1-9b8b-bc0f941b9bd9} + + + {81d02b77-bab3-4c09-8be3-fd3e207d22fd} + + + {e13b5136-af54-43ca-a8ff-53d585509239} + + + {87e46c01-367e-4b90-ad50-6d27aedfb565} + + + {49c4dca6-390d-48d7-a57a-997398737f7e} + + + {34e0a806-6ef9-4610-b0ef-d7e74fd2e4e7} + + + + + _Suite\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Windows\Header Files + + + Windows\Header Files + + + Windows\Header Files + + + Timer\Header Files + + + Timer\Header Files + + + + + _Suite\Source Files + + + _Driver\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Windows\Source Files + + + Windows\Source Files + + + Windows\Source Files + + + Timer\Source Files + + + Timer\Source Files + + \ No newline at end of file diff --git a/Util/testsuite/TestSuite_x64_vs110.vcxproj b/Util/testsuite/TestSuite_x64_vs110.vcxproj index b44d60ccd..34b8e20c5 100644 --- a/Util/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,365 +1,365 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {E40E738C-447B-40F4-A878-EBA9A2459270} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {E40E738C-447B-40F4-A878-EBA9A2459270} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters index 5fc51f706..1a75b825c 100644 --- a/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,222 +1,222 @@ - - - - - {a35fecc8-9361-4713-b341-c4905e21e370} - - - {b7bf0bbc-ccdb-4895-9a49-3f7986c84cd7} - - - {1abf2563-ccb3-44aa-bf9b-9ed3b44c874c} - - - {413a624c-a718-46e8-ac12-fc72ae9bd59b} - - - {e6418da9-85d5-4e51-8b17-c2e212b43d44} - - - {34087807-43ed-48cc-a89a-8415ed7f341c} - - - {fa935e5a-9091-4626-b189-69cad7c8d992} - - - {ae55e579-9cf1-48a4-ad05-49d9e98cb5a2} - - - {7e08444e-2bcf-44cb-82c1-cd6c5302c281} - - - {fc7ee45c-f585-4536-9f55-09c5cbd0479d} - - - {b6da558a-5129-4011-987d-62281640a430} - - - {91001d65-9f31-4527-93c5-daaa20481869} - - - {abd15ee0-8fd4-4599-a084-93a0849b1b92} - - - {69886462-436b-4679-acd4-9949811876fc} - - - {b106ba11-9052-4eb4-8355-5a548518f23f} - - - {9a95138e-d59c-4def-808c-ece97d137547} - - - {952fa7bf-80fc-4eee-bcfd-dd4e37241449} - - - {716d92ba-c4f4-427c-92d6-cf73e905ad21} - - - {a9e8f0e3-5584-47c8-a52f-679f0ff5cc6e} - - - {cfc53565-7710-4f5a-8ad6-741392a1f4f7} - - - - - _Suite\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Configuration\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Options\Header Files - - - Windows\Header Files - - - Windows\Header Files - - - Windows\Header Files - - - Timer\Header Files - - - Timer\Header Files - - - - - _Suite\Source Files - - - _Driver\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Configuration\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Options\Source Files - - - Windows\Source Files - - - Windows\Source Files - - - Windows\Source Files - - - Timer\Source Files - - - Timer\Source Files - - + + + + + {a35fecc8-9361-4713-b341-c4905e21e370} + + + {b7bf0bbc-ccdb-4895-9a49-3f7986c84cd7} + + + {1abf2563-ccb3-44aa-bf9b-9ed3b44c874c} + + + {413a624c-a718-46e8-ac12-fc72ae9bd59b} + + + {e6418da9-85d5-4e51-8b17-c2e212b43d44} + + + {34087807-43ed-48cc-a89a-8415ed7f341c} + + + {fa935e5a-9091-4626-b189-69cad7c8d992} + + + {ae55e579-9cf1-48a4-ad05-49d9e98cb5a2} + + + {7e08444e-2bcf-44cb-82c1-cd6c5302c281} + + + {fc7ee45c-f585-4536-9f55-09c5cbd0479d} + + + {b6da558a-5129-4011-987d-62281640a430} + + + {91001d65-9f31-4527-93c5-daaa20481869} + + + {abd15ee0-8fd4-4599-a084-93a0849b1b92} + + + {69886462-436b-4679-acd4-9949811876fc} + + + {b106ba11-9052-4eb4-8355-5a548518f23f} + + + {9a95138e-d59c-4def-808c-ece97d137547} + + + {952fa7bf-80fc-4eee-bcfd-dd4e37241449} + + + {716d92ba-c4f4-427c-92d6-cf73e905ad21} + + + {a9e8f0e3-5584-47c8-a52f-679f0ff5cc6e} + + + {cfc53565-7710-4f5a-8ad6-741392a1f4f7} + + + + + _Suite\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Configuration\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Options\Header Files + + + Windows\Header Files + + + Windows\Header Files + + + Windows\Header Files + + + Timer\Header Files + + + Timer\Header Files + + + + + _Suite\Source Files + + + _Driver\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Configuration\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Options\Source Files + + + Windows\Source Files + + + Windows\Source Files + + + Windows\Source Files + + + Timer\Source Files + + + Timer\Source Files + + \ No newline at end of file diff --git a/Util/testsuite/src/JSONConfigurationTest.cpp b/Util/testsuite/src/JSONConfigurationTest.cpp index b81bfa80e..ef30079d8 100644 --- a/Util/testsuite/src/JSONConfigurationTest.cpp +++ b/Util/testsuite/src/JSONConfigurationTest.cpp @@ -1,129 +1,129 @@ -// -// JSONConfigurationTest.cpp -// -// $Id$ -// -// Copyright (c) 2004-2012, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -#include "JSONConfigurationTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" -#include "Poco/Util/JSONConfiguration.h" -#include "Poco/JSON/JSONException.h" - -using Poco::Util::JSONConfiguration; -using Poco::Util::AbstractConfiguration; -using Poco::AutoPtr; -using Poco::NotImplementedException; -using Poco::NotFoundException; -using Poco::JSON::JSONException; - - -JSONConfigurationTest::JSONConfigurationTest(const std::string& name) : AbstractConfigurationTest(name) -{ -} - - -JSONConfigurationTest::~JSONConfigurationTest() -{ -} - - -void JSONConfigurationTest::testLoad() -{ - JSONConfiguration config; - - std::string json = "{ \"config\" : " - " { \"prop1\" : \"value1\", " - " \"prop2\" : 10, " - " \"prop3\" : [ \"element1\", \"element2\" ], " - " \"prop4\" : { \"prop5\" : false, " - " \"prop6\" : null } " - " }" - "}"; - - std::istringstream iss(json); - try - { - config.load(iss); - } - catch(JSONException jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - std::string property1 = config.getString("config.prop1"); - assert(property1.compare("value1") == 0); - - int property2 = config.getInt("config.prop2"); - assert(property2 == 10); - - int nonExistingProperty = config.getInt("config.prop7", 5); - assert(nonExistingProperty == 5); - - std::string arrProperty = config.getString("config.prop3[1]"); - assert(arrProperty.compare("element2") == 0); - - bool property35 = config.getBool("config.prop4.prop5"); - assert(! property35); - - try - { - config.getString("propertyUnknown"); - assert(true); - } - catch(NotFoundException nfe) - { - } - -} - -AbstractConfiguration* JSONConfigurationTest::allocConfiguration() const -{ - return new JSONConfiguration; -} - - -void JSONConfigurationTest::setUp() -{ -} - - -void JSONConfigurationTest::tearDown() -{ -} - - -CppUnit::Test* JSONConfigurationTest::suite() -{ - CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("JSONConfigurationTest"); - - AbstractConfigurationTest_addTests(pSuite, JSONConfigurationTest); - CppUnit_addTest(pSuite, JSONConfigurationTest, testLoad); - - return pSuite; -} +// +// JSONConfigurationTest.cpp +// +// $Id$ +// +// Copyright (c) 2004-2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// +#include "JSONConfigurationTest.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" +#include "Poco/Util/JSONConfiguration.h" +#include "Poco/JSON/JSONException.h" + +using Poco::Util::JSONConfiguration; +using Poco::Util::AbstractConfiguration; +using Poco::AutoPtr; +using Poco::NotImplementedException; +using Poco::NotFoundException; +using Poco::JSON::JSONException; + + +JSONConfigurationTest::JSONConfigurationTest(const std::string& name) : AbstractConfigurationTest(name) +{ +} + + +JSONConfigurationTest::~JSONConfigurationTest() +{ +} + + +void JSONConfigurationTest::testLoad() +{ + JSONConfiguration config; + + std::string json = "{ \"config\" : " + " { \"prop1\" : \"value1\", " + " \"prop2\" : 10, " + " \"prop3\" : [ \"element1\", \"element2\" ], " + " \"prop4\" : { \"prop5\" : false, " + " \"prop6\" : null } " + " }" + "}"; + + std::istringstream iss(json); + try + { + config.load(iss); + } + catch(JSONException jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + std::string property1 = config.getString("config.prop1"); + assert(property1.compare("value1") == 0); + + int property2 = config.getInt("config.prop2"); + assert(property2 == 10); + + int nonExistingProperty = config.getInt("config.prop7", 5); + assert(nonExistingProperty == 5); + + std::string arrProperty = config.getString("config.prop3[1]"); + assert(arrProperty.compare("element2") == 0); + + bool property35 = config.getBool("config.prop4.prop5"); + assert(! property35); + + try + { + config.getString("propertyUnknown"); + assert(true); + } + catch(NotFoundException nfe) + { + } + +} + +AbstractConfiguration* JSONConfigurationTest::allocConfiguration() const +{ + return new JSONConfiguration; +} + + +void JSONConfigurationTest::setUp() +{ +} + + +void JSONConfigurationTest::tearDown() +{ +} + + +CppUnit::Test* JSONConfigurationTest::suite() +{ + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("JSONConfigurationTest"); + + AbstractConfigurationTest_addTests(pSuite, JSONConfigurationTest); + CppUnit_addTest(pSuite, JSONConfigurationTest, testLoad); + + return pSuite; +} diff --git a/XML/XML_vs110.sln b/XML/XML_vs110.sln index e7127ab8d..4f45f64c6 100644 --- a/XML/XML_vs110.sln +++ b/XML/XML_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "XML_vs110.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}" - ProjectSection(ProjectDependencies) = postProject - {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|Win32.Build.0 = release_shared|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|Win32.Build.0 = release_shared|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "XML_vs110.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}" + ProjectSection(ProjectDependencies) = postProject + {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|Win32.Build.0 = release_shared|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|Win32.Build.0 = release_shared|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/XML/XML_vs110.vcxproj b/XML/XML_vs110.vcxproj index 6ff3d98c4..5fede76c8 100644 --- a/XML/XML_vs110.vcxproj +++ b/XML/XML_vs110.vcxproj @@ -1,453 +1,453 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - XML - {9E211743-85FE-4977-82F3-4F04B40C912D} - XML - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoXMLd - PocoXMLmdd - PocoXMLmtd - PocoXML - PocoXMLmd - PocoXMLmt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoXMLd.dll - true - true - ..\bin\PocoXMLd.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoXMLd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoXML.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoXML.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoXMLmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoXMLmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoXMLmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoXMLmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoXMLmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoXMLmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\lib\PocoXMLmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + XML + {9E211743-85FE-4977-82F3-4F04B40C912D} + XML + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoXMLd + PocoXMLmdd + PocoXMLmtd + PocoXML + PocoXMLmd + PocoXMLmt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoXMLd.dll + true + true + ..\bin\PocoXMLd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoXMLd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoXML.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoXML.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoXMLmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoXMLmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoXMLmt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoXMLmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoXMLmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoXMLmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\lib\PocoXMLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + diff --git a/XML/XML_vs110.vcxproj.filters b/XML/XML_vs110.vcxproj.filters index 8ece36cdf..12f745461 100644 --- a/XML/XML_vs110.vcxproj.filters +++ b/XML/XML_vs110.vcxproj.filters @@ -1,513 +1,513 @@ - - - - - {5b85d48e-f67b-43e2-a615-e97a69572aa4} - - - {0a28aebf-39d0-4748-9de6-72c51904a27a} - - - {66adb544-6251-4384-8b5e-8f2196b62c12} - - - {3b328611-54de-4aae-b97a-f36191ffa9da} - - - {be469aed-0546-4e1d-a3c1-0a1211719c24} - - - {66370838-ff99-4dac-a922-656037d2ff8b} - - - {11da5e02-94c9-457a-a2fb-6f685bbdc8e1} - - - {0a88c6cf-fc18-4b1c-9851-a6586105593c} - - - {ed9358d4-31d2-4542-870d-7c380d020ca4} - - - {c76b8795-31b0-4eb0-a0b6-25244ac8b410} - - - {5a01af83-f00f-43ff-a7a3-ec0b75c519b6} - - - {e025d3b9-be20-41f8-a7ea-abbe43d8692f} - - - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - Expat\Header Files - - - Expat\Header Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - - - + + + + + {5b85d48e-f67b-43e2-a615-e97a69572aa4} + + + {0a28aebf-39d0-4748-9de6-72c51904a27a} + + + {66adb544-6251-4384-8b5e-8f2196b62c12} + + + {3b328611-54de-4aae-b97a-f36191ffa9da} + + + {be469aed-0546-4e1d-a3c1-0a1211719c24} + + + {66370838-ff99-4dac-a922-656037d2ff8b} + + + {11da5e02-94c9-457a-a2fb-6f685bbdc8e1} + + + {0a88c6cf-fc18-4b1c-9851-a6586105593c} + + + {ed9358d4-31d2-4542-870d-7c380d020ca4} + + + {c76b8795-31b0-4eb0-a0b6-25244ac8b410} + + + {5a01af83-f00f-43ff-a7a3-ec0b75c519b6} + + + {e025d3b9-be20-41f8-a7ea-abbe43d8692f} + + + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + Expat\Header Files + + + Expat\Header Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + + + \ No newline at end of file diff --git a/XML/XML_x64_vs110.sln b/XML/XML_x64_vs110.sln index e72889d70..1711c55ac 100644 --- a/XML/XML_x64_vs110.sln +++ b/XML/XML_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "XML_x64_vs110.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}" - ProjectSection(ProjectDependencies) = postProject - {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|x64.Build.0 = debug_shared|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|x64.ActiveCfg = release_shared|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|x64.Build.0 = release_shared|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|x64.Deploy.0 = release_shared|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|x64.Build.0 = release_static_md|x64 - {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|x64.Build.0 = debug_shared|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|x64.ActiveCfg = release_shared|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|x64.Build.0 = release_shared|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|x64.Deploy.0 = release_shared|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|x64.Build.0 = release_static_md|x64 - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "XML_x64_vs110.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}" + ProjectSection(ProjectDependencies) = postProject + {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|x64.Build.0 = debug_shared|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|x64.ActiveCfg = release_shared|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|x64.Build.0 = release_shared|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_shared|x64.Deploy.0 = release_shared|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|x64.Build.0 = release_static_md|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|x64.Build.0 = debug_shared|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|x64.ActiveCfg = release_shared|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|x64.Build.0 = release_shared|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_shared|x64.Deploy.0 = release_shared|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|x64.Build.0 = release_static_md|x64 + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/XML/XML_x64_vs110.vcxproj b/XML/XML_x64_vs110.vcxproj index 72538e6ec..f3e3f12b4 100644 --- a/XML/XML_x64_vs110.vcxproj +++ b/XML/XML_x64_vs110.vcxproj @@ -1,451 +1,451 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - XML - {9E211743-85FE-4977-82F3-4F04B40C912D} - XML - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoXML64d - PocoXMLmdd - PocoXMLmtd - PocoXML64 - PocoXMLmd - PocoXMLmt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoXML64d.dll - true - true - ..\bin64\PocoXML64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoXMLd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin64\PocoXML64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoXML.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoXMLmtd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoXMLmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoXMLmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoXMLmdd.pdb - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoXMLmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib64\PocoXMLmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + XML + {9E211743-85FE-4977-82F3-4F04B40C912D} + XML + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoXML64d + PocoXMLmdd + PocoXMLmtd + PocoXML64 + PocoXMLmd + PocoXMLmt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoXML64d.dll + true + true + ..\bin64\PocoXML64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoXMLd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin64\PocoXML64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoXML.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoXMLmtd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoXMLmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoXMLmt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoXMLmdd.pdb + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoXMLmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib64\PocoXMLmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + diff --git a/XML/XML_x64_vs110.vcxproj.filters b/XML/XML_x64_vs110.vcxproj.filters index 07089b9c2..623032a48 100644 --- a/XML/XML_x64_vs110.vcxproj.filters +++ b/XML/XML_x64_vs110.vcxproj.filters @@ -1,513 +1,513 @@ - - - - - {7a352224-2f28-456b-b9f0-8695d3ae34f8} - - - {edca0837-a1e9-4ffd-bb89-9de36b88a491} - - - {2f51c7dd-c9a4-4b0d-ba5c-28b721bda459} - - - {8de8666b-31ad-4e4d-8100-9e1ea9e6f8bb} - - - {47f703a8-9c15-43cc-9861-38d176e6b3d5} - - - {9d0dcf6f-2924-4dda-af46-4fbbff7ddcd1} - - - {9df7a80d-1a1e-435d-b3b8-63a5e7e42db3} - - - {4c6140ac-ee6e-4474-b882-f67e88a5201f} - - - {3d1303df-3bc6-46f1-9e2e-56876286b088} - - - {f017cacf-84a5-404e-9c34-b685fe328629} - - - {f8ceb50f-4be2-4c2c-bfa0-7d6640d99dae} - - - {bcaccf53-eab9-4663-a47b-bc0c7d209103} - - - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - Expat\Header Files - - - Expat\Header Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - Expat\Source Files - - - - - + + + + + {7a352224-2f28-456b-b9f0-8695d3ae34f8} + + + {edca0837-a1e9-4ffd-bb89-9de36b88a491} + + + {2f51c7dd-c9a4-4b0d-ba5c-28b721bda459} + + + {8de8666b-31ad-4e4d-8100-9e1ea9e6f8bb} + + + {47f703a8-9c15-43cc-9861-38d176e6b3d5} + + + {9d0dcf6f-2924-4dda-af46-4fbbff7ddcd1} + + + {9df7a80d-1a1e-435d-b3b8-63a5e7e42db3} + + + {4c6140ac-ee6e-4474-b882-f67e88a5201f} + + + {3d1303df-3bc6-46f1-9e2e-56876286b088} + + + {f017cacf-84a5-404e-9c34-b685fe328629} + + + {f8ceb50f-4be2-4c2c-bfa0-7d6640d99dae} + + + {bcaccf53-eab9-4663-a47b-bc0c7d209103} + + + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + Expat\Header Files + + + Expat\Header Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + Expat\Source Files + + + + + \ No newline at end of file diff --git a/XML/samples/DOMParser/DOMParser_vs110.vcxproj b/XML/samples/DOMParser/DOMParser_vs110.vcxproj index 658624a26..58dab0480 100644 --- a/XML/samples/DOMParser/DOMParser_vs110.vcxproj +++ b/XML/samples/DOMParser/DOMParser_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - DOMParser - {70F2F655-67D5-32A1-A99B-D4903547DB3E} - DOMParser - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - DOMParserd - DOMParserd - DOMParserd - DOMParser - DOMParser - DOMParser - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\DOMParserd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\DOMParserd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\DOMParser.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\DOMParserd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\DOMParserd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\DOMParser.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\DOMParserd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\DOMParserd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\DOMParser.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + DOMParser + {70F2F655-67D5-32A1-A99B-D4903547DB3E} + DOMParser + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + DOMParserd + DOMParserd + DOMParserd + DOMParser + DOMParser + DOMParser + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\DOMParserd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\DOMParserd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\DOMParser.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\DOMParserd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\DOMParserd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\DOMParser.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\DOMParserd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\DOMParserd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\DOMParser.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/XML/samples/DOMParser/DOMParser_vs110.vcxproj.filters b/XML/samples/DOMParser/DOMParser_vs110.vcxproj.filters index 4320b1311..452722e3b 100644 --- a/XML/samples/DOMParser/DOMParser_vs110.vcxproj.filters +++ b/XML/samples/DOMParser/DOMParser_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {9d1cf2c5-3b20-48cc-801b-d0995f222206} - - - {8830148a-f62f-4d78-920a-ff50871393fc} - - - - - Source Files - - + + + + + {9d1cf2c5-3b20-48cc-801b-d0995f222206} + + + {8830148a-f62f-4d78-920a-ff50871393fc} + + + + + Source Files + + \ No newline at end of file diff --git a/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj b/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj index bacb5c089..ee244c669 100644 --- a/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj +++ b/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - DOMParser - {70F2F655-67D5-32A1-A99B-D4903547DB3E} - DOMParser - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - DOMParserd - DOMParserd - DOMParserd - DOMParser - DOMParser - DOMParser - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\DOMParserd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\DOMParserd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\DOMParser.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\DOMParserd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\DOMParserd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\DOMParser.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\DOMParserd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\DOMParserd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\DOMParser.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + DOMParser + {70F2F655-67D5-32A1-A99B-D4903547DB3E} + DOMParser + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + DOMParserd + DOMParserd + DOMParserd + DOMParser + DOMParser + DOMParser + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\DOMParserd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\DOMParserd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\DOMParser.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\DOMParserd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\DOMParserd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\DOMParser.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\DOMParserd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\DOMParserd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\DOMParser.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj.filters b/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj.filters index 126cb19ed..a3cf6bae9 100644 --- a/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj.filters +++ b/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {bbc9068d-2bba-4f88-8405-beb6371107cd} - - - {02935f4d-c310-4e18-950b-9fd60353beca} - - - - - Source Files - - + + + + + {bbc9068d-2bba-4f88-8405-beb6371107cd} + + + {02935f4d-c310-4e18-950b-9fd60353beca} + + + + + Source Files + + \ No newline at end of file diff --git a/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj b/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj index b3b012cbd..6dd01f11b 100644 --- a/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj +++ b/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - DOMWriter - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8} - DOMWriter - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - DOMWriterd - DOMWriterd - DOMWriterd - DOMWriter - DOMWriter - DOMWriter - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\DOMWriterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\DOMWriterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\DOMWriter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\DOMWriterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\DOMWriterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\DOMWriter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\DOMWriterd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\DOMWriterd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\DOMWriter.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + DOMWriter + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8} + DOMWriter + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + DOMWriterd + DOMWriterd + DOMWriterd + DOMWriter + DOMWriter + DOMWriter + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\DOMWriterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\DOMWriterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\DOMWriter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\DOMWriterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\DOMWriterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\DOMWriter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\DOMWriterd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\DOMWriterd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\DOMWriter.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj.filters b/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj.filters index 1f0849967..d39449f97 100644 --- a/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj.filters +++ b/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {06fdefeb-e485-40a7-9d8c-3e7e8d1903ba} - - - {abe30d68-4b4b-475a-9640-58af8750669c} - - - - - Source Files - - + + + + + {06fdefeb-e485-40a7-9d8c-3e7e8d1903ba} + + + {abe30d68-4b4b-475a-9640-58af8750669c} + + + + + Source Files + + \ No newline at end of file diff --git a/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj b/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj index 673cd2cb1..e9afb38c9 100644 --- a/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj +++ b/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - DOMWriter - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8} - DOMWriter - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - DOMWriterd - DOMWriterd - DOMWriterd - DOMWriter - DOMWriter - DOMWriter - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\DOMWriterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\DOMWriterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\DOMWriter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\DOMWriterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\DOMWriterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\DOMWriter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\DOMWriterd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\DOMWriterd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\DOMWriter.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + DOMWriter + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8} + DOMWriter + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + DOMWriterd + DOMWriterd + DOMWriterd + DOMWriter + DOMWriter + DOMWriter + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\DOMWriterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\DOMWriterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\DOMWriter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\DOMWriterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\DOMWriterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\DOMWriter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\DOMWriterd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\DOMWriterd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\DOMWriter.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj.filters b/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj.filters index 6f7e8dae6..d9b6fa3ac 100644 --- a/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj.filters +++ b/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {f612067e-ac0d-48aa-8782-991fe8e029c4} - - - {f0981a55-ce53-4455-b11f-f9702a60488f} - - - - - Source Files - - + + + + + {f612067e-ac0d-48aa-8782-991fe8e029c4} + + + {f0981a55-ce53-4455-b11f-f9702a60488f} + + + + + Source Files + + \ No newline at end of file diff --git a/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj b/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj index 280d8f7ca..d19e0ffd7 100644 --- a/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj +++ b/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - PrettyPrint - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082} - PrettyPrint - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - PrettyPrintd - PrettyPrintd - PrettyPrintd - PrettyPrint - PrettyPrint - PrettyPrint - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\PrettyPrintd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\PrettyPrintd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\PrettyPrint.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\PrettyPrintd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\PrettyPrintd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\PrettyPrint.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\PrettyPrintd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\PrettyPrintd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\PrettyPrint.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + PrettyPrint + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082} + PrettyPrint + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + PrettyPrintd + PrettyPrintd + PrettyPrintd + PrettyPrint + PrettyPrint + PrettyPrint + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\PrettyPrintd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\PrettyPrintd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\PrettyPrint.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\PrettyPrintd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\PrettyPrintd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\PrettyPrint.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\PrettyPrintd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\PrettyPrintd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\PrettyPrint.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj.filters b/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj.filters index 1a176b49b..e7d29cf57 100644 --- a/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj.filters +++ b/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {4fd6da9e-7165-4d1f-ae11-de70d5e36576} - - - {8444a93b-db8a-4b3a-90cc-6edb9a39e13a} - - - - - Source Files - - + + + + + {4fd6da9e-7165-4d1f-ae11-de70d5e36576} + + + {8444a93b-db8a-4b3a-90cc-6edb9a39e13a} + + + + + Source Files + + \ No newline at end of file diff --git a/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj b/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj index 9b623611f..f48df670b 100644 --- a/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj +++ b/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - PrettyPrint - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082} - PrettyPrint - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - PrettyPrintd - PrettyPrintd - PrettyPrintd - PrettyPrint - PrettyPrint - PrettyPrint - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\PrettyPrintd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\PrettyPrintd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\PrettyPrint.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\PrettyPrintd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\PrettyPrintd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\PrettyPrint.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\PrettyPrintd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\PrettyPrintd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\PrettyPrint.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + PrettyPrint + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082} + PrettyPrint + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + PrettyPrintd + PrettyPrintd + PrettyPrintd + PrettyPrint + PrettyPrint + PrettyPrint + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\PrettyPrintd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\PrettyPrintd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\PrettyPrint.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\PrettyPrintd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\PrettyPrintd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\PrettyPrint.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\PrettyPrintd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\PrettyPrintd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\PrettyPrint.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj.filters b/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj.filters index 70bc29fd9..89fe5cf2d 100644 --- a/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj.filters +++ b/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {19d07092-bf96-428a-af52-6d11156ae802} - - - {7401bb6e-73f2-4020-b189-5b649878e3a9} - - - - - Source Files - - + + + + + {19d07092-bf96-428a-af52-6d11156ae802} + + + {7401bb6e-73f2-4020-b189-5b649878e3a9} + + + + + Source Files + + \ No newline at end of file diff --git a/XML/samples/SAXParser/SAXParser_vs110.vcxproj b/XML/samples/SAXParser/SAXParser_vs110.vcxproj index a4aae9ede..b06b0ebd4 100644 --- a/XML/samples/SAXParser/SAXParser_vs110.vcxproj +++ b/XML/samples/SAXParser/SAXParser_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - SAXParser - {2A54653D-9F55-348B-8F79-A3E454563AE3} - SAXParser - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - SAXParserd - SAXParserd - SAXParserd - SAXParser - SAXParser - SAXParser - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\SAXParserd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\SAXParserd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\SAXParser.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\SAXParserd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\SAXParserd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\SAXParser.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\SAXParserd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\SAXParserd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\SAXParser.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + SAXParser + {2A54653D-9F55-348B-8F79-A3E454563AE3} + SAXParser + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + SAXParserd + SAXParserd + SAXParserd + SAXParser + SAXParser + SAXParser + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\SAXParserd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\SAXParserd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\SAXParser.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\SAXParserd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\SAXParserd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\SAXParser.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\SAXParserd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\SAXParserd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\SAXParser.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/XML/samples/SAXParser/SAXParser_vs110.vcxproj.filters b/XML/samples/SAXParser/SAXParser_vs110.vcxproj.filters index 6770b5dfc..591f37d79 100644 --- a/XML/samples/SAXParser/SAXParser_vs110.vcxproj.filters +++ b/XML/samples/SAXParser/SAXParser_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {aec08ad1-1b75-45f5-a6eb-1079ef7abcf9} - - - {57d590f9-50b2-41b1-8ab6-c9c61b460e3b} - - - - - Source Files - - + + + + + {aec08ad1-1b75-45f5-a6eb-1079ef7abcf9} + + + {57d590f9-50b2-41b1-8ab6-c9c61b460e3b} + + + + + Source Files + + \ No newline at end of file diff --git a/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj b/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj index ed9a21260..c3f0d2fa0 100644 --- a/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj +++ b/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - SAXParser - {2A54653D-9F55-348B-8F79-A3E454563AE3} - SAXParser - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - SAXParserd - SAXParserd - SAXParserd - SAXParser - SAXParser - SAXParser - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\SAXParserd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\SAXParserd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\SAXParser.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\SAXParserd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\SAXParserd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\SAXParser.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\SAXParserd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\SAXParserd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\SAXParser.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + SAXParser + {2A54653D-9F55-348B-8F79-A3E454563AE3} + SAXParser + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + SAXParserd + SAXParserd + SAXParserd + SAXParser + SAXParser + SAXParser + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\SAXParserd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\SAXParserd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\SAXParser.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\SAXParserd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\SAXParserd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\SAXParser.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\SAXParserd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\SAXParserd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\SAXParser.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj.filters b/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj.filters index a03dc423e..1bf4587ea 100644 --- a/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj.filters +++ b/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {83da49ec-7ea3-42ac-ad67-145f193920f5} - - - {d0209985-a7e4-4a31-b980-561591073c4d} - - - - - Source Files - - + + + + + {83da49ec-7ea3-42ac-ad67-145f193920f5} + + + {d0209985-a7e4-4a31-b980-561591073c4d} + + + + + Source Files + + \ No newline at end of file diff --git a/XML/samples/samples_vs110.sln b/XML/samples/samples_vs110.sln index c77304966..0866839ee 100644 --- a/XML/samples/samples_vs110.sln +++ b/XML/samples/samples_vs110.sln @@ -1,97 +1,97 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMParser", "DOMParser\DOMParser_vs110.vcxproj", "{70F2F655-67D5-32A1-A99B-D4903547DB3E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMWriter", "DOMWriter\DOMWriter_vs110.vcxproj", "{A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrettyPrint", "PrettyPrint\PrettyPrint_vs110.vcxproj", "{DFA97011-8DD4-3A84-A0C9-EB2101BD6082}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SAXParser", "SAXParser\SAXParser_vs110.vcxproj", "{2A54653D-9F55-348B-8F79-A3E454563AE3}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|Win32.Build.0 = release_shared|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|Win32.Build.0 = release_shared|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|Win32.Build.0 = release_shared|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|Win32.Build.0 = release_shared|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMParser", "DOMParser\DOMParser_vs110.vcxproj", "{70F2F655-67D5-32A1-A99B-D4903547DB3E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMWriter", "DOMWriter\DOMWriter_vs110.vcxproj", "{A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrettyPrint", "PrettyPrint\PrettyPrint_vs110.vcxproj", "{DFA97011-8DD4-3A84-A0C9-EB2101BD6082}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SAXParser", "SAXParser\SAXParser_vs110.vcxproj", "{2A54653D-9F55-348B-8F79-A3E454563AE3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|Win32.Build.0 = release_shared|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|Win32.Build.0 = release_shared|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|Win32.Build.0 = release_shared|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|Win32.Build.0 = release_shared|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/XML/samples/samples_x64_vs110.sln b/XML/samples/samples_x64_vs110.sln index 311189e81..56dbe9f80 100644 --- a/XML/samples/samples_x64_vs110.sln +++ b/XML/samples/samples_x64_vs110.sln @@ -1,97 +1,97 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMParser", "DOMParser\DOMParser_x64_vs110.vcxproj", "{70F2F655-67D5-32A1-A99B-D4903547DB3E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMWriter", "DOMWriter\DOMWriter_x64_vs110.vcxproj", "{A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrettyPrint", "PrettyPrint\PrettyPrint_x64_vs110.vcxproj", "{DFA97011-8DD4-3A84-A0C9-EB2101BD6082}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SAXParser", "SAXParser\SAXParser_x64_vs110.vcxproj", "{2A54653D-9F55-348B-8F79-A3E454563AE3}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|x64.Build.0 = debug_shared|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|x64.ActiveCfg = release_shared|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|x64.Build.0 = release_shared|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|x64.Deploy.0 = release_shared|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|x64.Build.0 = release_static_md|x64 - {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|x64.Build.0 = debug_shared|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|x64.ActiveCfg = release_shared|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|x64.Build.0 = release_shared|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|x64.Deploy.0 = release_shared|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|x64.Build.0 = release_static_md|x64 - {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|x64.Build.0 = debug_shared|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|x64.ActiveCfg = release_shared|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|x64.Build.0 = release_shared|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|x64.Deploy.0 = release_shared|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|x64.Build.0 = release_static_md|x64 - {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|x64.Build.0 = debug_shared|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|x64.ActiveCfg = release_shared|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|x64.Build.0 = release_shared|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|x64.Deploy.0 = release_shared|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|x64.Build.0 = release_static_md|x64 - {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMParser", "DOMParser\DOMParser_x64_vs110.vcxproj", "{70F2F655-67D5-32A1-A99B-D4903547DB3E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMWriter", "DOMWriter\DOMWriter_x64_vs110.vcxproj", "{A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrettyPrint", "PrettyPrint\PrettyPrint_x64_vs110.vcxproj", "{DFA97011-8DD4-3A84-A0C9-EB2101BD6082}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SAXParser", "SAXParser\SAXParser_x64_vs110.vcxproj", "{2A54653D-9F55-348B-8F79-A3E454563AE3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|x64.Build.0 = debug_shared|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|x64.ActiveCfg = release_shared|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|x64.Build.0 = release_shared|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|x64.Deploy.0 = release_shared|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|x64.Build.0 = release_static_md|x64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|x64.Build.0 = debug_shared|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|x64.ActiveCfg = release_shared|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|x64.Build.0 = release_shared|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|x64.Deploy.0 = release_shared|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|x64.Build.0 = release_static_md|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|x64.Build.0 = debug_shared|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|x64.ActiveCfg = release_shared|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|x64.Build.0 = release_shared|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|x64.Deploy.0 = release_shared|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|x64.Build.0 = release_static_md|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|x64.Build.0 = debug_shared|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|x64.ActiveCfg = release_shared|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|x64.Build.0 = release_shared|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|x64.Deploy.0 = release_shared|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|x64.Build.0 = release_static_md|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/XML/testsuite/TestSuite_vs110.vcxproj b/XML/testsuite/TestSuite_vs110.vcxproj index 2caec3f45..8a8c3133e 100644 --- a/XML/testsuite/TestSuite_vs110.vcxproj +++ b/XML/testsuite/TestSuite_vs110.vcxproj @@ -1,355 +1,355 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/XML/testsuite/TestSuite_vs110.vcxproj.filters b/XML/testsuite/TestSuite_vs110.vcxproj.filters index f21bf2a00..cb03a8810 100644 --- a/XML/testsuite/TestSuite_vs110.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,174 +1,174 @@ - - - - - {dc11f6a9-d896-4052-83ab-49e2915bd574} - - - {185b5eb8-d5c4-45c4-8fab-f30408b6adb6} - - - {84083e8b-a0bb-4927-a135-6ac673c3f9e8} - - - {b7c8f7a8-df44-4e90-990b-7790de0ab641} - - - {b527ec97-93eb-495e-9fe8-164164efbd15} - - - {0073f7eb-a239-453d-a668-666cb52c9543} - - - {12b331fe-5593-4bb5-bb8c-dbc26f5b5abf} - - - {3d6f6c23-d197-44a1-8b5c-e366f35a8dab} - - - {9f9a1b22-8bd8-4a59-b164-7e01dde65f1e} - - - {014dad88-d054-4a1f-a92b-b0fbebc0f472} - - - {6a98d17d-176d-444c-8efa-7fd41c5b6448} - - - {9eb623ee-124f-4bd0-b2e4-96e9cc9c233b} - - - {bbcb34e3-d027-4f9e-a4bc-43f1540f9f7c} - - - {4322ebbf-73e5-460d-a876-e1742720657c} - - - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - _Suite\Header Files - - - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {dc11f6a9-d896-4052-83ab-49e2915bd574} + + + {185b5eb8-d5c4-45c4-8fab-f30408b6adb6} + + + {84083e8b-a0bb-4927-a135-6ac673c3f9e8} + + + {b7c8f7a8-df44-4e90-990b-7790de0ab641} + + + {b527ec97-93eb-495e-9fe8-164164efbd15} + + + {0073f7eb-a239-453d-a668-666cb52c9543} + + + {12b331fe-5593-4bb5-bb8c-dbc26f5b5abf} + + + {3d6f6c23-d197-44a1-8b5c-e366f35a8dab} + + + {9f9a1b22-8bd8-4a59-b164-7e01dde65f1e} + + + {014dad88-d054-4a1f-a92b-b0fbebc0f472} + + + {6a98d17d-176d-444c-8efa-7fd41c5b6448} + + + {9eb623ee-124f-4bd0-b2e4-96e9cc9c233b} + + + {bbcb34e3-d027-4f9e-a4bc-43f1540f9f7c} + + + {4322ebbf-73e5-460d-a876-e1742720657c} + + + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + _Suite\Header Files + + + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/XML/testsuite/TestSuite_x64_vs110.vcxproj b/XML/testsuite/TestSuite_x64_vs110.vcxproj index 6f4e51b6e..86acf6646 100644 --- a/XML/testsuite/TestSuite_x64_vs110.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,355 +1,355 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters index 4595342f9..3ce3da78e 100644 --- a/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,174 +1,174 @@ - - - - - {e8d74e03-4ed0-4f0c-a885-e2c710b6b8a2} - - - {aabd48ee-5b85-4eb4-b48a-570e3a91d365} - - - {ba4ce0ea-beec-4620-bf7b-36432c64d3e8} - - - {323cae6d-0986-4769-8123-14b29e23d8e1} - - - {6a3deea2-fb3d-48e1-bec3-9446b792a94f} - - - {54dd977d-1f8d-4e98-9ece-7f40789b5213} - - - {eba97977-14ad-418a-8b32-ec7271e009de} - - - {1b673858-12ef-40d8-ba3e-e208ba57d8ed} - - - {a0432bd9-8262-4946-86ab-977f1359b30d} - - - {f59fa045-6459-459c-994f-ce9353441b36} - - - {0ce773d7-7672-429b-91d9-82f2db18c205} - - - {c4f935f3-e04e-4f33-9697-d76f16d2d1a6} - - - {6b997d35-c68f-4414-96c4-cb27824a1e49} - - - {2019b12d-d20e-4ce2-86e0-c57355cd58d5} - - - - - XML\Header Files - - - XML\Header Files - - - XML\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - SAX\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - DOM\Header Files - - - _Suite\Header Files - - - - - XML\Source Files - - - XML\Source Files - - - XML\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - SAX\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - DOM\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {e8d74e03-4ed0-4f0c-a885-e2c710b6b8a2} + + + {aabd48ee-5b85-4eb4-b48a-570e3a91d365} + + + {ba4ce0ea-beec-4620-bf7b-36432c64d3e8} + + + {323cae6d-0986-4769-8123-14b29e23d8e1} + + + {6a3deea2-fb3d-48e1-bec3-9446b792a94f} + + + {54dd977d-1f8d-4e98-9ece-7f40789b5213} + + + {eba97977-14ad-418a-8b32-ec7271e009de} + + + {1b673858-12ef-40d8-ba3e-e208ba57d8ed} + + + {a0432bd9-8262-4946-86ab-977f1359b30d} + + + {f59fa045-6459-459c-994f-ce9353441b36} + + + {0ce773d7-7672-429b-91d9-82f2db18c205} + + + {c4f935f3-e04e-4f33-9697-d76f16d2d1a6} + + + {6b997d35-c68f-4414-96c4-cb27824a1e49} + + + {2019b12d-d20e-4ce2-86e0-c57355cd58d5} + + + + + XML\Header Files + + + XML\Header Files + + + XML\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + SAX\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + DOM\Header Files + + + _Suite\Header Files + + + + + XML\Source Files + + + XML\Source Files + + + XML\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + SAX\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + DOM\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Zip/Zip_vs110.sln b/Zip/Zip_vs110.sln index 4f005a006..b5288fc51 100644 --- a/Zip/Zip_vs110.sln +++ b/Zip/Zip_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zip", "Zip_vs110.vcxproj", "{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}" - ProjectSection(ProjectDependencies) = postProject - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} = {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|Win32.Build.0 = release_shared|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|Win32.Build.0 = release_shared|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zip", "Zip_vs110.vcxproj", "{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}" + ProjectSection(ProjectDependencies) = postProject + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} = {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|Win32.Build.0 = release_shared|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|Win32.Build.0 = release_shared|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Zip/Zip_vs110.vcxproj b/Zip/Zip_vs110.vcxproj index 43e7b0471..f1fa0c3ff 100644 --- a/Zip/Zip_vs110.vcxproj +++ b/Zip/Zip_vs110.vcxproj @@ -1,329 +1,329 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Zip - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} - Zip - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoZipd - PocoZipmdd - PocoZipmtd - PocoZip - PocoZipmd - PocoZipmt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - 4244;4267;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoZipd.dll - true - true - ..\bin\PocoZipd.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoZipd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoZip.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoZip.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoZipmtd.pdb - Level3 - EditAndContinue - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\PocoZipmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\PocoZipmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoZipmdd.pdb - Level3 - EditAndContinue - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\PocoZipmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoZipmd.pdb - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoZipmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Zip + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} + Zip + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoZipd + PocoZipmdd + PocoZipmtd + PocoZip + PocoZipmd + PocoZipmt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + 4244;4267;%(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoZipd.dll + true + true + ..\bin\PocoZipd.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoZipd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + 4244;4267;%(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin\PocoZip.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoZip.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoZipmtd.pdb + Level3 + EditAndContinue + Default + 4244;4267;%(DisableSpecificWarnings) + + + ..\lib\PocoZipmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + 4244;4267;%(DisableSpecificWarnings) + + + ..\lib\PocoZipmt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoZipmdd.pdb + Level3 + EditAndContinue + Default + 4244;4267;%(DisableSpecificWarnings) + + + ..\lib\PocoZipmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoZipmd.pdb + Level3 + + Default + 4244;4267;%(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoZipmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Zip/Zip_vs110.vcxproj.filters b/Zip/Zip_vs110.vcxproj.filters index 3dd5d99e1..98f63bba6 100644 --- a/Zip/Zip_vs110.vcxproj.filters +++ b/Zip/Zip_vs110.vcxproj.filters @@ -1,165 +1,165 @@ - - - - - {89ee6501-3d79-4da0-8455-a5a3c63aee53} - - - {61fad059-d6a1-42c8-9681-a1ac8cb3738f} - - - {443964da-eb84-4b15-b5f4-30ab76713f50} - - - {c099fdaf-74e2-47d2-88d5-e8da3878ed53} - - - {31e470b5-f10e-415e-a8ef-dbac5b600275} - - - {c685b632-d1f6-4fe6-8525-969065b0a481} - - - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - - - + + + + + {89ee6501-3d79-4da0-8455-a5a3c63aee53} + + + {61fad059-d6a1-42c8-9681-a1ac8cb3738f} + + + {443964da-eb84-4b15-b5f4-30ab76713f50} + + + {c099fdaf-74e2-47d2-88d5-e8da3878ed53} + + + {31e470b5-f10e-415e-a8ef-dbac5b600275} + + + {c685b632-d1f6-4fe6-8525-969065b0a481} + + + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + + + \ No newline at end of file diff --git a/Zip/Zip_x64_vs110.sln b/Zip/Zip_x64_vs110.sln index 889a0d13c..8c6a774aa 100644 --- a/Zip/Zip_x64_vs110.sln +++ b/Zip/Zip_x64_vs110.sln @@ -1,60 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zip", "Zip_x64_vs110.vcxproj", "{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}" - ProjectSection(ProjectDependencies) = postProject - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} = {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|x64.Build.0 = debug_shared|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|x64.ActiveCfg = release_shared|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|x64.Build.0 = release_shared|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|x64.Deploy.0 = release_shared|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|x64.Build.0 = release_static_md|x64 - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|x64.Build.0 = debug_shared|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|x64.ActiveCfg = release_shared|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|x64.Build.0 = release_shared|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|x64.Deploy.0 = release_shared|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|x64.Build.0 = release_static_md|x64 - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zip", "Zip_x64_vs110.vcxproj", "{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}" + ProjectSection(ProjectDependencies) = postProject + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} = {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|x64.Build.0 = debug_shared|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|x64.ActiveCfg = release_shared|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|x64.Build.0 = release_shared|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|x64.Deploy.0 = release_shared|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|x64.Build.0 = release_static_md|x64 + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|x64.Build.0 = debug_shared|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|x64.ActiveCfg = release_shared|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|x64.Build.0 = release_shared|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|x64.Deploy.0 = release_shared|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|x64.Build.0 = release_static_md|x64 + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Zip/Zip_x64_vs110.vcxproj b/Zip/Zip_x64_vs110.vcxproj index d85a54037..8911121e3 100644 --- a/Zip/Zip_x64_vs110.vcxproj +++ b/Zip/Zip_x64_vs110.vcxproj @@ -1,327 +1,327 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - Zip - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} - Zip - Win32Proj - - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\bin64\ - obj64\$(Configuration)\ - true - ..\bin64\ - obj64\$(Configuration)\ - false - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - ..\lib64\ - obj64\$(Configuration)\ - PocoZip64d - PocoZipmdd - PocoZipmtd - PocoZip64 - PocoZipmd - PocoZipmt - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin64\PocoZip64d.dll - true - true - ..\bin64\PocoZip64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoZipd.lib - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin64\PocoZip64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoZip.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoZipmtd.pdb - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib64\PocoZipmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib64\PocoZipmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoZipmdd.pdb - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib64\PocoZipmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib64\PocoZipmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Zip + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} + Zip + Win32Proj + + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + StaticLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\bin64\ + obj64\$(Configuration)\ + true + ..\bin64\ + obj64\$(Configuration)\ + false + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + ..\lib64\ + obj64\$(Configuration)\ + PocoZip64d + PocoZipmdd + PocoZipmtd + PocoZip64 + PocoZipmd + PocoZipmt + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + 4244;4267;%(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin64\PocoZip64d.dll + true + true + ..\bin64\PocoZip64d.pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoZipd.lib + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + 4244;4267;%(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\bin64\PocoZip64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoZip.lib + MachineX64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib64\PocoZipmtd.pdb + Level3 + ProgramDatabase + Default + 4244;4267;%(DisableSpecificWarnings) + + + ..\lib64\PocoZipmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + 4244;4267;%(DisableSpecificWarnings) + + + ..\lib64\PocoZipmt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib64\PocoZipmdd.pdb + Level3 + ProgramDatabase + Default + 4244;4267;%(DisableSpecificWarnings) + + + ..\lib64\PocoZipmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + 4244;4267;%(DisableSpecificWarnings) + + + ..\lib64\PocoZipmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Zip/Zip_x64_vs110.vcxproj.filters b/Zip/Zip_x64_vs110.vcxproj.filters index 0aa7ca18e..87245796d 100644 --- a/Zip/Zip_x64_vs110.vcxproj.filters +++ b/Zip/Zip_x64_vs110.vcxproj.filters @@ -1,165 +1,165 @@ - - - - - {656b3c18-a1d5-457a-9f8e-e5ffa1ae364e} - - - {09e2d9b8-7e31-4049-bc62-5a5f8f63fb4e} - - - {e3260f47-7e0b-4b23-ab5b-e218ec23fd67} - - - {ac4c42e0-56b2-4dd0-951e-a40bdaaf0f7d} - - - {4b54b78e-b7b8-4659-9866-613de74cce54} - - - {823f37f8-41f1-4830-9a5a-d10892923527} - - - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - - - + + + + + {656b3c18-a1d5-457a-9f8e-e5ffa1ae364e} + + + {09e2d9b8-7e31-4049-bc62-5a5f8f63fb4e} + + + {e3260f47-7e0b-4b23-ab5b-e218ec23fd67} + + + {ac4c42e0-56b2-4dd0-951e-a40bdaaf0f7d} + + + {4b54b78e-b7b8-4659-9866-613de74cce54} + + + {823f37f8-41f1-4830-9a5a-d10892923527} + + + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + Manipulation\Header Files + + + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + Manipulation\Source Files + + + + + \ No newline at end of file diff --git a/Zip/samples/samples_vs110.sln b/Zip/samples/samples_vs110.sln index 642d0bbe8..81b4430ac 100644 --- a/Zip/samples/samples_vs110.sln +++ b/Zip/samples/samples_vs110.sln @@ -1,57 +1,57 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zip", "zip\zip_vs110.vcxproj", "{7F3AD0E5-A150-3AE7-9041-9086C45020C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unzip", "unzip\unzip_vs110.vcxproj", "{9FE5275A-E14A-30C2-9C5B-AEBDE780608F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|Win32.Build.0 = release_shared|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|Win32.Build.0 = release_shared|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zip", "zip\zip_vs110.vcxproj", "{7F3AD0E5-A150-3AE7-9041-9086C45020C0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unzip", "unzip\unzip_vs110.vcxproj", "{9FE5275A-E14A-30C2-9C5B-AEBDE780608F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|Win32.Build.0 = release_shared|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|Win32.Build.0 = release_shared|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Zip/samples/samples_x64_vs110.sln b/Zip/samples/samples_x64_vs110.sln index e4620533b..b56f1b3af 100644 --- a/Zip/samples/samples_x64_vs110.sln +++ b/Zip/samples/samples_x64_vs110.sln @@ -1,57 +1,57 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zip", "zip\zip_x64_vs110.vcxproj", "{7F3AD0E5-A150-3AE7-9041-9086C45020C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unzip", "unzip\unzip_x64_vs110.vcxproj", "{9FE5275A-E14A-30C2-9C5B-AEBDE780608F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 - debug_static_md|x64 = debug_static_md|x64 - release_static_md|x64 = release_static_md|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|x64.Build.0 = debug_shared|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|x64.ActiveCfg = release_shared|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|x64.Build.0 = release_shared|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|x64.Deploy.0 = release_shared|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|x64.Build.0 = release_static_md|x64 - {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|x64.Build.0 = debug_shared|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|x64.ActiveCfg = release_shared|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|x64.Build.0 = release_shared|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|x64.Deploy.0 = release_shared|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|x64.Build.0 = release_static_md|x64 - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|x64.Deploy.0 = release_static_md|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zip", "zip\zip_x64_vs110.vcxproj", "{7F3AD0E5-A150-3AE7-9041-9086C45020C0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unzip", "unzip\unzip_x64_vs110.vcxproj", "{9FE5275A-E14A-30C2-9C5B-AEBDE780608F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|x64.Build.0 = debug_shared|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|x64.ActiveCfg = release_shared|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|x64.Build.0 = release_shared|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|x64.Deploy.0 = release_shared|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|x64.Build.0 = release_static_md|x64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|x64.Build.0 = debug_shared|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|x64.ActiveCfg = release_shared|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|x64.Build.0 = release_shared|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|x64.Deploy.0 = release_shared|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|x64.Build.0 = release_static_md|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Zip/samples/unzip/unzip_vs110.vcxproj b/Zip/samples/unzip/unzip_vs110.vcxproj index 581e616cb..278059e8e 100644 --- a/Zip/samples/unzip/unzip_vs110.vcxproj +++ b/Zip/samples/unzip/unzip_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - unzip - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F} - unzip - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - unzipd - unzipd - unzipd - unzip - unzip - unzip - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\unzipd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\unzipd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\unzip.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\unzipd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\unzipd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\unzip.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\unzipd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\unzipd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\unzip.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + unzip + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F} + unzip + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + unzipd + unzipd + unzipd + unzip + unzip + unzip + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\unzipd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\unzipd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\unzip.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\unzipd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\unzipd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\unzip.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\unzipd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\unzipd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\unzip.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Zip/samples/unzip/unzip_vs110.vcxproj.filters b/Zip/samples/unzip/unzip_vs110.vcxproj.filters index 1d79d8fb6..22d888968 100644 --- a/Zip/samples/unzip/unzip_vs110.vcxproj.filters +++ b/Zip/samples/unzip/unzip_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {b2889132-f36b-4c57-a197-1189b52c46bd} - - - {eb4b0e5f-460c-48b7-ab1e-5cd2cbd6b590} - - - - - Source Files - - + + + + + {b2889132-f36b-4c57-a197-1189b52c46bd} + + + {eb4b0e5f-460c-48b7-ab1e-5cd2cbd6b590} + + + + + Source Files + + \ No newline at end of file diff --git a/Zip/samples/unzip/unzip_x64_vs110.vcxproj b/Zip/samples/unzip/unzip_x64_vs110.vcxproj index 7f5ef324d..5a1536a5d 100644 --- a/Zip/samples/unzip/unzip_x64_vs110.vcxproj +++ b/Zip/samples/unzip/unzip_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - unzip - {9FE5275A-E14A-30C2-9C5B-AEBDE780608F} - unzip - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - unzipd - unzipd - unzipd - unzip - unzip - unzip - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\unzipd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\unzipd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\unzip.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\unzipd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\unzipd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\unzip.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\unzipd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\unzipd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\unzip.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + unzip + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F} + unzip + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + unzipd + unzipd + unzipd + unzip + unzip + unzip + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\unzipd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\unzipd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\unzip.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\unzipd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\unzipd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\unzip.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\unzipd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\unzipd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\unzip.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Zip/samples/unzip/unzip_x64_vs110.vcxproj.filters b/Zip/samples/unzip/unzip_x64_vs110.vcxproj.filters index 4e848b4a6..a9d2ea96d 100644 --- a/Zip/samples/unzip/unzip_x64_vs110.vcxproj.filters +++ b/Zip/samples/unzip/unzip_x64_vs110.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {0108e417-e11b-414b-be4c-0572b01a5978} - - - {03207af1-bae3-4aaf-945f-bc044142ce47} - - - - - Source Files - - + + + + + {0108e417-e11b-414b-be4c-0572b01a5978} + + + {03207af1-bae3-4aaf-945f-bc044142ce47} + + + + + Source Files + + \ No newline at end of file diff --git a/Zip/samples/zip/zip_vs110.vcxproj b/Zip/samples/zip/zip_vs110.vcxproj index 7097ab27b..d85f52f4f 100644 --- a/Zip/samples/zip/zip_vs110.vcxproj +++ b/Zip/samples/zip/zip_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - zip - {7F3AD0E5-A150-3AE7-9041-9086C45020C0} - zip - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - zipd - zipd - zipd - zip - zip - zip - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\zipd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\zipd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\zip.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\zipd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_mt\zipd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_mt\zip.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\zipd.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\zipd.pdb - Console - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin\static_md\zip.exe - ..\..\..\lib;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX86 - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + zip + {7F3AD0E5-A150-3AE7-9041-9086C45020C0} + zip + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + zipd + zipd + zipd + zip + zip + zip + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\zipd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\zipd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\zip.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\zipd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\zipd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\zip.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\zipd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\zipd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\zip.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Zip/samples/zip/zip_vs110.vcxproj.filters b/Zip/samples/zip/zip_vs110.vcxproj.filters index 9cd76314f..34731b62e 100644 --- a/Zip/samples/zip/zip_vs110.vcxproj.filters +++ b/Zip/samples/zip/zip_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {08ff4bea-99d8-4f6a-ad1d-0ae6ff1a2ec9} - - - - - Source Files - - + + + + + {08ff4bea-99d8-4f6a-ad1d-0ae6ff1a2ec9} + + + + + Source Files + + \ No newline at end of file diff --git a/Zip/samples/zip/zip_x64_vs110.vcxproj b/Zip/samples/zip/zip_x64_vs110.vcxproj index 5d2710759..553b83e72 100644 --- a/Zip/samples/zip/zip_x64_vs110.vcxproj +++ b/Zip/samples/zip/zip_x64_vs110.vcxproj @@ -1,305 +1,305 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - zip - {7F3AD0E5-A150-3AE7-9041-9086C45020C0} - zip - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - zipd - zipd - zipd - zip - zip - zip - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\zipd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\zipd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\zip.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\zipd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_mt\zipd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_mt\zip.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\zipd.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\zipd.pdb - Console - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - bin64\static_md\zip.exe - ..\..\..\lib64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + zip + {7F3AD0E5-A150-3AE7-9041-9086C45020C0} + zip + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + zipd + zipd + zipd + zip + zip + zip + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\zipd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\zipd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\zip.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\zipd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\zipd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\zip.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\zipd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\zipd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\zip.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Zip/samples/zip/zip_x64_vs110.vcxproj.filters b/Zip/samples/zip/zip_x64_vs110.vcxproj.filters index fccd31714..9ea0dfc8c 100644 --- a/Zip/samples/zip/zip_x64_vs110.vcxproj.filters +++ b/Zip/samples/zip/zip_x64_vs110.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {998ee794-4c7f-467b-ab27-46311c6e57a8} - - - - - Source Files - - + + + + + {998ee794-4c7f-467b-ab27-46311c6e57a8} + + + + + Source Files + + \ No newline at end of file diff --git a/Zip/testsuite/TestSuite_vs110.vcxproj b/Zip/testsuite/TestSuite_vs110.vcxproj index 7a9c87eb4..90e059f1a 100644 --- a/Zip/testsuite/TestSuite_vs110.vcxproj +++ b/Zip/testsuite/TestSuite_vs110.vcxproj @@ -1,323 +1,323 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - TestSuite - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin\static_mt\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_mt\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX86 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuited.exe - ..\..\lib;%(AdditionalLibraryDirectories) - true - true - bin\static_md\TestSuited.pdb - Windows - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin\static_md\TestSuite.exe - ..\..\lib;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + TestSuite + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin\static_mt\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_mt\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX86 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuited.exe + ..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\TestSuited.pdb + Windows + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin\static_md\TestSuite.exe + ..\..\lib;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + diff --git a/Zip/testsuite/TestSuite_vs110.vcxproj.filters b/Zip/testsuite/TestSuite_vs110.vcxproj.filters index 677e02c22..988f353af 100644 --- a/Zip/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs110.vcxproj.filters @@ -1,60 +1,60 @@ - - - - - {a16c665b-5700-4a2a-af8e-f80cd1f21d3f} - - - {04d0b6bf-24ec-4025-a4e2-85ef7f9121d2} - - - {a1228aed-c68a-431e-b256-6d8b1870e971} - - - {0d521ea5-f63d-4c9d-98c7-e0618015e758} - - - {b5d8dcbc-e354-4d97-8702-9b0aee7c6f83} - - - {881f920e-f0d6-48d9-93a4-12e7710f5fd9} - - - {18f7676e-1498-4d9a-9f38-ebc458351e07} - - - {f9dd095a-d8b0-4a0f-9a8a-0891cb07a6e9} - - - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - _Suite\Header Files - - - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {a16c665b-5700-4a2a-af8e-f80cd1f21d3f} + + + {04d0b6bf-24ec-4025-a4e2-85ef7f9121d2} + + + {a1228aed-c68a-431e-b256-6d8b1870e971} + + + {0d521ea5-f63d-4c9d-98c7-e0618015e758} + + + {b5d8dcbc-e354-4d97-8702-9b0aee7c6f83} + + + {881f920e-f0d6-48d9-93a4-12e7710f5fd9} + + + {18f7676e-1498-4d9a-9f38-ebc458351e07} + + + {f9dd095a-d8b0-4a0f-9a8a-0891cb07a6e9} + + + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + _Suite\Header Files + + + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/Zip/testsuite/TestSuite_x64_vs110.vcxproj b/Zip/testsuite/TestSuite_x64_vs110.vcxproj index 8829dbfad..33d4f59e4 100644 --- a/Zip/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs110.vcxproj @@ -1,323 +1,323 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - TestSuite - {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7} - TestSuite - Win32Proj - - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Static - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - Application - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - bin64\ - obj64\$(Configuration)\ - true - bin64\ - obj64\$(Configuration)\ - false - bin64\static_mt\ - obj64\$(Configuration)\ - true - bin64\static_mt\ - obj64\$(Configuration)\ - false - bin64\static_md\ - obj64\$(Configuration)\ - true - bin64\static_md\ - obj64\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) - bin64\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) - bin64\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - true - true - bin64\static_mt\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_mt\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - false - Windows - true - true - MachineX64 - - - - - Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - %(DisableSpecificWarnings) - - - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuited.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - true - true - bin64\static_md\TestSuited.pdb - Windows - MachineX64 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) - bin64\static_md\TestSuite.exe - ..\..\lib64;%(AdditionalLibraryDirectories) - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + TestSuite + {9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7} + TestSuite + Win32Proj + + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Static + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + Application + Dynamic + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies) + bin64\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies) + bin64\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + true + bin64\static_mt\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_mt\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + false + Windows + true + true + MachineX64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuited.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\TestSuited.pdb + Windows + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + bin64\static_md\TestSuite.exe + ..\..\lib64;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + diff --git a/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters index 33b7ea853..4d4042b9a 100644 --- a/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -1,60 +1,60 @@ - - - - - {3154f242-146e-48cb-99bd-918a15137083} - - - {01a9ac05-669a-4932-8ee3-4a38d2ba2df0} - - - {db677391-ebfb-41c4-a34d-ecb5e384a787} - - - {a1604e87-69cb-461e-ab69-32e840549588} - - - {0ec83424-3133-4d9e-9429-c7f3fb7ff190} - - - {12e450b3-30b6-481c-9336-d6ceb02f17d9} - - - {322dd378-27e9-42cf-b47c-e9cc990819dc} - - - {9969b312-db96-4418-848a-192a4c40572e} - - - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - _Suite\Header Files - - - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - _Suite\Source Files - - - _Driver\Source Files - - + + + + + {3154f242-146e-48cb-99bd-918a15137083} + + + {01a9ac05-669a-4932-8ee3-4a38d2ba2df0} + + + {db677391-ebfb-41c4-a34d-ecb5e384a787} + + + {a1604e87-69cb-461e-ab69-32e840549588} + + + {0ec83424-3133-4d9e-9429-c7f3fb7ff190} + + + {12e450b3-30b6-481c-9336-d6ceb02f17d9} + + + {322dd378-27e9-42cf-b47c-e9cc990819dc} + + + {9969b312-db96-4418-848a-192a4c40572e} + + + + + Zip\Header Files + + + Zip\Header Files + + + Zip\Header Files + + + _Suite\Header Files + + + + + Zip\Source Files + + + Zip\Source Files + + + Zip\Source Files + + + _Suite\Source Files + + + _Driver\Source Files + + \ No newline at end of file diff --git a/build_cmake.cmd b/build_cmake.cmd index 9bb5a92f5..b20532a98 100644 --- a/build_cmake.cmd +++ b/build_cmake.cmd @@ -1,19 +1,19 @@ -# POCO_STATIC=1 - for static build -# POCO_UNBUNDLED - for no built-in version of libs -# CMAKE_INSTALL_PREFIX=path - for install path - -mkdir cmake-build -cd cmake-build - -cmake ../. -DCMAKE_BUILD_TYPE=Debug -G"NMake Makefiles JOM" %1 %2 %3 %4 %5 -jom /j3 -jom install - -del CMakeCache.txt - -cmake ../. -DCMAKE_BUILD_TYPE=Release -G"NMake Makefiles JOM" %1 %2 %3 %4 %5 -jom /j3 -jom install - - -cd .. +# POCO_STATIC=1 - for static build +# POCO_UNBUNDLED - for no built-in version of libs +# CMAKE_INSTALL_PREFIX=path - for install path + +mkdir cmake-build +cd cmake-build + +cmake ../. -DCMAKE_BUILD_TYPE=Debug -G"NMake Makefiles JOM" %1 %2 %3 %4 %5 +jom /j3 +jom install + +del CMakeCache.txt + +cmake ../. -DCMAKE_BUILD_TYPE=Release -G"NMake Makefiles JOM" %1 %2 %3 %4 %5 +jom /j3 +jom install + + +cd .. From ad28e2fed59f65c9bea90d0ab3422b24d9c69075 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 11 Nov 2012 10:25:35 +0100 Subject: [PATCH 018/165] more line ending fixes --- Util/testsuite/src/JSONConfigurationTest.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Util/testsuite/src/JSONConfigurationTest.cpp b/Util/testsuite/src/JSONConfigurationTest.cpp index ef30079d8..82d348325 100644 --- a/Util/testsuite/src/JSONConfigurationTest.cpp +++ b/Util/testsuite/src/JSONConfigurationTest.cpp @@ -28,12 +28,15 @@ // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. // + + #include "JSONConfigurationTest.h" #include "CppUnit/TestCaller.h" #include "CppUnit/TestSuite.h" #include "Poco/Util/JSONConfiguration.h" #include "Poco/JSON/JSONException.h" + using Poco::Util::JSONConfiguration; using Poco::Util::AbstractConfiguration; using Poco::AutoPtr; @@ -102,6 +105,7 @@ void JSONConfigurationTest::testLoad() } + AbstractConfiguration* JSONConfigurationTest::allocConfiguration() const { return new JSONConfiguration; From 28406fdff12a47ef3c4ac5a394dd38bfd6c2c1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Sun, 11 Nov 2012 10:42:13 +0100 Subject: [PATCH 019/165] Updated README.md with info regarding line endings --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a457e4aee..f21e10374 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,11 @@ -poco -==== +POCO C++ Libraries +================== When contributing to POCO, please adhere to our coding styleguide: http://www.appinf.com/download/CppCodingStyleGuide.pdf We use the branching model described in this article: http://nvie.com/posts/a-successful-git-branching-model/ + +All text file line endings in the repository must be Unix-style (LF). +This includes Visual Studio project and solution files (.sln, .vcproj, .vcxproj, .vcxproj.filters). From 87d7739f3dba60b7f04bee13eb6e32f70159c9a5 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 11 Nov 2012 10:53:02 +0100 Subject: [PATCH 020/165] removed .vcxproj.user files --- ApacheConnector/ApacheConnector_vs110.vcxproj.user | 3 --- ApacheConnector/ApacheConnector_x64_vs110.vcxproj.user | 3 --- .../samples/FormServer/FormServer_vs110.vcxproj.user | 3 --- .../samples/FormServer/FormServer_x64_vs110.vcxproj.user | 3 --- .../samples/TimeServer/TimeServer_vs110.vcxproj.user | 3 --- .../samples/TimeServer/TimeServer_x64_vs110.vcxproj.user | 3 --- CppParser/CppParser_vs110.vcxproj.user | 3 --- CppParser/CppParser_x64_vs110.vcxproj.user | 3 --- CppParser/testsuite/TestSuite_vs110.vcxproj.user | 3 --- CppParser/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- Crypto/Crypto_vs110.vcxproj.user | 3 --- Crypto/Crypto_x64_vs110.vcxproj.user | 3 --- Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.user | 3 --- Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.user | 3 --- Crypto/testsuite/TestSuite_vs110.vcxproj.user | 3 --- Crypto/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- Data/Data_vs110.vcxproj.user | 3 --- Data/Data_x64_vs110.vcxproj.user | 3 --- Data/MySQL/MySQL_vs110.vcxproj.user | 3 --- Data/MySQL/MySQL_x64_vs110.vcxproj.user | 3 --- Data/MySQL/testsuite/TestSuite_vs110.vcxproj.user | 3 --- Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- Data/ODBC/ODBC_vs110.vcxproj.user | 3 --- Data/ODBC/ODBC_x64_vs110.vcxproj.user | 3 --- Data/ODBC/testsuite/TestSuite_vs110.vcxproj.user | 3 --- Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- Data/SQLite/SQLite_vs110.vcxproj.user | 3 --- Data/SQLite/SQLite_x64_vs110.vcxproj.user | 3 --- Data/SQLite/testsuite/TestSuite_vs110.vcxproj.user | 3 --- Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- Data/samples/Binding/Binding_vs110.vcxproj.user | 3 --- Data/samples/Binding/Binding_x64_vs110.vcxproj.user | 3 --- Data/samples/RecordSet/RecordSet_vs110.vcxproj.user | 3 --- Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.user | 3 --- Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.user | 3 --- Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.user | 3 --- Data/samples/Tuple/Tuple_vs110.vcxproj.user | 3 --- Data/samples/Tuple/Tuple_x64_vs110.vcxproj.user | 3 --- Data/samples/TypeHandler/TypeHandler_vs110.vcxproj.user | 3 --- Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj.user | 3 --- Data/testsuite/TestSuite_vs110.vcxproj.user | 3 --- Data/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- .../samples/ActiveMethod/ActiveMethod_vs110.vcxproj.user | 3 --- .../samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj.user | 3 --- Foundation/samples/Activity/Activity_vs110.vcxproj.user | 3 --- Foundation/samples/Activity/Activity_x64_vs110.vcxproj.user | 3 --- .../BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj.user | 3 --- .../BinaryReaderWriter_x64_vs110.vcxproj.user | 3 --- Foundation/samples/DateTime/DateTime_vs110.vcxproj.user | 3 --- Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj.user | 3 --- Foundation/samples/LogRotation/LogRotation_vs110.vcxproj.user | 3 --- .../samples/LogRotation/LogRotation_x64_vs110.vcxproj.user | 3 --- Foundation/samples/Logger/Logger_vs110.vcxproj.user | 3 --- Foundation/samples/Logger/Logger_x64_vs110.vcxproj.user | 3 --- .../NotificationQueue/NotificationQueue_vs110.vcxproj.user | 3 --- .../NotificationQueue/NotificationQueue_x64_vs110.vcxproj.user | 3 --- .../samples/StringTokenizer/StringTokenizer_vs110.vcxproj.user | 3 --- .../StringTokenizer/StringTokenizer_x64_vs110.vcxproj.user | 3 --- Foundation/samples/Timer/Timer_vs110.vcxproj.user | 3 --- Foundation/samples/Timer/Timer_x64_vs110.vcxproj.user | 3 --- Foundation/samples/URI/URI_vs110.vcxproj.user | 3 --- Foundation/samples/URI/URI_x64_vs110.vcxproj.user | 3 --- .../samples/base64decode/base64decode_vs110.vcxproj.user | 3 --- .../samples/base64decode/base64decode_x64_vs110.vcxproj.user | 3 --- .../samples/base64encode/base64encode_vs110.vcxproj.user | 3 --- .../samples/base64encode/base64encode_x64_vs110.vcxproj.user | 3 --- Foundation/samples/deflate/deflate_vs110.vcxproj.user | 3 --- Foundation/samples/deflate/deflate_x64_vs110.vcxproj.user | 3 --- Foundation/samples/dir/dir_vs110.vcxproj.user | 3 --- Foundation/samples/dir/dir_x64_vs110.vcxproj.user | 3 --- Foundation/samples/grep/grep_vs110.vcxproj.user | 3 --- Foundation/samples/grep/grep_x64_vs110.vcxproj.user | 3 --- Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj.user | 3 --- Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj.user | 3 --- Foundation/samples/inflate/inflate_vs110.vcxproj.user | 3 --- Foundation/samples/inflate/inflate_x64_vs110.vcxproj.user | 3 --- Foundation/samples/md5/md5_vs110.vcxproj.user | 3 --- Foundation/samples/md5/md5_x64_vs110.vcxproj.user | 3 --- Foundation/samples/uuidgen/uuidgen_vs110.vcxproj.user | 3 --- Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj.user | 3 --- JSON/JSON_vs110.vcxproj.user | 3 --- JSON/JSON_x64_vs110.vcxproj.user | 3 --- JSON/testsuite/TestSuite_vs110.vcxproj.user | 3 --- JSON/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- Net/Net_vs110.vcxproj.user | 3 --- Net/Net_x64_vs110.vcxproj.user | 3 --- Net/samples/EchoServer/EchoServer_vs110.vcxproj.user | 3 --- Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj.user | 3 --- Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj.user | 3 --- .../HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj.user | 3 --- Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj.user | 3 --- Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj.user | 3 --- Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.user | 3 --- .../HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.user | 3 --- Net/samples/Mail/Mail_vs110.vcxproj.user | 3 --- Net/samples/Mail/Mail_x64_vs110.vcxproj.user | 3 --- Net/samples/Ping/Ping_vs110.vcxproj.user | 3 --- Net/samples/Ping/Ping_x64_vs110.vcxproj.user | 3 --- Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj.user | 3 --- Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj.user | 3 --- Net/samples/TimeServer/TimeServer_vs110.vcxproj.user | 3 --- Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj.user | 3 --- Net/samples/TwitterClient/TwitterClient_vs110.vcxproj.user | 3 --- Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj.user | 3 --- Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj.user | 3 --- .../WebSocketServer/WebSocketServer_x64_vs110.vcxproj.user | 3 --- Net/samples/dict/dict_vs110.vcxproj.user | 3 --- Net/samples/dict/dict_x64_vs110.vcxproj.user | 3 --- Net/samples/download/download_vs110.vcxproj.user | 3 --- Net/samples/download/download_x64_vs110.vcxproj.user | 3 --- Net/samples/httpget/httpget_vs110.vcxproj.user | 3 --- Net/samples/httpget/httpget_x64_vs110.vcxproj.user | 3 --- Net/testsuite/TestSuite_vs110.vcxproj.user | 3 --- Net/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.user | 3 --- NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.user | 3 --- .../samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj.user | 3 --- .../HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj.user | 3 --- NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj.user | 3 --- NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj.user | 3 --- NetSSL_OpenSSL/samples/download/download_vs110.vcxproj.user | 3 --- .../samples/download/download_x64_vs110.vcxproj.user | 3 --- NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.user | 3 --- NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- PDF/PDF_vs110.vcxproj.user | 3 --- PDF/PDF_x64_vs110.vcxproj.user | 3 --- PDF/samples/Image/Image_vs110.vcxproj.user | 3 --- PDF/samples/Image/Image_x64_vs110.vcxproj.user | 3 --- PDF/samples/Text/Text_vs110.vcxproj.user | 3 --- PDF/samples/Text/Text_x64_vs110.vcxproj.user | 3 --- PDF/testsuite/TestSuite_vs110.vcxproj.user | 3 --- PDF/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- PageCompiler/File2Page/File2Page_vs110.vcxproj.user | 3 --- PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.user | 3 --- PageCompiler/PageCompiler_vs110.vcxproj.user | 3 --- PageCompiler/PageCompiler_x64_vs110.vcxproj.user | 3 --- .../samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.user | 3 --- .../HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.user | 3 --- PocoDoc/PocoDoc_vs110.vcxproj.user | 3 --- PocoDoc/PocoDoc_x64_vs110.vcxproj.user | 3 --- Util/Util_vs110.vcxproj.user | 3 --- Util/Util_x64_vs110.vcxproj.user | 3 --- Util/samples/SampleApp/SampleApp_vs110.vcxproj.user | 3 --- Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj.user | 3 --- Util/samples/SampleServer/SampleServer_vs110.vcxproj.user | 3 --- Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj.user | 3 --- Util/samples/Units/Units_vs110.vcxproj.user | 3 --- Util/samples/Units/Units_x64_vs110.vcxproj.user | 3 --- Util/samples/pkill/pkill_vs110.vcxproj.user | 3 --- Util/samples/pkill/pkill_x64_vs110.vcxproj.user | 3 --- Util/testsuite/TestSuite_vs110.vcxproj.user | 3 --- Util/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- XML/XML_vs110.vcxproj.user | 3 --- XML/XML_x64_vs110.vcxproj.user | 3 --- XML/samples/DOMParser/DOMParser_vs110.vcxproj.user | 3 --- XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj.user | 3 --- XML/samples/DOMWriter/DOMWriter_vs110.vcxproj.user | 3 --- XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj.user | 3 --- XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj.user | 3 --- XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj.user | 3 --- XML/samples/SAXParser/SAXParser_vs110.vcxproj.user | 3 --- XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj.user | 3 --- XML/testsuite/TestSuite_vs110.vcxproj.user | 3 --- XML/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- Zip/samples/unzip/unzip_vs110.vcxproj.user | 3 --- Zip/samples/unzip/unzip_x64_vs110.vcxproj.user | 3 --- Zip/samples/zip/zip_vs110.vcxproj.user | 3 --- Zip/samples/zip/zip_x64_vs110.vcxproj.user | 3 --- Zip/testsuite/TestSuite_vs110.vcxproj.user | 3 --- Zip/testsuite/TestSuite_x64_vs110.vcxproj.user | 3 --- 170 files changed, 510 deletions(-) delete mode 100644 ApacheConnector/ApacheConnector_vs110.vcxproj.user delete mode 100644 ApacheConnector/ApacheConnector_x64_vs110.vcxproj.user delete mode 100644 ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.user delete mode 100644 ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.user delete mode 100644 ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.user delete mode 100644 ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.user delete mode 100644 CppParser/CppParser_vs110.vcxproj.user delete mode 100644 CppParser/CppParser_x64_vs110.vcxproj.user delete mode 100644 CppParser/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 CppParser/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 Crypto/Crypto_vs110.vcxproj.user delete mode 100644 Crypto/Crypto_x64_vs110.vcxproj.user delete mode 100644 Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.user delete mode 100644 Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.user delete mode 100644 Crypto/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 Crypto/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 Data/Data_vs110.vcxproj.user delete mode 100644 Data/Data_x64_vs110.vcxproj.user delete mode 100644 Data/MySQL/MySQL_vs110.vcxproj.user delete mode 100644 Data/MySQL/MySQL_x64_vs110.vcxproj.user delete mode 100644 Data/MySQL/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 Data/ODBC/ODBC_vs110.vcxproj.user delete mode 100644 Data/ODBC/ODBC_x64_vs110.vcxproj.user delete mode 100644 Data/ODBC/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 Data/SQLite/SQLite_vs110.vcxproj.user delete mode 100644 Data/SQLite/SQLite_x64_vs110.vcxproj.user delete mode 100644 Data/SQLite/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 Data/samples/Binding/Binding_vs110.vcxproj.user delete mode 100644 Data/samples/Binding/Binding_x64_vs110.vcxproj.user delete mode 100644 Data/samples/RecordSet/RecordSet_vs110.vcxproj.user delete mode 100644 Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.user delete mode 100644 Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.user delete mode 100644 Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.user delete mode 100644 Data/samples/Tuple/Tuple_vs110.vcxproj.user delete mode 100644 Data/samples/Tuple/Tuple_x64_vs110.vcxproj.user delete mode 100644 Data/samples/TypeHandler/TypeHandler_vs110.vcxproj.user delete mode 100644 Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj.user delete mode 100644 Data/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 Data/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj.user delete mode 100644 Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/Activity/Activity_vs110.vcxproj.user delete mode 100644 Foundation/samples/Activity/Activity_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj.user delete mode 100644 Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/DateTime/DateTime_vs110.vcxproj.user delete mode 100644 Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/LogRotation/LogRotation_vs110.vcxproj.user delete mode 100644 Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/Logger/Logger_vs110.vcxproj.user delete mode 100644 Foundation/samples/Logger/Logger_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj.user delete mode 100644 Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj.user delete mode 100644 Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/Timer/Timer_vs110.vcxproj.user delete mode 100644 Foundation/samples/Timer/Timer_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/URI/URI_vs110.vcxproj.user delete mode 100644 Foundation/samples/URI/URI_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/base64decode/base64decode_vs110.vcxproj.user delete mode 100644 Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/base64encode/base64encode_vs110.vcxproj.user delete mode 100644 Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/deflate/deflate_vs110.vcxproj.user delete mode 100644 Foundation/samples/deflate/deflate_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/dir/dir_vs110.vcxproj.user delete mode 100644 Foundation/samples/dir/dir_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/grep/grep_vs110.vcxproj.user delete mode 100644 Foundation/samples/grep/grep_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj.user delete mode 100644 Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/inflate/inflate_vs110.vcxproj.user delete mode 100644 Foundation/samples/inflate/inflate_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/md5/md5_vs110.vcxproj.user delete mode 100644 Foundation/samples/md5/md5_x64_vs110.vcxproj.user delete mode 100644 Foundation/samples/uuidgen/uuidgen_vs110.vcxproj.user delete mode 100644 Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj.user delete mode 100644 JSON/JSON_vs110.vcxproj.user delete mode 100644 JSON/JSON_x64_vs110.vcxproj.user delete mode 100644 JSON/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 JSON/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 Net/Net_vs110.vcxproj.user delete mode 100644 Net/Net_x64_vs110.vcxproj.user delete mode 100644 Net/samples/EchoServer/EchoServer_vs110.vcxproj.user delete mode 100644 Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj.user delete mode 100644 Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj.user delete mode 100644 Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj.user delete mode 100644 Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj.user delete mode 100644 Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj.user delete mode 100644 Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.user delete mode 100644 Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.user delete mode 100644 Net/samples/Mail/Mail_vs110.vcxproj.user delete mode 100644 Net/samples/Mail/Mail_x64_vs110.vcxproj.user delete mode 100644 Net/samples/Ping/Ping_vs110.vcxproj.user delete mode 100644 Net/samples/Ping/Ping_x64_vs110.vcxproj.user delete mode 100644 Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj.user delete mode 100644 Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj.user delete mode 100644 Net/samples/TimeServer/TimeServer_vs110.vcxproj.user delete mode 100644 Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj.user delete mode 100644 Net/samples/TwitterClient/TwitterClient_vs110.vcxproj.user delete mode 100644 Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj.user delete mode 100644 Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj.user delete mode 100644 Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj.user delete mode 100644 Net/samples/dict/dict_vs110.vcxproj.user delete mode 100644 Net/samples/dict/dict_x64_vs110.vcxproj.user delete mode 100644 Net/samples/download/download_vs110.vcxproj.user delete mode 100644 Net/samples/download/download_x64_vs110.vcxproj.user delete mode 100644 Net/samples/httpget/httpget_vs110.vcxproj.user delete mode 100644 Net/samples/httpget/httpget_x64_vs110.vcxproj.user delete mode 100644 Net/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 Net/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.user delete mode 100644 NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.user delete mode 100644 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj.user delete mode 100644 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj.user delete mode 100644 NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj.user delete mode 100644 NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj.user delete mode 100644 NetSSL_OpenSSL/samples/download/download_vs110.vcxproj.user delete mode 100644 NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj.user delete mode 100644 NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 PDF/PDF_vs110.vcxproj.user delete mode 100644 PDF/PDF_x64_vs110.vcxproj.user delete mode 100644 PDF/samples/Image/Image_vs110.vcxproj.user delete mode 100644 PDF/samples/Image/Image_x64_vs110.vcxproj.user delete mode 100644 PDF/samples/Text/Text_vs110.vcxproj.user delete mode 100644 PDF/samples/Text/Text_x64_vs110.vcxproj.user delete mode 100644 PDF/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 PDF/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 PageCompiler/File2Page/File2Page_vs110.vcxproj.user delete mode 100644 PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.user delete mode 100644 PageCompiler/PageCompiler_vs110.vcxproj.user delete mode 100644 PageCompiler/PageCompiler_x64_vs110.vcxproj.user delete mode 100644 PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.user delete mode 100644 PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.user delete mode 100644 PocoDoc/PocoDoc_vs110.vcxproj.user delete mode 100644 PocoDoc/PocoDoc_x64_vs110.vcxproj.user delete mode 100644 Util/Util_vs110.vcxproj.user delete mode 100644 Util/Util_x64_vs110.vcxproj.user delete mode 100644 Util/samples/SampleApp/SampleApp_vs110.vcxproj.user delete mode 100644 Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj.user delete mode 100644 Util/samples/SampleServer/SampleServer_vs110.vcxproj.user delete mode 100644 Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj.user delete mode 100644 Util/samples/Units/Units_vs110.vcxproj.user delete mode 100644 Util/samples/Units/Units_x64_vs110.vcxproj.user delete mode 100644 Util/samples/pkill/pkill_vs110.vcxproj.user delete mode 100644 Util/samples/pkill/pkill_x64_vs110.vcxproj.user delete mode 100644 Util/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 Util/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 XML/XML_vs110.vcxproj.user delete mode 100644 XML/XML_x64_vs110.vcxproj.user delete mode 100644 XML/samples/DOMParser/DOMParser_vs110.vcxproj.user delete mode 100644 XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj.user delete mode 100644 XML/samples/DOMWriter/DOMWriter_vs110.vcxproj.user delete mode 100644 XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj.user delete mode 100644 XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj.user delete mode 100644 XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj.user delete mode 100644 XML/samples/SAXParser/SAXParser_vs110.vcxproj.user delete mode 100644 XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj.user delete mode 100644 XML/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 XML/testsuite/TestSuite_x64_vs110.vcxproj.user delete mode 100644 Zip/samples/unzip/unzip_vs110.vcxproj.user delete mode 100644 Zip/samples/unzip/unzip_x64_vs110.vcxproj.user delete mode 100644 Zip/samples/zip/zip_vs110.vcxproj.user delete mode 100644 Zip/samples/zip/zip_x64_vs110.vcxproj.user delete mode 100644 Zip/testsuite/TestSuite_vs110.vcxproj.user delete mode 100644 Zip/testsuite/TestSuite_x64_vs110.vcxproj.user diff --git a/ApacheConnector/ApacheConnector_vs110.vcxproj.user b/ApacheConnector/ApacheConnector_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/ApacheConnector/ApacheConnector_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.user b/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.user b/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.user b/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.user b/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.user b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/CppParser/CppParser_vs110.vcxproj.user b/CppParser/CppParser_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/CppParser/CppParser_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/CppParser/CppParser_x64_vs110.vcxproj.user b/CppParser/CppParser_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/CppParser/CppParser_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/CppParser/testsuite/TestSuite_vs110.vcxproj.user b/CppParser/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/CppParser/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.user b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Crypto/Crypto_vs110.vcxproj.user b/Crypto/Crypto_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Crypto/Crypto_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Crypto/Crypto_x64_vs110.vcxproj.user b/Crypto/Crypto_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Crypto/Crypto_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.user b/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.user b/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj.user b/Crypto/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.user b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/Data_vs110.vcxproj.user b/Data/Data_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/Data_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/Data_x64_vs110.vcxproj.user b/Data/Data_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/Data_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/MySQL/MySQL_vs110.vcxproj.user b/Data/MySQL/MySQL_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/MySQL/MySQL_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/MySQL/MySQL_x64_vs110.vcxproj.user b/Data/MySQL/MySQL_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/MySQL/MySQL_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.user b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.user b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/ODBC/ODBC_vs110.vcxproj.user b/Data/ODBC/ODBC_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/ODBC/ODBC_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/ODBC/ODBC_x64_vs110.vcxproj.user b/Data/ODBC/ODBC_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/ODBC/ODBC_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.user b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.user b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/SQLite/SQLite_vs110.vcxproj.user b/Data/SQLite/SQLite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/SQLite/SQLite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/SQLite/SQLite_x64_vs110.vcxproj.user b/Data/SQLite/SQLite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/SQLite/SQLite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.user b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.user b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/samples/Binding/Binding_vs110.vcxproj.user b/Data/samples/Binding/Binding_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/samples/Binding/Binding_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/samples/Binding/Binding_x64_vs110.vcxproj.user b/Data/samples/Binding/Binding_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/samples/Binding/Binding_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/samples/RecordSet/RecordSet_vs110.vcxproj.user b/Data/samples/RecordSet/RecordSet_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/samples/RecordSet/RecordSet_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.user b/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.user b/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.user b/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/samples/Tuple/Tuple_vs110.vcxproj.user b/Data/samples/Tuple/Tuple_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/samples/Tuple/Tuple_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/samples/Tuple/Tuple_x64_vs110.vcxproj.user b/Data/samples/Tuple/Tuple_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/samples/Tuple/Tuple_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj.user b/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/samples/TypeHandler/TypeHandler_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj.user b/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/samples/TypeHandler/TypeHandler_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/testsuite/TestSuite_vs110.vcxproj.user b/Data/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Data/testsuite/TestSuite_x64_vs110.vcxproj.user b/Data/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Data/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj.user b/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/ActiveMethod/ActiveMethod_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj.user b/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/ActiveMethod/ActiveMethod_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/Activity/Activity_vs110.vcxproj.user b/Foundation/samples/Activity/Activity_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/Activity/Activity_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/Activity/Activity_x64_vs110.vcxproj.user b/Foundation/samples/Activity/Activity_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/Activity/Activity_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj.user b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj.user b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/DateTime/DateTime_vs110.vcxproj.user b/Foundation/samples/DateTime/DateTime_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/DateTime/DateTime_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj.user b/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/DateTime/DateTime_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj.user b/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/LogRotation/LogRotation_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj.user b/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/LogRotation/LogRotation_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/Logger/Logger_vs110.vcxproj.user b/Foundation/samples/Logger/Logger_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/Logger/Logger_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/Logger/Logger_x64_vs110.vcxproj.user b/Foundation/samples/Logger/Logger_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/Logger/Logger_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj.user b/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/NotificationQueue/NotificationQueue_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj.user b/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/NotificationQueue/NotificationQueue_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj.user b/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/StringTokenizer/StringTokenizer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj.user b/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/StringTokenizer/StringTokenizer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/Timer/Timer_vs110.vcxproj.user b/Foundation/samples/Timer/Timer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/Timer/Timer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/Timer/Timer_x64_vs110.vcxproj.user b/Foundation/samples/Timer/Timer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/Timer/Timer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/URI/URI_vs110.vcxproj.user b/Foundation/samples/URI/URI_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/URI/URI_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/URI/URI_x64_vs110.vcxproj.user b/Foundation/samples/URI/URI_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/URI/URI_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/base64decode/base64decode_vs110.vcxproj.user b/Foundation/samples/base64decode/base64decode_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/base64decode/base64decode_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj.user b/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/base64decode/base64decode_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/base64encode/base64encode_vs110.vcxproj.user b/Foundation/samples/base64encode/base64encode_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/base64encode/base64encode_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj.user b/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/base64encode/base64encode_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/deflate/deflate_vs110.vcxproj.user b/Foundation/samples/deflate/deflate_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/deflate/deflate_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/deflate/deflate_x64_vs110.vcxproj.user b/Foundation/samples/deflate/deflate_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/deflate/deflate_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/dir/dir_vs110.vcxproj.user b/Foundation/samples/dir/dir_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/dir/dir_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/dir/dir_x64_vs110.vcxproj.user b/Foundation/samples/dir/dir_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/dir/dir_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/grep/grep_vs110.vcxproj.user b/Foundation/samples/grep/grep_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/grep/grep_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/grep/grep_x64_vs110.vcxproj.user b/Foundation/samples/grep/grep_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/grep/grep_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj.user b/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/hmacmd5/hmacmd5_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj.user b/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/hmacmd5/hmacmd5_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/inflate/inflate_vs110.vcxproj.user b/Foundation/samples/inflate/inflate_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/inflate/inflate_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/inflate/inflate_x64_vs110.vcxproj.user b/Foundation/samples/inflate/inflate_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/inflate/inflate_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/md5/md5_vs110.vcxproj.user b/Foundation/samples/md5/md5_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/md5/md5_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/md5/md5_x64_vs110.vcxproj.user b/Foundation/samples/md5/md5_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/md5/md5_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj.user b/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/uuidgen/uuidgen_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj.user b/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Foundation/samples/uuidgen/uuidgen_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/JSON/JSON_vs110.vcxproj.user b/JSON/JSON_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/JSON/JSON_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/JSON/JSON_x64_vs110.vcxproj.user b/JSON/JSON_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/JSON/JSON_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/JSON/testsuite/TestSuite_vs110.vcxproj.user b/JSON/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/JSON/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/JSON/testsuite/TestSuite_x64_vs110.vcxproj.user b/JSON/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/JSON/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/Net_vs110.vcxproj.user b/Net/Net_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/Net_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/Net_x64_vs110.vcxproj.user b/Net/Net_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/Net_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/EchoServer/EchoServer_vs110.vcxproj.user b/Net/samples/EchoServer/EchoServer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/EchoServer/EchoServer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj.user b/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/EchoServer/EchoServer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj.user b/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/HTTPFormServer/HTTPFormServer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj.user b/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/HTTPFormServer/HTTPFormServer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj.user b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj.user b/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.user b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.user b/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/Mail/Mail_vs110.vcxproj.user b/Net/samples/Mail/Mail_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/Mail/Mail_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/Mail/Mail_x64_vs110.vcxproj.user b/Net/samples/Mail/Mail_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/Mail/Mail_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/Ping/Ping_vs110.vcxproj.user b/Net/samples/Ping/Ping_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/Ping/Ping_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/Ping/Ping_x64_vs110.vcxproj.user b/Net/samples/Ping/Ping_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/Ping/Ping_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj.user b/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/SMTPLogger/SMTPLogger_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj.user b/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/SMTPLogger/SMTPLogger_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/TimeServer/TimeServer_vs110.vcxproj.user b/Net/samples/TimeServer/TimeServer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/TimeServer/TimeServer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj.user b/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/TimeServer/TimeServer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj.user b/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/TwitterClient/TwitterClient_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj.user b/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/TwitterClient/TwitterClient_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj.user b/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/WebSocketServer/WebSocketServer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj.user b/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/WebSocketServer/WebSocketServer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/dict/dict_vs110.vcxproj.user b/Net/samples/dict/dict_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/dict/dict_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/dict/dict_x64_vs110.vcxproj.user b/Net/samples/dict/dict_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/dict/dict_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/download/download_vs110.vcxproj.user b/Net/samples/download/download_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/download/download_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/download/download_x64_vs110.vcxproj.user b/Net/samples/download/download_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/download/download_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/httpget/httpget_vs110.vcxproj.user b/Net/samples/httpget/httpget_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/httpget/httpget_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/samples/httpget/httpget_x64_vs110.vcxproj.user b/Net/samples/httpget/httpget_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/samples/httpget/httpget_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/testsuite/TestSuite_vs110.vcxproj.user b/Net/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj.user b/Net/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Net/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.user b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.user b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj.user b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj.user b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj.user b/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj.user b/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj.user b/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/NetSSL_OpenSSL/samples/download/download_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj.user b/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.user b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.user b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PDF/PDF_vs110.vcxproj.user b/PDF/PDF_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PDF/PDF_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PDF/PDF_x64_vs110.vcxproj.user b/PDF/PDF_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PDF/PDF_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PDF/samples/Image/Image_vs110.vcxproj.user b/PDF/samples/Image/Image_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PDF/samples/Image/Image_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PDF/samples/Image/Image_x64_vs110.vcxproj.user b/PDF/samples/Image/Image_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PDF/samples/Image/Image_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PDF/samples/Text/Text_vs110.vcxproj.user b/PDF/samples/Text/Text_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PDF/samples/Text/Text_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PDF/samples/Text/Text_x64_vs110.vcxproj.user b/PDF/samples/Text/Text_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PDF/samples/Text/Text_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PDF/testsuite/TestSuite_vs110.vcxproj.user b/PDF/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PDF/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PDF/testsuite/TestSuite_x64_vs110.vcxproj.user b/PDF/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PDF/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PageCompiler/File2Page/File2Page_vs110.vcxproj.user b/PageCompiler/File2Page/File2Page_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PageCompiler/File2Page/File2Page_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.user b/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PageCompiler/PageCompiler_vs110.vcxproj.user b/PageCompiler/PageCompiler_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PageCompiler/PageCompiler_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PageCompiler/PageCompiler_x64_vs110.vcxproj.user b/PageCompiler/PageCompiler_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PageCompiler/PageCompiler_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.user b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.user b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PocoDoc/PocoDoc_vs110.vcxproj.user b/PocoDoc/PocoDoc_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PocoDoc/PocoDoc_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/PocoDoc/PocoDoc_x64_vs110.vcxproj.user b/PocoDoc/PocoDoc_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/PocoDoc/PocoDoc_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/Util_vs110.vcxproj.user b/Util/Util_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/Util_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/Util_x64_vs110.vcxproj.user b/Util/Util_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/Util_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/samples/SampleApp/SampleApp_vs110.vcxproj.user b/Util/samples/SampleApp/SampleApp_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/samples/SampleApp/SampleApp_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj.user b/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/samples/SampleApp/SampleApp_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/samples/SampleServer/SampleServer_vs110.vcxproj.user b/Util/samples/SampleServer/SampleServer_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/samples/SampleServer/SampleServer_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj.user b/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/samples/SampleServer/SampleServer_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/samples/Units/Units_vs110.vcxproj.user b/Util/samples/Units/Units_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/samples/Units/Units_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/samples/Units/Units_x64_vs110.vcxproj.user b/Util/samples/Units/Units_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/samples/Units/Units_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/samples/pkill/pkill_vs110.vcxproj.user b/Util/samples/pkill/pkill_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/samples/pkill/pkill_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/samples/pkill/pkill_x64_vs110.vcxproj.user b/Util/samples/pkill/pkill_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/samples/pkill/pkill_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/testsuite/TestSuite_vs110.vcxproj.user b/Util/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Util/testsuite/TestSuite_x64_vs110.vcxproj.user b/Util/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Util/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/XML_vs110.vcxproj.user b/XML/XML_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/XML_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/XML_x64_vs110.vcxproj.user b/XML/XML_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/XML_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/samples/DOMParser/DOMParser_vs110.vcxproj.user b/XML/samples/DOMParser/DOMParser_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/samples/DOMParser/DOMParser_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj.user b/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/samples/DOMParser/DOMParser_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj.user b/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/samples/DOMWriter/DOMWriter_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj.user b/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/samples/DOMWriter/DOMWriter_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj.user b/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/samples/PrettyPrint/PrettyPrint_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj.user b/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/samples/PrettyPrint/PrettyPrint_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/samples/SAXParser/SAXParser_vs110.vcxproj.user b/XML/samples/SAXParser/SAXParser_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/samples/SAXParser/SAXParser_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj.user b/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/samples/SAXParser/SAXParser_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/testsuite/TestSuite_vs110.vcxproj.user b/XML/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XML/testsuite/TestSuite_x64_vs110.vcxproj.user b/XML/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/XML/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Zip/samples/unzip/unzip_vs110.vcxproj.user b/Zip/samples/unzip/unzip_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Zip/samples/unzip/unzip_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Zip/samples/unzip/unzip_x64_vs110.vcxproj.user b/Zip/samples/unzip/unzip_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Zip/samples/unzip/unzip_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Zip/samples/zip/zip_vs110.vcxproj.user b/Zip/samples/zip/zip_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Zip/samples/zip/zip_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Zip/samples/zip/zip_x64_vs110.vcxproj.user b/Zip/samples/zip/zip_x64_vs110.vcxproj.user deleted file mode 100644 index 695b5c78b..000000000 --- a/Zip/samples/zip/zip_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Zip/testsuite/TestSuite_vs110.vcxproj.user b/Zip/testsuite/TestSuite_vs110.vcxproj.user deleted file mode 100644 index ace9a86ac..000000000 --- a/Zip/testsuite/TestSuite_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Zip/testsuite/TestSuite_x64_vs110.vcxproj.user b/Zip/testsuite/TestSuite_x64_vs110.vcxproj.user deleted file mode 100644 index ace9a86ac..000000000 --- a/Zip/testsuite/TestSuite_x64_vs110.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file From 8b91562dbde148c1df1ae66cc4d47bbe3a66906d Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 11 Nov 2012 11:07:27 +0100 Subject: [PATCH 021/165] more line ending fixes --- .gitattributes | 7 + Data/samples/RowFormatter/RowFormatter.progen | 20 +- JSON/JSON.progen | 32 +- JSON/samples/Benchmark/Benchmark.progen | 24 +- JSON/samples/samples.progen | 10 +- JSON/testsuite/TestSuite.progen | 18 +- Net/samples/SMTPLogger/SMTPLogger.progen | 24 +- PDF/PDF.progen | 32 +- PDF/samples/Image/Image.progen | 20 +- PDF/samples/Text/Text.progen | 20 +- PDF/samples/samples.progen | 12 +- PDF/testsuite/TestSuite.progen | 18 +- ProGen/ProGen.progen | 32 +- .../Win32/executable/debug_shared.template | 170 +-- .../Win32/executable/debug_static_md.template | 170 +-- .../Win32/executable/debug_static_mt.template | 170 +-- .../vs110/Win32/executable/project.properties | 18 +- .../vs110/Win32/executable/project.template | 52 +- .../Win32/executable/release_shared.template | 174 +-- .../executable/release_static_md.template | 174 +-- .../executable/release_static_mt.template | 174 +-- .../vs110/Win32/library/debug_shared.template | 172 +-- .../Win32/library/debug_static_md.template | 144 +-- .../Win32/library/debug_static_mt.template | 144 +-- .../vs110/Win32/library/project.properties | 18 +- .../vs110/Win32/library/project.template | 52 +- .../Win32/library/release_shared.template | 178 +-- .../Win32/library/release_static_md.template | 150 +-- .../Win32/library/release_static_mt.template | 146 +-- .../vs110/Win32/plugin/debug_shared.template | 170 +-- .../vs110/Win32/plugin/project.properties | 10 +- .../vs110/Win32/plugin/project.template | 52 +- .../Win32/plugin/release_shared.template | 176 +-- .../Win32/testsuite/debug_shared.template | 172 +-- .../Win32/testsuite/debug_static_md.template | 172 +-- .../Win32/testsuite/debug_static_mt.template | 174 +-- .../vs110/Win32/testsuite/project.properties | 18 +- .../vs110/Win32/testsuite/project.template | 52 +- .../Win32/testsuite/release_shared.template | 176 +-- .../testsuite/release_static_md.template | 176 +-- .../testsuite/release_static_mt.template | 178 +-- .../x64/executable/debug_shared.template | 170 +-- .../x64/executable/debug_static_md.template | 170 +-- .../x64/executable/debug_static_mt.template | 170 +-- .../vs110/x64/executable/project.properties | 20 +- .../vs110/x64/executable/project.template | 52 +- .../x64/executable/release_shared.template | 174 +-- .../x64/executable/release_static_md.template | 174 +-- .../x64/executable/release_static_mt.template | 174 +-- .../vs110/x64/library/debug_shared.template | 172 +-- .../x64/library/debug_static_md.template | 146 +-- .../x64/library/debug_static_mt.template | 146 +-- .../vs110/x64/library/project.properties | 20 +- .../vs110/x64/library/project.template | 52 +- .../vs110/x64/library/release_shared.template | 180 +-- .../x64/library/release_static_md.template | 148 +-- .../x64/library/release_static_mt.template | 148 +-- .../vs110/x64/plugin/debug_shared.template | 170 +-- .../vs110/x64/plugin/project.properties | 12 +- .../vs110/x64/plugin/project.template | 52 +- .../vs110/x64/plugin/release_shared.template | 178 +-- .../vs110/x64/testsuite/debug_shared.template | 172 +-- .../x64/testsuite/debug_static_md.template | 172 +-- .../x64/testsuite/debug_static_mt.template | 174 +-- .../vs110/x64/testsuite/project.properties | 20 +- .../vs110/x64/testsuite/project.template | 52 +- .../x64/testsuite/release_shared.template | 176 +-- .../x64/testsuite/release_static_md.template | 176 +-- .../x64/testsuite/release_static_mt.template | 178 +-- Util/samples/Units/Units.progen | 18 +- XML/testsuite/rss.xml | 1053 +++++++++++------ 71 files changed, 4489 insertions(+), 4131 deletions(-) diff --git a/.gitattributes b/.gitattributes index 64a16bddc..adc53da9a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,6 +14,13 @@ *.page text *.html text *.css text +*.progen text +*.xml text +*.xsd text +*.template text +*.properties text +*.ini text +*.vxbuild text # Denote all files that are truly binary and should not be modified. *.bin binary diff --git a/Data/samples/RowFormatter/RowFormatter.progen b/Data/samples/RowFormatter/RowFormatter.progen index 5bc064cdb..5467d3577 100644 --- a/Data/samples/RowFormatter/RowFormatter.progen +++ b/Data/samples/RowFormatter/RowFormatter.progen @@ -1,10 +1,10 @@ -vc.project.guid = ${vc.project.guidFromName} -vc.project.name = ${vc.project.baseName} -vc.project.target = ${vc.project.name} -vc.project.type = executable -vc.project.pocobase = ..\\..\\.. -vc.project.platforms = Win32, x64, WinCE -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLite\\include -vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib +vc.project.guid = ${vc.project.guidFromName} +vc.project.name = ${vc.project.baseName} +vc.project.target = ${vc.project.name} +vc.project.type = executable +vc.project.pocobase = ..\\..\\.. +vc.project.platforms = Win32, x64, WinCE +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs90.vcproj +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLite\\include +vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib diff --git a/JSON/JSON.progen b/JSON/JSON.progen index 1731e2fa5..1de7a7f5c 100644 --- a/JSON/JSON.progen +++ b/JSON/JSON.progen @@ -1,16 +1,16 @@ -vc.project.guid = ${vc.project.guidFromName} -vc.project.name = JSON -vc.project.target = Poco${vc.project.name} -vc.project.type = library -vc.project.pocobase = .. -vc.project.outdir = ${vc.project.pocobase} -vc.project.platforms = Win32, x64, WinCE -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\Foundation\\include -vc.project.compiler.defines = -vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS -vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} -vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} -vc.solution.create = true -vc.solution.include = testsuite\\TestSuite +vc.project.guid = ${vc.project.guidFromName} +vc.project.name = JSON +vc.project.target = Poco${vc.project.name} +vc.project.type = library +vc.project.pocobase = .. +vc.project.outdir = ${vc.project.pocobase} +vc.project.platforms = Win32, x64, WinCE +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs90.vcproj +vc.project.compiler.include = ..\\Foundation\\include +vc.project.compiler.defines = +vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS +vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} +vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} +vc.solution.create = true +vc.solution.include = testsuite\\TestSuite diff --git a/JSON/samples/Benchmark/Benchmark.progen b/JSON/samples/Benchmark/Benchmark.progen index 00348970e..9f95976d6 100644 --- a/JSON/samples/Benchmark/Benchmark.progen +++ b/JSON/samples/Benchmark/Benchmark.progen @@ -1,12 +1,12 @@ -vc.project.guid = ${vc.project.guidFromName} -vc.project.name = ${vc.project.baseName} -vc.project.target = ${vc.project.name} -vc.project.type = executable -vc.project.pocobase = ..\\..\\.. -vc.project.platforms = Win32, x64, WinCE -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\JSON\\include -vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib -vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib -vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib +vc.project.guid = ${vc.project.guidFromName} +vc.project.name = ${vc.project.baseName} +vc.project.target = ${vc.project.name} +vc.project.type = executable +vc.project.pocobase = ..\\..\\.. +vc.project.platforms = Win32, x64, WinCE +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs90.vcproj +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\JSON\\include +vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib diff --git a/JSON/samples/samples.progen b/JSON/samples/samples.progen index cb94a39d1..29bab5ca3 100644 --- a/JSON/samples/samples.progen +++ b/JSON/samples/samples.progen @@ -1,5 +1,5 @@ -vc.project.platforms = Win32, x64, WinCE -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.solution.create = true -vc.solution.include = \ - Benchmark\\Benchmark +vc.project.platforms = Win32, x64, WinCE +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.solution.create = true +vc.solution.include = \ + Benchmark\\Benchmark diff --git a/JSON/testsuite/TestSuite.progen b/JSON/testsuite/TestSuite.progen index da2a06df1..90a034507 100644 --- a/JSON/testsuite/TestSuite.progen +++ b/JSON/testsuite/TestSuite.progen @@ -1,9 +1,9 @@ -vc.project.guid = ${vc.project.guidFromName} -vc.project.name = TestSuite -vc.project.target = TestSuite -vc.project.type = testsuite -vc.project.pocobase = ..\\.. -vc.project.platforms = Win32, x64, WinCE -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = TestSuite_vs90.vcproj -vc.project.compiler.include = ..\\..\\Foundation\\include +vc.project.guid = ${vc.project.guidFromName} +vc.project.name = TestSuite +vc.project.target = TestSuite +vc.project.type = testsuite +vc.project.pocobase = ..\\.. +vc.project.platforms = Win32, x64, WinCE +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = TestSuite_vs90.vcproj +vc.project.compiler.include = ..\\..\\Foundation\\include diff --git a/Net/samples/SMTPLogger/SMTPLogger.progen b/Net/samples/SMTPLogger/SMTPLogger.progen index 8785b5784..789048c79 100644 --- a/Net/samples/SMTPLogger/SMTPLogger.progen +++ b/Net/samples/SMTPLogger/SMTPLogger.progen @@ -1,12 +1,12 @@ -vc.project.guid = ${vc.project.guidFromName} -vc.project.name = ${vc.project.baseName} -vc.project.target = ${vc.project.name} -vc.project.type = executable -vc.project.pocobase = ..\\..\\.. -vc.project.platforms = Win32, x64, WinCE -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib -vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib -vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib +vc.project.guid = ${vc.project.guidFromName} +vc.project.name = ${vc.project.baseName} +vc.project.target = ${vc.project.name} +vc.project.type = executable +vc.project.pocobase = ..\\..\\.. +vc.project.platforms = Win32, x64, WinCE +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs90.vcproj +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include +vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib diff --git a/PDF/PDF.progen b/PDF/PDF.progen index 3473363fb..45580d049 100644 --- a/PDF/PDF.progen +++ b/PDF/PDF.progen @@ -1,16 +1,16 @@ -vc.project.guid = E12E5C71-79A4-495A-848F-F1710111E610 -vc.project.name = PDF -vc.project.target = Poco${vc.project.name} -vc.project.type = library -vc.project.pocobase = .. -vc.project.outdir = ${vc.project.pocobase} -vc.project.platforms = Win32, x64 -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = .\\include\\Poco\\PDF;..\\Foundation\\include -vc.project.compiler.defines = -vc.project.compiler.defines.shared = _CRT_SECURE_NO_WARNINGS;${vc.project.name}_EXPORTS -vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} -vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} -vc.solution.create = true -vc.solution.include = testsuite\\TestSuite +vc.project.guid = E12E5C71-79A4-495A-848F-F1710111E610 +vc.project.name = PDF +vc.project.target = Poco${vc.project.name} +vc.project.type = library +vc.project.pocobase = .. +vc.project.outdir = ${vc.project.pocobase} +vc.project.platforms = Win32, x64 +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs90.vcproj +vc.project.compiler.include = .\\include\\Poco\\PDF;..\\Foundation\\include +vc.project.compiler.defines = +vc.project.compiler.defines.shared = _CRT_SECURE_NO_WARNINGS;${vc.project.name}_EXPORTS +vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} +vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} +vc.solution.create = true +vc.solution.include = testsuite\\TestSuite diff --git a/PDF/samples/Image/Image.progen b/PDF/samples/Image/Image.progen index bca168503..871d2b9e1 100644 --- a/PDF/samples/Image/Image.progen +++ b/PDF/samples/Image/Image.progen @@ -1,10 +1,10 @@ -vc.project.guid = ${vc.project.guidFromName} -vc.project.name = ${vc.project.baseName} -vc.project.target = ${vc.project.name} -vc.project.type = executable -vc.project.pocobase = ..\\..\\.. -vc.project.platforms = Win32, x64 -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = ${vc.project.name}_vs80.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include -vc.project.linker.dependencies = +vc.project.guid = ${vc.project.guidFromName} +vc.project.name = ${vc.project.baseName} +vc.project.target = ${vc.project.name} +vc.project.type = executable +vc.project.pocobase = ..\\..\\.. +vc.project.platforms = Win32, x64 +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs80.vcproj +vc.project.compiler.include = ..\\..\\..\\Foundation\\include +vc.project.linker.dependencies = diff --git a/PDF/samples/Text/Text.progen b/PDF/samples/Text/Text.progen index bca168503..871d2b9e1 100644 --- a/PDF/samples/Text/Text.progen +++ b/PDF/samples/Text/Text.progen @@ -1,10 +1,10 @@ -vc.project.guid = ${vc.project.guidFromName} -vc.project.name = ${vc.project.baseName} -vc.project.target = ${vc.project.name} -vc.project.type = executable -vc.project.pocobase = ..\\..\\.. -vc.project.platforms = Win32, x64 -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = ${vc.project.name}_vs80.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include -vc.project.linker.dependencies = +vc.project.guid = ${vc.project.guidFromName} +vc.project.name = ${vc.project.baseName} +vc.project.target = ${vc.project.name} +vc.project.type = executable +vc.project.pocobase = ..\\..\\.. +vc.project.platforms = Win32, x64 +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs80.vcproj +vc.project.compiler.include = ..\\..\\..\\Foundation\\include +vc.project.linker.dependencies = diff --git a/PDF/samples/samples.progen b/PDF/samples/samples.progen index 3bad16801..1af0b9211 100644 --- a/PDF/samples/samples.progen +++ b/PDF/samples/samples.progen @@ -1,6 +1,6 @@ -vc.project.platforms = Win32, x64 -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.solution.create = true -vc.solution.include = \ - Image\\Image;\ - Text\\Text; +vc.project.platforms = Win32, x64 +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.solution.create = true +vc.solution.include = \ + Image\\Image;\ + Text\\Text; diff --git a/PDF/testsuite/TestSuite.progen b/PDF/testsuite/TestSuite.progen index 66df75cf2..682c09fae 100644 --- a/PDF/testsuite/TestSuite.progen +++ b/PDF/testsuite/TestSuite.progen @@ -1,9 +1,9 @@ -vc.project.guid = 24134877-368D-11DB-9FBC-00123FC423B5 -vc.project.name = TestSuite -vc.project.target = TestSuite -vc.project.type = testsuite -vc.project.pocobase = ..\\.. -vc.project.platforms = Win32, x64 -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = TestSuite_vs90.vcproj -vc.project.compiler.include = ..\\..\\Foundation\\include +vc.project.guid = 24134877-368D-11DB-9FBC-00123FC423B5 +vc.project.name = TestSuite +vc.project.target = TestSuite +vc.project.type = testsuite +vc.project.pocobase = ..\\.. +vc.project.platforms = Win32, x64 +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = TestSuite_vs90.vcproj +vc.project.compiler.include = ..\\..\\Foundation\\include diff --git a/ProGen/ProGen.progen b/ProGen/ProGen.progen index 7e52bd9e8..c609b6404 100644 --- a/ProGen/ProGen.progen +++ b/ProGen/ProGen.progen @@ -1,16 +1,16 @@ -vc.project.guid = 48D690D9-6520-4F30-A298-3132548716D0 -vc.project.name = ProGen -vc.project.target = progen -vc.project.type = executable -vc.project.pocobase = .. -vc.project.outdir = ${vc.project.pocobase} -vc.project.platforms = Win32, x64 -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = ProGen_vs90.vcproj -vc.project.compiler.include = ..\\Foundation\\include;..\\XML\\include;..\\Util\\include -vc.project.compiler.defines = -vc.project.compiler.defines.shared = -vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} -vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} -vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib -vc.solution.create = true +vc.project.guid = 48D690D9-6520-4F30-A298-3132548716D0 +vc.project.name = ProGen +vc.project.target = progen +vc.project.type = executable +vc.project.pocobase = .. +vc.project.outdir = ${vc.project.pocobase} +vc.project.platforms = Win32, x64 +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ProGen_vs90.vcproj +vc.project.compiler.include = ..\\Foundation\\include;..\\XML\\include;..\\Util\\include +vc.project.compiler.defines = +vc.project.compiler.defines.shared = +vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} +vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} +vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib +vc.solution.create = true diff --git a/ProGen/templates/vs110/Win32/executable/debug_shared.template b/ProGen/templates/vs110/Win32/executable/debug_shared.template index a53ccdc66..d50a22883 100644 --- a/ProGen/templates/vs110/Win32/executable/debug_shared.template +++ b/ProGen/templates/vs110/Win32/executable/debug_shared.template @@ -1,85 +1,85 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/executable/debug_static_md.template b/ProGen/templates/vs110/Win32/executable/debug_static_md.template index e53ce1cbb..e517a4014 100644 --- a/ProGen/templates/vs110/Win32/executable/debug_static_md.template +++ b/ProGen/templates/vs110/Win32/executable/debug_static_md.template @@ -1,85 +1,85 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/executable/debug_static_mt.template b/ProGen/templates/vs110/Win32/executable/debug_static_mt.template index 268443a9f..cc72fb872 100644 --- a/ProGen/templates/vs110/Win32/executable/debug_static_mt.template +++ b/ProGen/templates/vs110/Win32/executable/debug_static_mt.template @@ -1,85 +1,85 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/executable/project.properties b/ProGen/templates/vs110/Win32/executable/project.properties index fae9f8067..318460fae 100644 --- a/ProGen/templates/vs110/Win32/executable/project.properties +++ b/ProGen/templates/vs110/Win32/executable/project.properties @@ -1,9 +1,9 @@ -project.suffix = _vs110.vcproj -project.targetSuffix.debug_shared = d -project.targetSuffix.release_shared = -project.targetSuffix.debug_static_md = d -project.targetSuffix.release_static_md = -project.targetSuffix.debug_static_mt = d -project.targetSuffix.release_static_mt = -project.postprocess = upgrade2008to2012 -project.finalSuffix = _vs110.vcxproj +project.suffix = _vs110.vcproj +project.targetSuffix.debug_shared = d +project.targetSuffix.release_shared = +project.targetSuffix.debug_static_md = d +project.targetSuffix.release_static_md = +project.targetSuffix.debug_static_mt = d +project.targetSuffix.release_static_mt = +project.postprocess = upgrade2008to2012 +project.finalSuffix = _vs110.vcxproj diff --git a/ProGen/templates/vs110/Win32/executable/project.template b/ProGen/templates/vs110/Win32/executable/project.template index 7a83f5037..6c9d8b9cb 100644 --- a/ProGen/templates/vs110/Win32/executable/project.template +++ b/ProGen/templates/vs110/Win32/executable/project.template @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/executable/release_shared.template b/ProGen/templates/vs110/Win32/executable/release_shared.template index 7b6b4afee..ba3a503ea 100644 --- a/ProGen/templates/vs110/Win32/executable/release_shared.template +++ b/ProGen/templates/vs110/Win32/executable/release_shared.template @@ -1,87 +1,87 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/executable/release_static_md.template b/ProGen/templates/vs110/Win32/executable/release_static_md.template index eba716807..e66ad96c7 100644 --- a/ProGen/templates/vs110/Win32/executable/release_static_md.template +++ b/ProGen/templates/vs110/Win32/executable/release_static_md.template @@ -1,87 +1,87 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/executable/release_static_mt.template b/ProGen/templates/vs110/Win32/executable/release_static_mt.template index 92eed7bfb..25e890cf2 100644 --- a/ProGen/templates/vs110/Win32/executable/release_static_mt.template +++ b/ProGen/templates/vs110/Win32/executable/release_static_mt.template @@ -1,87 +1,87 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/library/debug_shared.template b/ProGen/templates/vs110/Win32/library/debug_shared.template index e0078f99e..6d159fac3 100644 --- a/ProGen/templates/vs110/Win32/library/debug_shared.template +++ b/ProGen/templates/vs110/Win32/library/debug_shared.template @@ -1,86 +1,86 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/library/debug_static_md.template b/ProGen/templates/vs110/Win32/library/debug_static_md.template index abaf703f4..854409c68 100644 --- a/ProGen/templates/vs110/Win32/library/debug_static_md.template +++ b/ProGen/templates/vs110/Win32/library/debug_static_md.template @@ -1,72 +1,72 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/library/debug_static_mt.template b/ProGen/templates/vs110/Win32/library/debug_static_mt.template index 7dc00ce6d..ed40dc57e 100644 --- a/ProGen/templates/vs110/Win32/library/debug_static_mt.template +++ b/ProGen/templates/vs110/Win32/library/debug_static_mt.template @@ -1,72 +1,72 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/library/project.properties b/ProGen/templates/vs110/Win32/library/project.properties index e84df1601..28db0839e 100644 --- a/ProGen/templates/vs110/Win32/library/project.properties +++ b/ProGen/templates/vs110/Win32/library/project.properties @@ -1,9 +1,9 @@ -project.suffix = _vs110.vcproj -project.targetSuffix.debug_shared = d -project.targetSuffix.release_shared = -project.targetSuffix.debug_static_md = mdd -project.targetSuffix.release_static_md = md -project.targetSuffix.debug_static_mt = mtd -project.targetSuffix.release_static_mt = mt -project.postprocess = upgrade2008to2012 -project.finalSuffix = _vs110.vcxproj +project.suffix = _vs110.vcproj +project.targetSuffix.debug_shared = d +project.targetSuffix.release_shared = +project.targetSuffix.debug_static_md = mdd +project.targetSuffix.release_static_md = md +project.targetSuffix.debug_static_mt = mtd +project.targetSuffix.release_static_mt = mt +project.postprocess = upgrade2008to2012 +project.finalSuffix = _vs110.vcxproj diff --git a/ProGen/templates/vs110/Win32/library/project.template b/ProGen/templates/vs110/Win32/library/project.template index 7a83f5037..6c9d8b9cb 100644 --- a/ProGen/templates/vs110/Win32/library/project.template +++ b/ProGen/templates/vs110/Win32/library/project.template @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/library/release_shared.template b/ProGen/templates/vs110/Win32/library/release_shared.template index 3cfc7e194..d92f14f1b 100644 --- a/ProGen/templates/vs110/Win32/library/release_shared.template +++ b/ProGen/templates/vs110/Win32/library/release_shared.template @@ -1,89 +1,89 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/library/release_static_md.template b/ProGen/templates/vs110/Win32/library/release_static_md.template index b06fe26f7..5e07c0bac 100644 --- a/ProGen/templates/vs110/Win32/library/release_static_md.template +++ b/ProGen/templates/vs110/Win32/library/release_static_md.template @@ -1,75 +1,75 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/library/release_static_mt.template b/ProGen/templates/vs110/Win32/library/release_static_mt.template index d1b44285d..73cb1392e 100644 --- a/ProGen/templates/vs110/Win32/library/release_static_mt.template +++ b/ProGen/templates/vs110/Win32/library/release_static_mt.template @@ -1,73 +1,73 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/plugin/debug_shared.template b/ProGen/templates/vs110/Win32/plugin/debug_shared.template index ff2a7bdde..d108a757e 100644 --- a/ProGen/templates/vs110/Win32/plugin/debug_shared.template +++ b/ProGen/templates/vs110/Win32/plugin/debug_shared.template @@ -1,85 +1,85 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/plugin/project.properties b/ProGen/templates/vs110/Win32/plugin/project.properties index c99440e5c..3d5e4a610 100644 --- a/ProGen/templates/vs110/Win32/plugin/project.properties +++ b/ProGen/templates/vs110/Win32/plugin/project.properties @@ -1,5 +1,5 @@ -project.suffix = _vs110.vcproj -project.targetSuffix.debug_shared = d -project.targetSuffix.release_shared = -project.postprocess = upgrade2008to2012 -project.finalSuffix = _vs110.vcxproj +project.suffix = _vs110.vcproj +project.targetSuffix.debug_shared = d +project.targetSuffix.release_shared = +project.postprocess = upgrade2008to2012 +project.finalSuffix = _vs110.vcxproj diff --git a/ProGen/templates/vs110/Win32/plugin/project.template b/ProGen/templates/vs110/Win32/plugin/project.template index 7a83f5037..6c9d8b9cb 100644 --- a/ProGen/templates/vs110/Win32/plugin/project.template +++ b/ProGen/templates/vs110/Win32/plugin/project.template @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/plugin/release_shared.template b/ProGen/templates/vs110/Win32/plugin/release_shared.template index bbc7b85a1..62bd2604f 100644 --- a/ProGen/templates/vs110/Win32/plugin/release_shared.template +++ b/ProGen/templates/vs110/Win32/plugin/release_shared.template @@ -1,88 +1,88 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/testsuite/debug_shared.template b/ProGen/templates/vs110/Win32/testsuite/debug_shared.template index 82778daaf..2fc522fe7 100644 --- a/ProGen/templates/vs110/Win32/testsuite/debug_shared.template +++ b/ProGen/templates/vs110/Win32/testsuite/debug_shared.template @@ -1,86 +1,86 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template index b6c5ecd1a..f2f78ce34 100644 --- a/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template +++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template @@ -1,86 +1,86 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template index ec0af94f1..ef5b9f70e 100644 --- a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template @@ -1,87 +1,87 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/testsuite/project.properties b/ProGen/templates/vs110/Win32/testsuite/project.properties index fae9f8067..318460fae 100644 --- a/ProGen/templates/vs110/Win32/testsuite/project.properties +++ b/ProGen/templates/vs110/Win32/testsuite/project.properties @@ -1,9 +1,9 @@ -project.suffix = _vs110.vcproj -project.targetSuffix.debug_shared = d -project.targetSuffix.release_shared = -project.targetSuffix.debug_static_md = d -project.targetSuffix.release_static_md = -project.targetSuffix.debug_static_mt = d -project.targetSuffix.release_static_mt = -project.postprocess = upgrade2008to2012 -project.finalSuffix = _vs110.vcxproj +project.suffix = _vs110.vcproj +project.targetSuffix.debug_shared = d +project.targetSuffix.release_shared = +project.targetSuffix.debug_static_md = d +project.targetSuffix.release_static_md = +project.targetSuffix.debug_static_mt = d +project.targetSuffix.release_static_mt = +project.postprocess = upgrade2008to2012 +project.finalSuffix = _vs110.vcxproj diff --git a/ProGen/templates/vs110/Win32/testsuite/project.template b/ProGen/templates/vs110/Win32/testsuite/project.template index 7a83f5037..6c9d8b9cb 100644 --- a/ProGen/templates/vs110/Win32/testsuite/project.template +++ b/ProGen/templates/vs110/Win32/testsuite/project.template @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/testsuite/release_shared.template b/ProGen/templates/vs110/Win32/testsuite/release_shared.template index 46bf285c5..127f179c2 100644 --- a/ProGen/templates/vs110/Win32/testsuite/release_shared.template +++ b/ProGen/templates/vs110/Win32/testsuite/release_shared.template @@ -1,88 +1,88 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/testsuite/release_static_md.template b/ProGen/templates/vs110/Win32/testsuite/release_static_md.template index e1a71d06e..9f1547aca 100644 --- a/ProGen/templates/vs110/Win32/testsuite/release_static_md.template +++ b/ProGen/templates/vs110/Win32/testsuite/release_static_md.template @@ -1,88 +1,88 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template index 0bff0e687..fcb9cd189 100644 --- a/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template +++ b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template @@ -1,89 +1,89 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/executable/debug_shared.template b/ProGen/templates/vs110/x64/executable/debug_shared.template index 844a92346..767fd36b3 100644 --- a/ProGen/templates/vs110/x64/executable/debug_shared.template +++ b/ProGen/templates/vs110/x64/executable/debug_shared.template @@ -1,85 +1,85 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/executable/debug_static_md.template b/ProGen/templates/vs110/x64/executable/debug_static_md.template index bb2d26b06..e96859ca9 100644 --- a/ProGen/templates/vs110/x64/executable/debug_static_md.template +++ b/ProGen/templates/vs110/x64/executable/debug_static_md.template @@ -1,85 +1,85 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/executable/debug_static_mt.template b/ProGen/templates/vs110/x64/executable/debug_static_mt.template index a4c388edf..57f60b247 100644 --- a/ProGen/templates/vs110/x64/executable/debug_static_mt.template +++ b/ProGen/templates/vs110/x64/executable/debug_static_mt.template @@ -1,85 +1,85 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/executable/project.properties b/ProGen/templates/vs110/x64/executable/project.properties index 0287d1df8..1acbe5241 100644 --- a/ProGen/templates/vs110/x64/executable/project.properties +++ b/ProGen/templates/vs110/x64/executable/project.properties @@ -1,10 +1,10 @@ -project.suffix = _x64_vs110.vcproj -project.targetSuffix.debug_shared = d -project.targetSuffix.release_shared = -project.targetSuffix.debug_static_md = d -project.targetSuffix.release_static_md = -project.targetSuffix.debug_static_mt = d -project.targetSuffix.release_static_mt = -project.postprocess = upgrade2008to2012 -project.finalSuffix = _x64_vs110.vcxproj -project.targetArchitecture = AMD64 +project.suffix = _x64_vs110.vcproj +project.targetSuffix.debug_shared = d +project.targetSuffix.release_shared = +project.targetSuffix.debug_static_md = d +project.targetSuffix.release_static_md = +project.targetSuffix.debug_static_mt = d +project.targetSuffix.release_static_mt = +project.postprocess = upgrade2008to2012 +project.finalSuffix = _x64_vs110.vcxproj +project.targetArchitecture = AMD64 diff --git a/ProGen/templates/vs110/x64/executable/project.template b/ProGen/templates/vs110/x64/executable/project.template index 254780e13..65e92894c 100644 --- a/ProGen/templates/vs110/x64/executable/project.template +++ b/ProGen/templates/vs110/x64/executable/project.template @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/executable/release_shared.template b/ProGen/templates/vs110/x64/executable/release_shared.template index 9d3a77045..79ec2e3f4 100644 --- a/ProGen/templates/vs110/x64/executable/release_shared.template +++ b/ProGen/templates/vs110/x64/executable/release_shared.template @@ -1,87 +1,87 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/executable/release_static_md.template b/ProGen/templates/vs110/x64/executable/release_static_md.template index 1aa0e0646..a61d0fff7 100644 --- a/ProGen/templates/vs110/x64/executable/release_static_md.template +++ b/ProGen/templates/vs110/x64/executable/release_static_md.template @@ -1,87 +1,87 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/executable/release_static_mt.template b/ProGen/templates/vs110/x64/executable/release_static_mt.template index 7ed3a4ad2..05269d661 100644 --- a/ProGen/templates/vs110/x64/executable/release_static_mt.template +++ b/ProGen/templates/vs110/x64/executable/release_static_mt.template @@ -1,87 +1,87 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/library/debug_shared.template b/ProGen/templates/vs110/x64/library/debug_shared.template index c183d6545..b64f94c66 100644 --- a/ProGen/templates/vs110/x64/library/debug_shared.template +++ b/ProGen/templates/vs110/x64/library/debug_shared.template @@ -1,86 +1,86 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/library/debug_static_md.template b/ProGen/templates/vs110/x64/library/debug_static_md.template index 6ff9948e2..ab4eb5cd5 100644 --- a/ProGen/templates/vs110/x64/library/debug_static_md.template +++ b/ProGen/templates/vs110/x64/library/debug_static_md.template @@ -1,73 +1,73 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/library/debug_static_mt.template b/ProGen/templates/vs110/x64/library/debug_static_mt.template index 8d7f87e07..6c8be090f 100644 --- a/ProGen/templates/vs110/x64/library/debug_static_mt.template +++ b/ProGen/templates/vs110/x64/library/debug_static_mt.template @@ -1,73 +1,73 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/library/project.properties b/ProGen/templates/vs110/x64/library/project.properties index 82f51da20..e502afaf5 100644 --- a/ProGen/templates/vs110/x64/library/project.properties +++ b/ProGen/templates/vs110/x64/library/project.properties @@ -1,10 +1,10 @@ -project.suffix = _x64_vs110.vcproj -project.targetSuffix.debug_shared = 64d -project.targetSuffix.release_shared = 64 -project.targetSuffix.debug_static_md = mdd -project.targetSuffix.release_static_md = md -project.targetSuffix.debug_static_mt = mtd -project.targetSuffix.release_static_mt = mt -project.postprocess = upgrade2008to2012 -project.finalSuffix = _x64_vs110.vcxproj -project.targetArchitecture = AMD64 +project.suffix = _x64_vs110.vcproj +project.targetSuffix.debug_shared = 64d +project.targetSuffix.release_shared = 64 +project.targetSuffix.debug_static_md = mdd +project.targetSuffix.release_static_md = md +project.targetSuffix.debug_static_mt = mtd +project.targetSuffix.release_static_mt = mt +project.postprocess = upgrade2008to2012 +project.finalSuffix = _x64_vs110.vcxproj +project.targetArchitecture = AMD64 diff --git a/ProGen/templates/vs110/x64/library/project.template b/ProGen/templates/vs110/x64/library/project.template index 254780e13..65e92894c 100644 --- a/ProGen/templates/vs110/x64/library/project.template +++ b/ProGen/templates/vs110/x64/library/project.template @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/library/release_shared.template b/ProGen/templates/vs110/x64/library/release_shared.template index 4f157e8e9..50897a277 100644 --- a/ProGen/templates/vs110/x64/library/release_shared.template +++ b/ProGen/templates/vs110/x64/library/release_shared.template @@ -1,90 +1,90 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/library/release_static_md.template b/ProGen/templates/vs110/x64/library/release_static_md.template index c4cb1105e..d22d10ac2 100644 --- a/ProGen/templates/vs110/x64/library/release_static_md.template +++ b/ProGen/templates/vs110/x64/library/release_static_md.template @@ -1,74 +1,74 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/library/release_static_mt.template b/ProGen/templates/vs110/x64/library/release_static_mt.template index d2ca4819e..c577be29f 100644 --- a/ProGen/templates/vs110/x64/library/release_static_mt.template +++ b/ProGen/templates/vs110/x64/library/release_static_mt.template @@ -1,74 +1,74 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/plugin/debug_shared.template b/ProGen/templates/vs110/x64/plugin/debug_shared.template index ecf1242ff..bfcd25e36 100644 --- a/ProGen/templates/vs110/x64/plugin/debug_shared.template +++ b/ProGen/templates/vs110/x64/plugin/debug_shared.template @@ -1,85 +1,85 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/plugin/project.properties b/ProGen/templates/vs110/x64/plugin/project.properties index c219f65c9..fd3b49741 100644 --- a/ProGen/templates/vs110/x64/plugin/project.properties +++ b/ProGen/templates/vs110/x64/plugin/project.properties @@ -1,6 +1,6 @@ -project.suffix = _x64_vs110.vcproj -project.targetSuffix.debug_shared = d -project.targetSuffix.release_shared = -project.postprocess = upgrade2008to2012 -project.finalSuffix = _x64_vs110.vcxproj -project.targetArchitecture = AMD64 +project.suffix = _x64_vs110.vcproj +project.targetSuffix.debug_shared = d +project.targetSuffix.release_shared = +project.postprocess = upgrade2008to2012 +project.finalSuffix = _x64_vs110.vcxproj +project.targetArchitecture = AMD64 diff --git a/ProGen/templates/vs110/x64/plugin/project.template b/ProGen/templates/vs110/x64/plugin/project.template index 254780e13..65e92894c 100644 --- a/ProGen/templates/vs110/x64/plugin/project.template +++ b/ProGen/templates/vs110/x64/plugin/project.template @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/plugin/release_shared.template b/ProGen/templates/vs110/x64/plugin/release_shared.template index c38a4f6ca..923a11c16 100644 --- a/ProGen/templates/vs110/x64/plugin/release_shared.template +++ b/ProGen/templates/vs110/x64/plugin/release_shared.template @@ -1,89 +1,89 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/testsuite/debug_shared.template b/ProGen/templates/vs110/x64/testsuite/debug_shared.template index b266d4ce8..49f346f6f 100644 --- a/ProGen/templates/vs110/x64/testsuite/debug_shared.template +++ b/ProGen/templates/vs110/x64/testsuite/debug_shared.template @@ -1,86 +1,86 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/testsuite/debug_static_md.template b/ProGen/templates/vs110/x64/testsuite/debug_static_md.template index bce5c8509..d3278453c 100644 --- a/ProGen/templates/vs110/x64/testsuite/debug_static_md.template +++ b/ProGen/templates/vs110/x64/testsuite/debug_static_md.template @@ -1,86 +1,86 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template index 13476f004..42f573a2e 100644 --- a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template @@ -1,87 +1,87 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/testsuite/project.properties b/ProGen/templates/vs110/x64/testsuite/project.properties index 0287d1df8..1acbe5241 100644 --- a/ProGen/templates/vs110/x64/testsuite/project.properties +++ b/ProGen/templates/vs110/x64/testsuite/project.properties @@ -1,10 +1,10 @@ -project.suffix = _x64_vs110.vcproj -project.targetSuffix.debug_shared = d -project.targetSuffix.release_shared = -project.targetSuffix.debug_static_md = d -project.targetSuffix.release_static_md = -project.targetSuffix.debug_static_mt = d -project.targetSuffix.release_static_mt = -project.postprocess = upgrade2008to2012 -project.finalSuffix = _x64_vs110.vcxproj -project.targetArchitecture = AMD64 +project.suffix = _x64_vs110.vcproj +project.targetSuffix.debug_shared = d +project.targetSuffix.release_shared = +project.targetSuffix.debug_static_md = d +project.targetSuffix.release_static_md = +project.targetSuffix.debug_static_mt = d +project.targetSuffix.release_static_mt = +project.postprocess = upgrade2008to2012 +project.finalSuffix = _x64_vs110.vcxproj +project.targetArchitecture = AMD64 diff --git a/ProGen/templates/vs110/x64/testsuite/project.template b/ProGen/templates/vs110/x64/testsuite/project.template index 254780e13..65e92894c 100644 --- a/ProGen/templates/vs110/x64/testsuite/project.template +++ b/ProGen/templates/vs110/x64/testsuite/project.template @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/testsuite/release_shared.template b/ProGen/templates/vs110/x64/testsuite/release_shared.template index a83a1af07..52b49198a 100644 --- a/ProGen/templates/vs110/x64/testsuite/release_shared.template +++ b/ProGen/templates/vs110/x64/testsuite/release_shared.template @@ -1,88 +1,88 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/testsuite/release_static_md.template b/ProGen/templates/vs110/x64/testsuite/release_static_md.template index 350bcaa5b..3dfc7a923 100644 --- a/ProGen/templates/vs110/x64/testsuite/release_static_md.template +++ b/ProGen/templates/vs110/x64/testsuite/release_static_md.template @@ -1,88 +1,88 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ProGen/templates/vs110/x64/testsuite/release_static_mt.template b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template index f8fe91bf5..bd319238e 100644 --- a/ProGen/templates/vs110/x64/testsuite/release_static_mt.template +++ b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template @@ -1,89 +1,89 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/Util/samples/Units/Units.progen b/Util/samples/Units/Units.progen index 1c2313390..332305dd1 100644 --- a/Util/samples/Units/Units.progen +++ b/Util/samples/Units/Units.progen @@ -1,9 +1,9 @@ -vc.project.guid = ${vc.project.guidFromName} -vc.project.name = ${vc.project.baseName} -vc.project.target = ${vc.project.name} -vc.project.type = executable -vc.project.pocobase = ..\\..\\.. -vc.project.platforms = Win32, x64, WinCE -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Util\\include +vc.project.guid = ${vc.project.guidFromName} +vc.project.name = ${vc.project.baseName} +vc.project.target = ${vc.project.name} +vc.project.type = executable +vc.project.pocobase = ..\\..\\.. +vc.project.platforms = Win32, x64, WinCE +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs90.vcproj +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Util\\include diff --git a/XML/testsuite/rss.xml b/XML/testsuite/rss.xml index 13fb2a260..5aee14795 100644 --- a/XML/testsuite/rss.xml +++ b/XML/testsuite/rss.xml @@ -2,477 +2,828 @@ Permission to copy in any form is granted for use with conforming SGML systems and applications as defined in ISO 8879, provided this notice is included in all copies. ---> +--> + +--> + - - - - - + U+00A0 ISOnum --> + + + + + + + + + + + - + U+00A6 ISOnum --> + + + - - + U+00A8 ISOdia --> + + + + + + = left pointing guillemet, U+00AB ISOnum --> + + U+00AC ISOnum --> + + U+00AD ISOnum --> + + U+00AE ISOnum --> + - + = APL overbar, U+00AF ISOdia --> + + + + U+00B1 ISOnum --> + + = squared, U+00B2 ISOnum --> + + = cubed, U+00B3 ISOnum --> + - + U+00B4 ISOdia --> + + + + U+00B6 ISOnum --> + - + = Greek middle dot, U+00B7 ISOnum --> + + + + U+00B9 ISOnum --> + + U+00BA ISOnum --> + + = right pointing guillemet, U+00BB ISOnum --> + + = fraction one quarter, U+00BC ISOnum --> + + = fraction one half, U+00BD ISOnum --> + + = fraction three quarters, U+00BE ISOnum --> + + = turned question mark, U+00BF ISOnum --> + + U+00C0 ISOlat1 --> + + U+00C1 ISOlat1 --> + + U+00C2 ISOlat1 --> + + U+00C3 ISOlat1 --> + + U+00C4 ISOlat1 --> + + U+00C5 ISOlat1 --> + + U+00C6 ISOlat1 --> + + U+00C7 ISOlat1 --> + + U+00C8 ISOlat1 --> + + U+00C9 ISOlat1 --> + + U+00CA ISOlat1 --> + + U+00CB ISOlat1 --> + + U+00CC ISOlat1 --> + + U+00CD ISOlat1 --> + + U+00CE ISOlat1 --> + - + U+00CF ISOlat1 --> + + + + U+00D1 ISOlat1 --> + + U+00D2 ISOlat1 --> + + U+00D3 ISOlat1 --> + + U+00D4 ISOlat1 --> + + U+00D5 ISOlat1 --> + - + U+00D6 ISOlat1 --> + + + + U+00D8 ISOlat1 --> + + U+00D9 ISOlat1 --> + + U+00DA ISOlat1 --> + + U+00DB ISOlat1 --> + + U+00DC ISOlat1 --> + + U+00DD ISOlat1 --> + + U+00DE ISOlat1 --> + + U+00DF ISOlat1 --> + + U+00E0 ISOlat1 --> + + U+00E1 ISOlat1 --> + + U+00E2 ISOlat1 --> + + U+00E3 ISOlat1 --> + + U+00E4 ISOlat1 --> + + U+00E5 ISOlat1 --> + + = latin small ligature ae, U+00E6 ISOlat1 --> + + U+00E7 ISOlat1 --> + + U+00E8 ISOlat1 --> + + U+00E9 ISOlat1 --> + + U+00EA ISOlat1 --> + + U+00EB ISOlat1 --> + + U+00EC ISOlat1 --> + + U+00ED ISOlat1 --> + + U+00EE ISOlat1 --> + - + U+00EF ISOlat1 --> + + + + U+00F1 ISOlat1 --> + + U+00F2 ISOlat1 --> + + U+00F3 ISOlat1 --> + + U+00F4 ISOlat1 --> + + U+00F5 ISOlat1 --> + - + U+00F6 ISOlat1 --> + + + + U+00F8 ISOlat1 --> + + U+00F9 ISOlat1 --> + + U+00FA ISOlat1 --> + + U+00FB ISOlat1 --> + + U+00FC ISOlat1 --> + + U+00FD ISOlat1 --> + + U+00FE ISOlat1 --> + > - - - - XML.com - http://www.xml.com/ - XML.com features a rich mix of information and services for the XML community. - hourly - 2 - 2000-01-01T12:00+00:00 - - - - - - - - - - - - - - - - - - - - - - - - Meerkat Powered! - http://meerkat.oreillynet.com/icons/meerkat-powered.jpg - http://meerkat.oreillynet.com - - - Features: Top 10 XForms Engines - http://www.xml.com/pub/a/2005/02/09/xforms.html + U+00FF ISOlat1 -->> + + + + + + + + XML.com + + http://www.xml.com/ + + XML.com features a rich mix of information and services for the XML community. + + hourly + + 2 + + 2000-01-01T12:00+00:00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Meerkat Powered! + + http://meerkat.oreillynet.com/icons/meerkat-powered.jpg + + http://meerkat.oreillynet.com + + + + + + Features: Top 10 XForms Engines + + http://www.xml.com/pub/a/2005/02/09/xforms.html + Micah Dubinko, one of the gurus of XForms, offers a rundown on the state of XForms engines for 2005. - - XML.com - Micah Dubinko - Web, Applications - O'Reilly Media, Inc. - 2005-02-09 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Features: Comparing CSS and XSL: A Reply from Norm Walsh - http://www.xml.com/pub/a/2005/02/09/cssorxsl.html + + + XML.com + + Micah Dubinko + + Web, Applications + + O'Reilly Media, Inc. + + 2005-02-09 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Features: Comparing CSS and XSL: A Reply from Norm Walsh + + http://www.xml.com/pub/a/2005/02/09/cssorxsl.html + Norm Walsh responds to a recent article about CSS and XSL, explaining how and when and why you'd want to use XSLFO or CSS or XSLT. - - XML.com - Norman Walsh - Style - O'Reilly Media, Inc. - 2005-02-09 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Features: Very Dynamic Web Interfaces - http://www.xml.com/pub/a/2005/02/09/xml-http-request.html + + + XML.com + + Norman Walsh + + Style + + O'Reilly Media, Inc. + + 2005-02-09 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Features: Very Dynamic Web Interfaces + + http://www.xml.com/pub/a/2005/02/09/xml-http-request.html + Drew McLellan explains how to use XMLHTTPRequest and Javascript to create web applications with very dynamic, smooth interfaces. - - XML.com - Drew McLellan - Web Development, Instruction - O'Reilly Media, Inc. - 2005-02-09 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Transforming XML: The XPath 2.0 Data Model - http://www.xml.com/pub/a/2005/02/02/xpath2.html + + + XML.com + + Drew McLellan + + Web Development, Instruction + + O'Reilly Media, Inc. + + 2005-02-09 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Transforming XML: The XPath 2.0 Data Model + + http://www.xml.com/pub/a/2005/02/02/xpath2.html + Bob DuCharme, in his latest Transforming XML column, examines the XPath 2.0, hence the XSLT 2.0, data model. - - XML.com - Bob DuCharme - Style, Style - O'Reilly Media, Inc. - 2005-02-02 - Transforming XML - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - XML Tourist: The Silent Soundtrack - http://www.xml.com/pub/a/2005/02/02/silent.html + + + XML.com + + Bob DuCharme + + Style, Style + + O'Reilly Media, Inc. + + 2005-02-02 + + Transforming XML + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + XML Tourist: The Silent Soundtrack + + http://www.xml.com/pub/a/2005/02/02/silent.html + In this installation of XML Tourist, John E. Simpson presents an overview of the types of sound-to-text captioning available. Pinpointing closed captioning as the most suitable for use with computerized multimedia, he then explains how XML-based solutions address synchronization issues. - - XML.com - John E. Simpson - Graphics, Vertical Industries - O'Reilly Media, Inc. - 2005-02-02 - XML Tourist - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Transforming XML: The XML 2.0 Data Model - http://www.xml.com/pub/a/2005/02/02/xpath2.html + + + XML.com + + John E. Simpson + + Graphics, Vertical Industries + + O'Reilly Media, Inc. + + 2005-02-02 + + XML Tourist + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Transforming XML: The XML 2.0 Data Model + + http://www.xml.com/pub/a/2005/02/02/xpath2.html + Bob DuCharme, in his latest Transforming XML column, examines the XPath 2.0, hence the XSLT 2.0, data model. - - XML.com - Bob DuCharme - Style, Style - O'Reilly Media, Inc. - 2005-02-02 - Transforming XML - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Features: An Introduction to TMAPI - http://www.xml.com/pub/a/2005/02/02/tmapi.html + + + XML.com + + Bob DuCharme + + Style, Style + + O'Reilly Media, Inc. + + 2005-02-02 + + Transforming XML + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Features: An Introduction to TMAPI + + http://www.xml.com/pub/a/2005/02/02/tmapi.html + TMAPI, a Java Topic Map API, is the standard way to interact with XML Topic Maps programmatically from Java. This article provides a tutorial for TMAPI. - - XML.com - Robert Barta, Oliver Leimig - Metadata, Metadata - O'Reilly Media, Inc. - 2005-02-02 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Features: Formal Taxonomies for the U.S. Government - http://www.xml.com/pub/a/2005/01/26/formtax.html + + + XML.com + + Robert Barta, Oliver Leimig + + Metadata, Metadata + + O'Reilly Media, Inc. + + 2005-02-02 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Features: Formal Taxonomies for the U.S. Government + + http://www.xml.com/pub/a/2005/01/26/formtax.html + Mike Daconta, Metadata Program Manager at the Department of Homeland Security, introduces the notion of a formal taxonomy in the context of the Federal Enteriprise Architecture's Data Reference Model. - - XML.com - Michael Daconta - Metadata, Metadata - O'Reilly Media, Inc. - 2005-01-26 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Features: Hacking Open Office - http://www.xml.com/pub/a/2005/01/26/hacking-ooo.html + + + XML.com + + Michael Daconta + + Metadata, Metadata + + O'Reilly Media, Inc. + + 2005-01-26 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Features: Hacking Open Office + + http://www.xml.com/pub/a/2005/01/26/hacking-ooo.html + Peter Sefton shows us how to use XML tools to hack Open Office file formats. - - XML.com - Peter Sefton - Programming, Tools, Publishing - O'Reilly Media, Inc. - 2005-01-26 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Features: SIMILE: Practical Metadata for the Semantic Web - http://www.xml.com/pub/a/2005/01/26/simile.html + + + XML.com + + Peter Sefton + + Programming, Tools, Publishing + + O'Reilly Media, Inc. + + 2005-01-26 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Features: SIMILE: Practical Metadata for the Semantic Web + + http://www.xml.com/pub/a/2005/01/26/simile.html + Digital libraries and generic metadata form part of the background assumptions and forward-looking goals of the Semantic Web. SIMILE is an interesting project aimed at realizing some of those goals. - - XML.com - Stephen Garland, Ryan Lee, Stefano Mazzocchi - Semantic Web, Metadata - O'Reilly Media, Inc. - 2005-01-26 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Python and XML: Introducing the Amara XML Toolkit - http://www.xml.com/pub/a/2005/01/19/amara.html + + + XML.com + + Stephen Garland, Ryan Lee, Stefano Mazzocchi + + Semantic Web, Metadata + + O'Reilly Media, Inc. + + 2005-01-26 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Python and XML: Introducing the Amara XML Toolkit + + http://www.xml.com/pub/a/2005/01/19/amara.html + Uche Ogbuji introduces Amara, his new collection of XML tools for Python. - - XML.com - Uche Ogbuji - Programming, Programming - O'Reilly Media, Inc. - 2005-01-19 - Python and XML - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Features: Printing XML: Why CSS Is Better than XSL - http://www.xml.com/pub/a/2005/01/19/print.html + + + XML.com + + Uche Ogbuji + + Programming, Programming + + O'Reilly Media, Inc. + + 2005-01-19 + + Python and XML + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Features: Printing XML: Why CSS Is Better than XSL + + http://www.xml.com/pub/a/2005/01/19/print.html + One of the old school debates among XML developers is &quot;CSS versus XSLT.&quot; H&aring;kun Wium Lie and Michael Day revive that debate with a shot across XSL's bow. - - XML.com - Michael Day, H&aring;kon Wium Lie - Style, Publishing - O'Reilly Media, Inc. - 2005-01-19 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Features: Reviewing the Architecture of the World Wide Web - http://www.xml.com/pub/a/2005/01/19/review.html + + + XML.com + + Michael Day, H&aring;kon Wium Lie + + Style, Publishing + + O'Reilly Media, Inc. + + 2005-01-19 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Features: Reviewing the Architecture of the World Wide Web + + http://www.xml.com/pub/a/2005/01/19/review.html + Harry Halpin reviews the final published edition of the W3C TAG's Architecture of the World Wide Web document. - - XML.com - Harry Halpin - Web, Perspectives - O'Reilly Media, Inc. - 2005-01-19 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Features: SAML 2: The Building Blocks of Federated Identity - http://www.xml.com/pub/a/2005/01/12/saml2.html + + + XML.com + + Harry Halpin + + Web, Perspectives + + O'Reilly Media, Inc. + + 2005-01-19 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Features: SAML 2: The Building Blocks of Federated Identity + + http://www.xml.com/pub/a/2005/01/12/saml2.html + Paul Madsen reports on the developments in web services security, including a new major release of SAML, which provides the basis for building federated identity. - - XML.com - Paul Madsen - Web Services, Specifications - O'Reilly Media, Inc. - 2005-01-12 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Features: Introducing Comega - http://www.xml.com/pub/a/2005/01/12/comega.html + + + XML.com + + Paul Madsen + + Web Services, Specifications + + O'Reilly Media, Inc. + + 2005-01-12 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Features: Introducing Comega + + http://www.xml.com/pub/a/2005/01/12/comega.html + Dare Obasanjo explains some of the ways in which C&omega;--a new language from Microsoft Research--makes XML processing easier and more natural. - - XML.com - Dare Obasanjo - Programming, Instruction - O'Reilly Media, Inc. - 2005-01-12 - Features - text/html - en-us - Copyright 2005, O'Reilly Media, Inc. - - - Search - Search Meerkat... - s - http://meerkat.oreillynet.com/ - - + + + XML.com + + Dare Obasanjo + + Programming, Instruction + + O'Reilly Media, Inc. + + 2005-01-12 + + Features + + text/html + + en-us + + Copyright 2005, O'Reilly Media, Inc. + + + + + + Search + + Search Meerkat... + + s + + http://meerkat.oreillynet.com/ + + + + + From 514566ecd7fc6c8342646d210553dc1802bbb4c4 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 11 Nov 2012 11:08:17 +0100 Subject: [PATCH 022/165] removed .vmsbuild files, which are no longer maintained --- CppParser/testsuite/TestSuite.vmsbuild | 9 -- CppUnit/cppunit.vmsbuild | 14 -- Crypto/testsuite/TestSuite.vmsbuild | 9 -- Data/testsuite/TestSuite.vmsbuild | 16 --- Foundation/foundation.vmsbuild | 126 ------------------ .../ActiveMethod/ActiveMethod.vmsbuild | 8 -- Foundation/samples/Activity/Activity.vmsbuild | 8 -- .../BinaryReaderWriter.vmsbuild | 8 -- Foundation/samples/DateTime/DateTime.vmsbuild | 8 -- .../samples/LogRotation/LogRotation.vmsbuild | 8 -- Foundation/samples/Logger/Logger.vmsbuild | 8 -- .../NotificationQueue.vmsbuild | 8 -- .../StringTokenizer/StringTokenizer.vmsbuild | 8 -- Foundation/samples/Timer/Timer.vmsbuild | 8 -- Foundation/samples/URI/URI.vmsbuild | 8 -- .../base64decode/base64decode.vmsbuild | 8 -- .../base64encode/base64encode.vmsbuild | 8 -- Foundation/samples/deflate/deflate.vmsbuild | 8 -- Foundation/samples/dir/dir.vmsbuild | 8 -- Foundation/samples/grep/grep.vmsbuild | 8 -- Foundation/samples/hmacmd5/hmacmd5.vmsbuild | 8 -- Foundation/samples/inflate/inflate.vmsbuild | 8 -- Foundation/samples/md5/md5.vmsbuild | 8 -- Foundation/samples/uuidgen/uuidgen.vmsbuild | 8 -- Foundation/testsuite/testapp.vmsbuild | 7 - Foundation/testsuite/testlibrary.vmsbuild | 8 -- Foundation/testsuite/testsuite.vmsbuild | 106 --------------- Net/Net.vmsbuild | 7 - Net/samples/EchoServer/EchoServer.vmsbuild | 8 -- .../HTTPFormServer/HTTPFormServer.vmsbuild | 8 -- .../HTTPLoadTest/HTTPLoadTest.vmsbuild | 7 - .../HTTPTimeServer/HTTPTimeServer.vmsbuild | 8 -- Net/samples/Mail/Mail.vmsbuild | 8 -- Net/samples/Ping/Ping.vmsbuild | 7 - Net/samples/SMTPLogger/SMTPLogger.vmsbuild | 8 -- Net/samples/TimeServer/TimeServer.vmsbuild | 8 -- Net/samples/dict/dict.vmsbuild | 8 -- Net/samples/download/download.vmsbuild | 8 -- Net/samples/httpget/httpget.vmsbuild | 8 -- Net/testsuite/TestSuite.vmsbuild | 9 -- .../HTTPSTimeServer/HTTPSTimeServer.vmsbuild | 7 - NetSSL_OpenSSL/samples/Mail/Mail.vmsbuild | 8 -- .../samples/download/download.vmsbuild | 8 -- NetSSL_OpenSSL/testsuite/TestSuite.vmsbuild | 9 -- Util/Util.vmsbuild | 26 ---- Util/samples/SampleApp/SampleApp.vmsbuild | 7 - .../SampleServer/SampleServer.vmsbuild | 8 -- Util/testsuite/TestSuite.vmsbuild | 25 ---- XML/XML.vmsbuild | 76 ----------- XML/samples/DOMParser/DOMParser.vmsbuild | 8 -- XML/samples/DOMWriter/DOMWriter.vmsbuild | 8 -- XML/samples/PrettyPrint/PrettyPrint.vmsbuild | 8 -- XML/samples/SAXParser/SAXParser.vmsbuild | 8 -- XML/testsuite/TestSuite.vmsbuild | 26 ---- Zip/Zip.vmsbuild | 16 --- Zip/testsuite/TestSuite.vmsbuild | 9 -- 56 files changed, 806 deletions(-) delete mode 100644 CppParser/testsuite/TestSuite.vmsbuild delete mode 100644 CppUnit/cppunit.vmsbuild delete mode 100644 Crypto/testsuite/TestSuite.vmsbuild delete mode 100644 Data/testsuite/TestSuite.vmsbuild delete mode 100644 Foundation/foundation.vmsbuild delete mode 100644 Foundation/samples/ActiveMethod/ActiveMethod.vmsbuild delete mode 100644 Foundation/samples/Activity/Activity.vmsbuild delete mode 100644 Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.vmsbuild delete mode 100644 Foundation/samples/DateTime/DateTime.vmsbuild delete mode 100644 Foundation/samples/LogRotation/LogRotation.vmsbuild delete mode 100644 Foundation/samples/Logger/Logger.vmsbuild delete mode 100644 Foundation/samples/NotificationQueue/NotificationQueue.vmsbuild delete mode 100644 Foundation/samples/StringTokenizer/StringTokenizer.vmsbuild delete mode 100644 Foundation/samples/Timer/Timer.vmsbuild delete mode 100644 Foundation/samples/URI/URI.vmsbuild delete mode 100644 Foundation/samples/base64decode/base64decode.vmsbuild delete mode 100644 Foundation/samples/base64encode/base64encode.vmsbuild delete mode 100644 Foundation/samples/deflate/deflate.vmsbuild delete mode 100644 Foundation/samples/dir/dir.vmsbuild delete mode 100644 Foundation/samples/grep/grep.vmsbuild delete mode 100644 Foundation/samples/hmacmd5/hmacmd5.vmsbuild delete mode 100644 Foundation/samples/inflate/inflate.vmsbuild delete mode 100644 Foundation/samples/md5/md5.vmsbuild delete mode 100644 Foundation/samples/uuidgen/uuidgen.vmsbuild delete mode 100644 Foundation/testsuite/testapp.vmsbuild delete mode 100644 Foundation/testsuite/testlibrary.vmsbuild delete mode 100644 Foundation/testsuite/testsuite.vmsbuild delete mode 100644 Net/Net.vmsbuild delete mode 100644 Net/samples/EchoServer/EchoServer.vmsbuild delete mode 100644 Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild delete mode 100644 Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild delete mode 100644 Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild delete mode 100644 Net/samples/Mail/Mail.vmsbuild delete mode 100644 Net/samples/Ping/Ping.vmsbuild delete mode 100644 Net/samples/SMTPLogger/SMTPLogger.vmsbuild delete mode 100644 Net/samples/TimeServer/TimeServer.vmsbuild delete mode 100644 Net/samples/dict/dict.vmsbuild delete mode 100644 Net/samples/download/download.vmsbuild delete mode 100644 Net/samples/httpget/httpget.vmsbuild delete mode 100644 Net/testsuite/TestSuite.vmsbuild delete mode 100644 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.vmsbuild delete mode 100644 NetSSL_OpenSSL/samples/Mail/Mail.vmsbuild delete mode 100644 NetSSL_OpenSSL/samples/download/download.vmsbuild delete mode 100644 NetSSL_OpenSSL/testsuite/TestSuite.vmsbuild delete mode 100644 Util/Util.vmsbuild delete mode 100644 Util/samples/SampleApp/SampleApp.vmsbuild delete mode 100644 Util/samples/SampleServer/SampleServer.vmsbuild delete mode 100644 Util/testsuite/TestSuite.vmsbuild delete mode 100644 XML/XML.vmsbuild delete mode 100644 XML/samples/DOMParser/DOMParser.vmsbuild delete mode 100644 XML/samples/DOMWriter/DOMWriter.vmsbuild delete mode 100644 XML/samples/PrettyPrint/PrettyPrint.vmsbuild delete mode 100644 XML/samples/SAXParser/SAXParser.vmsbuild delete mode 100644 XML/testsuite/TestSuite.vmsbuild delete mode 100644 Zip/Zip.vmsbuild delete mode 100644 Zip/testsuite/TestSuite.vmsbuild diff --git a/CppParser/testsuite/TestSuite.vmsbuild b/CppParser/testsuite/TestSuite.vmsbuild deleted file mode 100644 index 0f924b0bf..000000000 --- a/CppParser/testsuite/TestSuite.vmsbuild +++ /dev/null @@ -1,9 +0,0 @@ -# -# TestSuite.vmsbuild -# -# $Id: //poco/1.3/CppParser/testsuite/TestSuite.vmsbuild#1 $ -# -EXE=TestRunner -CppParserTestSuite -Driver -CppParserTest diff --git a/CppUnit/cppunit.vmsbuild b/CppUnit/cppunit.vmsbuild deleted file mode 100644 index 789d2c8b9..000000000 --- a/CppUnit/cppunit.vmsbuild +++ /dev/null @@ -1,14 +0,0 @@ -# -# buildfiles.vms -# -# $Id: //poco/CppUnit/cppunit.vmsbuild#1 $ -# -LIB=CppUnit -CppUnitException -TestCase -TestDecorator -TestFailure -TestResult -TestRunner -TestSuite -TextTestResult diff --git a/Crypto/testsuite/TestSuite.vmsbuild b/Crypto/testsuite/TestSuite.vmsbuild deleted file mode 100644 index fcf8fa0ef..000000000 --- a/Crypto/testsuite/TestSuite.vmsbuild +++ /dev/null @@ -1,9 +0,0 @@ -# -# TestSuite.vmsbuild -# -# $Id: //poco/Main/template/TestSuite.vmsbuild#3 $ -# -EXE=TestRunner -CryptoTestSuite -Driver - diff --git a/Data/testsuite/TestSuite.vmsbuild b/Data/testsuite/TestSuite.vmsbuild deleted file mode 100644 index 735264708..000000000 --- a/Data/testsuite/TestSuite.vmsbuild +++ /dev/null @@ -1,16 +0,0 @@ -# -# TestSuite.vmsbuild -# -# $Id: //poco/Main/Data/testsuite/TestSuite.vmsbuild#2 $ -# -EXE=TestRunner -DataTestSuite -Driver -DataTest -SessionPoolTest -Binder -Extractor -Preparation -SessionImpl -SessionInstantiator -StatementImpl \ No newline at end of file diff --git a/Foundation/foundation.vmsbuild b/Foundation/foundation.vmsbuild deleted file mode 100644 index 2a1592a2c..000000000 --- a/Foundation/foundation.vmsbuild +++ /dev/null @@ -1,126 +0,0 @@ -# -# Foundation.vmsbuild -# -# $Id: //poco/Foundation/foundation.vmsbuild#8 $ -# -LIB=PocoFoundation -ASCIIEncoding -AsyncChannel -Base64Decoder -Base64Encoder -BinaryReader -BinaryWriter -Bugcheck -ByteOrder -Channel -Checksum -Configurable -ConsoleChannel -CountingStream -DateTime -LocalDateTime -DateTimeFormat -DateTimeFormatter -DateTimeParser -Debugger -DeflatingStream -DigestEngine -DigestStream -DirectoryIterator -Environment -Event -EventArgs -Exception -FPEnvironment -File -Glob -FileChannel -Formatter -FormattingChannel -HashStatistic -HexBinaryDecoder -HexBinaryEncoder -InflatingStream -Latin1Encoding -Latin9Encoding -Logger -LoggingFactory -LoggingRegistry -NamedEvent -NamedMutex -NullChannel -MD4Engine -MD5Engine -Manifest -Message -Mutex -NestedDiagnosticContext -Notification -NotificationCenter -NotificationQueue -NullStream -NumberFormatter -NumberParser -Observer -Path -PatternFormatter -Process -RWLock -Random -RandomStream -RegularExpression -RefCountedObject -Runnable -SHA1Engine -Semaphore -SharedLibrary -SignalHandler -SplitterChannel -Stopwatch -StreamChannel -StreamConverter -StreamCopier -StreamTokenizer -String -StringTokenizer -SynchronizedObject -SyslogChannel -Task -TaskManager -TaskNotification -TemporaryFile -TextConverter -TextEncoding -TextIterator -Thread -ThreadLocal -ThreadPool -Timer -Timespan -Timestamp -Timezone -Token -URI -URIFileStreamFactory -URIStreamFactory -URIStreamOpener -UTF16Encoding -UTF8Encoding -UUID -UUIDGenerator -adler32 -chartables -compress -crc32 -deflate -get -gzio -infback -inffast -inflate -inftrees -maketables -pcre -study -trees -zutil diff --git a/Foundation/samples/ActiveMethod/ActiveMethod.vmsbuild b/Foundation/samples/ActiveMethod/ActiveMethod.vmsbuild deleted file mode 100644 index ad0d55ef5..000000000 --- a/Foundation/samples/ActiveMethod/ActiveMethod.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/ActiveMethod/ActiveMethod.vmsbuild#1 $ -# -EXE=ActiveMethod -ActiveMethod - diff --git a/Foundation/samples/Activity/Activity.vmsbuild b/Foundation/samples/Activity/Activity.vmsbuild deleted file mode 100644 index 678b58886..000000000 --- a/Foundation/samples/Activity/Activity.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/Activity/Activity.vmsbuild#1 $ -# -EXE=Activity -Activity - diff --git a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.vmsbuild b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.vmsbuild deleted file mode 100644 index 084078f18..000000000 --- a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.vmsbuild#1 $ -# -EXE=BinaryReaderWriter -BinaryReaderWriter - diff --git a/Foundation/samples/DateTime/DateTime.vmsbuild b/Foundation/samples/DateTime/DateTime.vmsbuild deleted file mode 100644 index 2f332c66b..000000000 --- a/Foundation/samples/DateTime/DateTime.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/DateTime/DateTime.vmsbuild#1 $ -# -EXE=DateTime -DateTime - diff --git a/Foundation/samples/LogRotation/LogRotation.vmsbuild b/Foundation/samples/LogRotation/LogRotation.vmsbuild deleted file mode 100644 index 033334df3..000000000 --- a/Foundation/samples/LogRotation/LogRotation.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/LogRotation/LogRotation.vmsbuild#1 $ -# -EXE=Logrotation -LogRotation - diff --git a/Foundation/samples/Logger/Logger.vmsbuild b/Foundation/samples/Logger/Logger.vmsbuild deleted file mode 100644 index d463ee3bd..000000000 --- a/Foundation/samples/Logger/Logger.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/Logger/Logger.vmsbuild#1 $ -# -EXE=Logger -Logger - diff --git a/Foundation/samples/NotificationQueue/NotificationQueue.vmsbuild b/Foundation/samples/NotificationQueue/NotificationQueue.vmsbuild deleted file mode 100644 index 295c3fab5..000000000 --- a/Foundation/samples/NotificationQueue/NotificationQueue.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/NotificationQueue/NotificationQueue.vmsbuild#1 $ -# -EXE=NotificationQueue -NotificationQueue - diff --git a/Foundation/samples/StringTokenizer/StringTokenizer.vmsbuild b/Foundation/samples/StringTokenizer/StringTokenizer.vmsbuild deleted file mode 100644 index 2987fe35f..000000000 --- a/Foundation/samples/StringTokenizer/StringTokenizer.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/StringTokenizer/StringTokenizer.vmsbuild#1 $ -# -EXE=StringTokenizer -StringTokenizer - diff --git a/Foundation/samples/Timer/Timer.vmsbuild b/Foundation/samples/Timer/Timer.vmsbuild deleted file mode 100644 index 3fefee28e..000000000 --- a/Foundation/samples/Timer/Timer.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/Timer/Timer.vmsbuild#1 $ -# -EXE=Timer -Timer - diff --git a/Foundation/samples/URI/URI.vmsbuild b/Foundation/samples/URI/URI.vmsbuild deleted file mode 100644 index 97f6d3417..000000000 --- a/Foundation/samples/URI/URI.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/URI/URI.vmsbuild#1 $ -# -EXE=URI -URI - diff --git a/Foundation/samples/base64decode/base64decode.vmsbuild b/Foundation/samples/base64decode/base64decode.vmsbuild deleted file mode 100644 index 0c20c7a4d..000000000 --- a/Foundation/samples/base64decode/base64decode.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/base64decode/base64decode.vmsbuild#1 $ -# -EXE=base64decode -base64decode - diff --git a/Foundation/samples/base64encode/base64encode.vmsbuild b/Foundation/samples/base64encode/base64encode.vmsbuild deleted file mode 100644 index 1af9dfa31..000000000 --- a/Foundation/samples/base64encode/base64encode.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/base64encode/base64encode.vmsbuild#1 $ -# -EXE=base64encode -base64encode - diff --git a/Foundation/samples/deflate/deflate.vmsbuild b/Foundation/samples/deflate/deflate.vmsbuild deleted file mode 100644 index b070ab294..000000000 --- a/Foundation/samples/deflate/deflate.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/deflate/deflate.vmsbuild#1 $ -# -EXE=deflate -deflate - diff --git a/Foundation/samples/dir/dir.vmsbuild b/Foundation/samples/dir/dir.vmsbuild deleted file mode 100644 index 966742402..000000000 --- a/Foundation/samples/dir/dir.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/dir/dir.vmsbuild#1 $ -# -EXE=dir -dir - diff --git a/Foundation/samples/grep/grep.vmsbuild b/Foundation/samples/grep/grep.vmsbuild deleted file mode 100644 index f25e6c0d2..000000000 --- a/Foundation/samples/grep/grep.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/grep/grep.vmsbuild#1 $ -# -EXE=grep -grep - diff --git a/Foundation/samples/hmacmd5/hmacmd5.vmsbuild b/Foundation/samples/hmacmd5/hmacmd5.vmsbuild deleted file mode 100644 index 902414b8b..000000000 --- a/Foundation/samples/hmacmd5/hmacmd5.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/hmacmd5/hmacmd5.vmsbuild#1 $ -# -EXE=hmacmd5 -hmacmd5 - diff --git a/Foundation/samples/inflate/inflate.vmsbuild b/Foundation/samples/inflate/inflate.vmsbuild deleted file mode 100644 index 31e53e23c..000000000 --- a/Foundation/samples/inflate/inflate.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/inflate/inflate.vmsbuild#1 $ -# -EXE=inflate -inflate - diff --git a/Foundation/samples/md5/md5.vmsbuild b/Foundation/samples/md5/md5.vmsbuild deleted file mode 100644 index 47b8e885c..000000000 --- a/Foundation/samples/md5/md5.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/md5/md5.vmsbuild#1 $ -# -EXE=md5 -md5 - diff --git a/Foundation/samples/uuidgen/uuidgen.vmsbuild b/Foundation/samples/uuidgen/uuidgen.vmsbuild deleted file mode 100644 index 9c2c239c5..000000000 --- a/Foundation/samples/uuidgen/uuidgen.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/samples/uuidgen/uuidgen.vmsbuild#1 $ -# -EXE=uuidgen -uuidgen - diff --git a/Foundation/testsuite/testapp.vmsbuild b/Foundation/testsuite/testapp.vmsbuild deleted file mode 100644 index 4e2f8a844..000000000 --- a/Foundation/testsuite/testapp.vmsbuild +++ /dev/null @@ -1,7 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Foundation/testsuite/testapp.vmsbuild#1 $ -# -EXE=TestApp -TestApp diff --git a/Foundation/testsuite/testlibrary.vmsbuild b/Foundation/testsuite/testlibrary.vmsbuild deleted file mode 100644 index 5e0617fbd..000000000 --- a/Foundation/testsuite/testlibrary.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# buildfiles.vms -# -# $Id: //poco/1.4/Foundation/testsuite/testlibrary.vmsbuild#1 $ -# -SHR=TestLibrary -TestPlugin -TestLibrary diff --git a/Foundation/testsuite/testsuite.vmsbuild b/Foundation/testsuite/testsuite.vmsbuild deleted file mode 100644 index 06f62480a..000000000 --- a/Foundation/testsuite/testsuite.vmsbuild +++ /dev/null @@ -1,106 +0,0 @@ -# -# buildfiles.vms -# -# $Id: //poco/1.4/Foundation/testsuite/testsuite.vmsbuild#2 $ -# -EXE=TestRunner -ActiveMethodTest -ActivityTest -AutoPtrTest -SmartPtrTest -Base64Test -AutoReleasePoolTest -BinaryReaderWriterTest -ByteOrderTest -ChannelTest -ClassLoaderTest -CoreTest -CoreTestSuite -CountingStreamTest -CryptTestSuite -DateTimeFormatterTest -DateTimeParserTest -DateTimeTest -LocalDateTimeTest -DateTimeTestSuite -DigestStreamTest -Driver -DynamicFactoryTest -FPETest -FileChannelTest -FileTest -GlobTest -FilesystemTestSuite -FoundationTestSuite -HMACEngineTest -HashTest -HexBinaryTest -LoggerTest -LoggingFactoryTest -LoggingRegistryTest -LoggingTestSuite -NamedEventTest -NamedMutexTest -ProcessesTestSuite -MD4EngineTest -MD5EngineTest -ManifestTest -NDCTest -NotificationCenterTest -NotificationQueueTest -NotificationsTestSuite -NullStreamTest -NumberFormatterTest -NumberParserTest -PathTest -PatternFormatterTest -RWLockTest -RandomStreamTest -RandomTest -RegularExpressionTest -SHA1EngineTest -SemaphoreTest -SharedLibraryTest -SharedLibraryTestSuite -StopwatchTest -StreamConverterTest -StreamCopierTest -StreamTokenizerTest -StreamsTestSuite -StringTest -StringTokenizerTest -TaskTestSuite -TaskTest -TaskManagerTest -TestChannel -TextConverterTest -TextIteratorTest -TextTestSuite -ThreadLocalTest -ThreadPoolTest -ThreadTest -ThreadingTestSuite -TimerTest -TimespanTest -TimestampTest -TimezoneTest -URIStreamOpenerTest -URITest -URITestSuite -UUIDGeneratorTest -UUIDTest -UUIDTestSuite -ZLibTest -TestPlugin -CacheTestSuite -EventTestSuite -ExpireCacheTest -ExpireLRUCacheTest -FIFOEventTest -LRUCacheTest -PriorityEventTest -AnyTest -TypesTestSuite -UniqueExpireCacheTest -UniqueExpireLRUCacheTest -TuplesTest diff --git a/Net/Net.vmsbuild b/Net/Net.vmsbuild deleted file mode 100644 index 65ba12ffe..000000000 --- a/Net/Net.vmsbuild +++ /dev/null @@ -1,7 +0,0 @@ -# -# Net.vmsbuild -# -# $Id: //poco/1.4/Net/Net.vmsbuild#1 $ -# -LIB=PocoNet - diff --git a/Net/samples/EchoServer/EchoServer.vmsbuild b/Net/samples/EchoServer/EchoServer.vmsbuild deleted file mode 100644 index d3d75a692..000000000 --- a/Net/samples/EchoServer/EchoServer.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Net/samples/EchoServer/EchoServer.vmsbuild#1 $ -# -EXE=EchoServer -EchoServer - diff --git a/Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild b/Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild deleted file mode 100644 index 4640403f3..000000000 --- a/Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild#1 $ -# -EXE=HTTPFormServer -HTTPFormServer - diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild b/Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild deleted file mode 100644 index d65afcf85..000000000 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild +++ /dev/null @@ -1,7 +0,0 @@ -# -# HTTPLoadTest.vmsbuild -# -# $Id: //poco/1.4/Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild#1 $ -# -EXE=HTTPLoadTest -HTTPLoadTest diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild b/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild deleted file mode 100644 index bb821cfd1..000000000 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild#1 $ -# -EXE=HTTPTimeServer -HTTPTimeServer - diff --git a/Net/samples/Mail/Mail.vmsbuild b/Net/samples/Mail/Mail.vmsbuild deleted file mode 100644 index 9bf00fd00..000000000 --- a/Net/samples/Mail/Mail.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Net/samples/Mail/Mail.vmsbuild#1 $ -# -EXE=Mail -Mail - diff --git a/Net/samples/Ping/Ping.vmsbuild b/Net/samples/Ping/Ping.vmsbuild deleted file mode 100644 index 3f33fa264..000000000 --- a/Net/samples/Ping/Ping.vmsbuild +++ /dev/null @@ -1,7 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Net/samples/Ping/Ping.vmsbuild#1 $ -# -EXE=Ping -Ping diff --git a/Net/samples/SMTPLogger/SMTPLogger.vmsbuild b/Net/samples/SMTPLogger/SMTPLogger.vmsbuild deleted file mode 100644 index 3371e120c..000000000 --- a/Net/samples/SMTPLogger/SMTPLogger.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/Main/Net/samples/SMTPLogger/SMTPLogger.vmsbuild#1 $ -# -EXE=SMTPLogger -SMTPLogger - diff --git a/Net/samples/TimeServer/TimeServer.vmsbuild b/Net/samples/TimeServer/TimeServer.vmsbuild deleted file mode 100644 index 3b22b2e33..000000000 --- a/Net/samples/TimeServer/TimeServer.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Net/samples/TimeServer/TimeServer.vmsbuild#1 $ -# -EXE=TimeServer -TimeServer - diff --git a/Net/samples/dict/dict.vmsbuild b/Net/samples/dict/dict.vmsbuild deleted file mode 100644 index 7db4e2f3c..000000000 --- a/Net/samples/dict/dict.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Net/samples/dict/dict.vmsbuild#1 $ -# -EXE=dict -dict - diff --git a/Net/samples/download/download.vmsbuild b/Net/samples/download/download.vmsbuild deleted file mode 100644 index ff5dd0fcc..000000000 --- a/Net/samples/download/download.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/Main/template/sample.vmsbuild#3 $ -# -EXE=download -download - diff --git a/Net/samples/httpget/httpget.vmsbuild b/Net/samples/httpget/httpget.vmsbuild deleted file mode 100644 index 56a8e542b..000000000 --- a/Net/samples/httpget/httpget.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Net/samples/httpget/httpget.vmsbuild#1 $ -# -EXE=httpget -httpget - diff --git a/Net/testsuite/TestSuite.vmsbuild b/Net/testsuite/TestSuite.vmsbuild deleted file mode 100644 index 71a94c93e..000000000 --- a/Net/testsuite/TestSuite.vmsbuild +++ /dev/null @@ -1,9 +0,0 @@ -# -# TestSuite.vmsbuild -# -# $Id: //poco/1.4/Net/testsuite/TestSuite.vmsbuild#1 $ -# -EXE=TestRunner -NetTestSuite -Driver - diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.vmsbuild b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.vmsbuild deleted file mode 100644 index 08d7a1d61..000000000 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.vmsbuild +++ /dev/null @@ -1,7 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/Main/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild#1 $ -# -EXE=HTTPSTimeServer -HTTPSTimeServer diff --git a/NetSSL_OpenSSL/samples/Mail/Mail.vmsbuild b/NetSSL_OpenSSL/samples/Mail/Mail.vmsbuild deleted file mode 100644 index 9bf00fd00..000000000 --- a/NetSSL_OpenSSL/samples/Mail/Mail.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Net/samples/Mail/Mail.vmsbuild#1 $ -# -EXE=Mail -Mail - diff --git a/NetSSL_OpenSSL/samples/download/download.vmsbuild b/NetSSL_OpenSSL/samples/download/download.vmsbuild deleted file mode 100644 index ff5dd0fcc..000000000 --- a/NetSSL_OpenSSL/samples/download/download.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/Main/template/sample.vmsbuild#3 $ -# -EXE=download -download - diff --git a/NetSSL_OpenSSL/testsuite/TestSuite.vmsbuild b/NetSSL_OpenSSL/testsuite/TestSuite.vmsbuild deleted file mode 100644 index 72d89c2aa..000000000 --- a/NetSSL_OpenSSL/testsuite/TestSuite.vmsbuild +++ /dev/null @@ -1,9 +0,0 @@ -# -# TestSuite.vmsbuild -# -# $Id: //poco/Main/template/TestSuite.vmsbuild#3 $ -# -EXE=TestRunner -OpenSSLTestSuite -Driver - diff --git a/Util/Util.vmsbuild b/Util/Util.vmsbuild deleted file mode 100644 index c88e68cd8..000000000 --- a/Util/Util.vmsbuild +++ /dev/null @@ -1,26 +0,0 @@ -# -# Util.vmsbuild -# -# $Id: //poco/1.4/Util/Util.vmsbuild#1 $ -# -LIB=PocoUtil -AbstractConfiguration -Application -ConfigurationMapper -ConfigurationView -HelpFormatter -IniFileConfiguration -LayeredConfiguration -LoggingConfigurator -LoggingSubsystem -MapConfiguration -Option -OptionException -OptionProcessor -OptionSet -PropertyFileConfiguration -Subsystem -SystemConfiguration -XMLConfiguration -FilesystemConfiguration -ServerApplication diff --git a/Util/samples/SampleApp/SampleApp.vmsbuild b/Util/samples/SampleApp/SampleApp.vmsbuild deleted file mode 100644 index 1b0d20e77..000000000 --- a/Util/samples/SampleApp/SampleApp.vmsbuild +++ /dev/null @@ -1,7 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Util/samples/SampleApp/SampleApp.vmsbuild#1 $ -# -EXE=SampleApp -SampleApp diff --git a/Util/samples/SampleServer/SampleServer.vmsbuild b/Util/samples/SampleServer/SampleServer.vmsbuild deleted file mode 100644 index 00bdcc104..000000000 --- a/Util/samples/SampleServer/SampleServer.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/Util/samples/SampleServer/SampleServer.vmsbuild#1 $ -# -EXE=SampleServer -SampleServer - diff --git a/Util/testsuite/TestSuite.vmsbuild b/Util/testsuite/TestSuite.vmsbuild deleted file mode 100644 index ad5fe8714..000000000 --- a/Util/testsuite/TestSuite.vmsbuild +++ /dev/null @@ -1,25 +0,0 @@ -# -# TestSuite.vmsbuild -# -# $Id: //poco/1.4/Util/testsuite/TestSuite.vmsbuild#1 $ -# -EXE=TestRunner -AbstractConfigurationTest -ConfigurationTestSuite -ConfigurationMapperTest -ConfigurationViewTest -Driver -HelpFormatterTest -IniFileConfigurationTest -LayeredConfigurationTest -LoggingConfiguratorTest -MapConfigurationTest -OptionProcessorTest -OptionSetTest -OptionTest -OptionsTestSuite -PropertyFileConfigurationTest -SystemConfigurationTest -UtilTestSuite -XMLConfigurationTest -FilesystemConfigurationTest diff --git a/XML/XML.vmsbuild b/XML/XML.vmsbuild deleted file mode 100644 index 2a9fdf490..000000000 --- a/XML/XML.vmsbuild +++ /dev/null @@ -1,76 +0,0 @@ -# -# XML.vmsbuild -# -# $Id: //poco/1.4/XML/XML.vmsbuild#1 $ -# -DEF=HAVE_EXPAT_CONFIG_H,XML_NS,XML_DTD -LIB=PocoXML -AbstractContainerNode -AbstractNode -Attr -AttrMap -Attributes -AttributesImpl -CDATASection -CharacterData -ChildNodesList -Comment -ContentHandler -DOMBuilder -DOMException -DOMImplementation -DOMObject -DOMParser -DOMSerializer -DOMWriter -DTDHandler -DTDMap -DeclHandler -DefaultHandler -Document -DocumentEvent -DocumentFragment -DocumentType -Element -ElementsByTagNameList -Entity -EntityReference -EntityResolver -EntityResolverImpl -ErrorHandler -Event -EventDispatcher -EventException -EventListener -EventTarget -InputSource -LexicalHandler -Locator -LocatorImpl -MutationEvent -Name -NamePool -NamedNodeMap -NamespaceStrategy -NamespaceSupport -Node -NodeFilter -NodeIterator -NodeList -Notation -ParserEngine -ProcessingInstruction -SAXException -SAXParser -Text -TreeWalker -WhitespaceFilter -XMLException -XMLFilter -XMLFilterImpl -XMLReader -XMLString -XMLWriter -xmlparse -xmlrole -xmltok diff --git a/XML/samples/DOMParser/DOMParser.vmsbuild b/XML/samples/DOMParser/DOMParser.vmsbuild deleted file mode 100644 index 19acd6bf3..000000000 --- a/XML/samples/DOMParser/DOMParser.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/XML/samples/DOMParser/DOMParser.vmsbuild#1 $ -# -EXE=DOMParser -DOMParser - diff --git a/XML/samples/DOMWriter/DOMWriter.vmsbuild b/XML/samples/DOMWriter/DOMWriter.vmsbuild deleted file mode 100644 index ecd548aa3..000000000 --- a/XML/samples/DOMWriter/DOMWriter.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/XML/samples/DOMWriter/DOMWriter.vmsbuild#1 $ -# -EXE=DOMWriter -DOMWriter - diff --git a/XML/samples/PrettyPrint/PrettyPrint.vmsbuild b/XML/samples/PrettyPrint/PrettyPrint.vmsbuild deleted file mode 100644 index 6d6714afe..000000000 --- a/XML/samples/PrettyPrint/PrettyPrint.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/XML/samples/PrettyPrint/PrettyPrint.vmsbuild#1 $ -# -EXE=PrettyPrint -PrettyPrint - diff --git a/XML/samples/SAXParser/SAXParser.vmsbuild b/XML/samples/SAXParser/SAXParser.vmsbuild deleted file mode 100644 index 8dee7c3fb..000000000 --- a/XML/samples/SAXParser/SAXParser.vmsbuild +++ /dev/null @@ -1,8 +0,0 @@ -# -# sample.vmsbuild -# -# $Id: //poco/1.4/XML/samples/SAXParser/SAXParser.vmsbuild#1 $ -# -EXE=SAXParser -SAXParser - diff --git a/XML/testsuite/TestSuite.vmsbuild b/XML/testsuite/TestSuite.vmsbuild deleted file mode 100644 index 09bbd1e6c..000000000 --- a/XML/testsuite/TestSuite.vmsbuild +++ /dev/null @@ -1,26 +0,0 @@ -# -# TestSuite.vmsbuild -# -# $Id: //poco/1.4/XML/testsuite/TestSuite.vmsbuild#1 $ -# -EXE=TestRunner -AttributesImplTest -ChildNodesTest -DOMTestSuite -DocumentTest -DocumentTypeTest -Driver -ElementTest -EventTest -NamePoolTest -NameTest -NamespaceSupportTest -NodeIteratorTest -NodeTest -ParserWriterTest -SAXParserTest -SAXTestSuite -TextTest -TreeWalkerTest -XMLTestSuite -XMLWriterTest diff --git a/Zip/Zip.vmsbuild b/Zip/Zip.vmsbuild deleted file mode 100644 index d4f79937e..000000000 --- a/Zip/Zip.vmsbuild +++ /dev/null @@ -1,16 +0,0 @@ -# -# Zip.vmsbuild -# -# $Id: //poco/1.4/Zip/Zip.vmsbuild#1 $ -# -LIB=PocoZip -Decompress -ParseCallback -PartialStream -SkipCallback -ZipArchive -ZipArchiveInfo -ZipFileInfo -ZipLocalFileHeader -ZipStream -ZipUtil diff --git a/Zip/testsuite/TestSuite.vmsbuild b/Zip/testsuite/TestSuite.vmsbuild deleted file mode 100644 index 79267fd9f..000000000 --- a/Zip/testsuite/TestSuite.vmsbuild +++ /dev/null @@ -1,9 +0,0 @@ -# -# TestSuite.vmsbuild -# -# $Id: //poco/1.4/Zip/testsuite/TestSuite.vmsbuild#1 $ -# -EXE=TestRunner -ZipTestSuite -Driver - From 51dd9234f24cd8b20e68ad837f42b2629a844fde Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 11 Nov 2012 11:20:31 +0100 Subject: [PATCH 023/165] more line ending fixes --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index adc53da9a..8c88af1d7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,6 +3,7 @@ # Explicitly declare text files we want to always be normalized and converted # to native line endings on checkout. +*.txt text *.cpp text *.c text *.h text @@ -13,7 +14,9 @@ *.vcxproj.filters text *.page text *.html text +*.xhtml text *.css text +*.js text *.progen text *.xml text *.xsd text From c867a80520fb3f0740caa3bb3c218d4ce977df5a Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 11 Nov 2012 11:28:44 +0100 Subject: [PATCH 024/165] line ending fixes --- Crypto/CMakeLists.txt | 66 ++--- Foundation/CMakeLists.txt | 444 +++++++++++++++++----------------- JSON/CMakeLists.txt | 62 ++--- NetSSL_OpenSSL/CMakeLists.txt | 64 ++--- PDF/CMakeLists.txt | 62 ++--- Util/CMakeLists.txt | 134 +++++----- XML/CMakeLists.txt | 58 ++--- Zip/CMakeLists.txt | 62 ++--- 8 files changed, 476 insertions(+), 476 deletions(-) diff --git a/Crypto/CMakeLists.txt b/Crypto/CMakeLists.txt index d2dbf171c..3ce1f7a99 100644 --- a/Crypto/CMakeLists.txt +++ b/Crypto/CMakeLists.txt @@ -1,33 +1,33 @@ -set(LIBNAME "PocoCrypto") -set(LIBNAME "${LIBNAME}${LIB_EXT}") - -aux_source_directory(src SRCS) -add_definitions(-D_USRDLL -DCrypto_EXPORTS) -include_directories( include) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) - -#if(CMAKE_SYSTEM MATCHES "Windows") -# target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${LIB_EAY_RELEASE} ${OPENSSL_LIBRARIES} ) -#ELSE() -# target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ) -#ENDIF() - -target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${OPENSSL_LIBRARIES} ) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () +set(LIBNAME "PocoCrypto") +set(LIBNAME "${LIBNAME}${LIB_EXT}") + +aux_source_directory(src SRCS) +add_definitions(-D_USRDLL -DCrypto_EXPORTS) +include_directories( include) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) + +#if(CMAKE_SYSTEM MATCHES "Windows") +# target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${LIB_EAY_RELEASE} ${OPENSSL_LIBRARIES} ) +#ELSE() +# target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ) +#ENDIF() + +target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${OPENSSL_LIBRARIES} ) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt index 65e43cafd..738bdf07a 100644 --- a/Foundation/CMakeLists.txt +++ b/Foundation/CMakeLists.txt @@ -1,222 +1,222 @@ -set(LIBNAME "PocoFoundation") -if (CMAKE_BUILD_TYPE MATCHES Debug) - set(LIBNAME "${LIBNAME}d") -endif() - - -set( BASE_SRCS - src/ASCIIEncoding.cpp - src/Ascii.cpp - src/AtomicCounter.cpp - src/AbstractObserver.cpp - src/ActiveDispatcher.cpp - src/ArchiveStrategy.cpp - src/AsyncChannel.cpp - src/Base64Decoder.cpp - src/Base64Encoder.cpp - src/BinaryReader.cpp - src/BinaryWriter.cpp - src/Bugcheck.cpp - src/ByteOrder.cpp - src/Channel.cpp - src/Checksum.cpp - src/Condition.cpp - src/Configurable.cpp - src/ConsoleChannel.cpp - src/CountingStream.cpp - src/DateTime.cpp - src/DateTimeFormat.cpp - src/DateTimeFormatter.cpp - src/DateTimeParser.cpp - src/Debugger.cpp - src/DeflatingStream.cpp - src/DigestEngine.cpp - src/DigestStream.cpp - src/DirectoryIterator.cpp - src/Environment.cpp - src/ErrorHandler.cpp - src/Event.cpp - src/EventArgs.cpp - src/Exception.cpp - src/FPEnvironment.cpp - src/File.cpp - src/FIFOBufferStream.cpp - src/FileChannel.cpp - src/FileStream.cpp - src/FileStreamFactory.cpp - src/Format.cpp - src/Formatter.cpp - src/FormattingChannel.cpp - src/Glob.cpp - src/Hash.cpp - src/HashStatistic.cpp - src/HexBinaryDecoder.cpp - src/HexBinaryEncoder.cpp - src/InflatingStream.cpp - src/Latin1Encoding.cpp - src/Latin2Encoding.cpp - src/Latin9Encoding.cpp - src/LineEndingConverter.cpp - src/LocalDateTime.cpp - src/LogFile.cpp - src/LogStream.cpp - src/Logger.cpp - src/LoggingFactory.cpp - src/LoggingRegistry.cpp - src/MD4Engine.cpp - src/MD5Engine.cpp - src/Manifest.cpp - src/MemoryPool.cpp - src/MemoryStream.cpp - src/Message.cpp - src/Mutex.cpp - src/NamedEvent.cpp - src/NamedMutex.cpp - src/NestedDiagnosticContext.cpp - src/Notification.cpp - src/NotificationCenter.cpp - src/NotificationQueue.cpp - src/TimedNotificationQueue.cpp - src/PriorityNotificationQueue.cpp - src/NullChannel.cpp - src/NullStream.cpp - src/NumberFormatter.cpp - src/NumberParser.cpp -# src/OpcomChannel.cpp - src/Path.cpp - src/PatternFormatter.cpp - src/Pipe.cpp - src/PipeImpl.cpp - src/PipeStream.cpp - src/Process.cpp - src/PurgeStrategy.cpp - src/RWLock.cpp - src/Random.cpp - src/RandomStream.cpp - src/RefCountedObject.cpp - src/RegularExpression.cpp - src/RotateStrategy.cpp - src/Runnable.cpp - src/SHA1Engine.cpp - src/Semaphore.cpp - src/SharedLibrary.cpp - src/SharedMemory.cpp - src/SignalHandler.cpp - src/SimpleFileChannel.cpp - src/SplitterChannel.cpp - src/Stopwatch.cpp - src/StreamChannel.cpp - src/StreamConverter.cpp - src/StreamCopier.cpp - src/StreamTokenizer.cpp - src/String.cpp - src/StringTokenizer.cpp - src/SynchronizedObject.cpp - src/Task.cpp - src/TaskManager.cpp - src/TaskNotification.cpp - src/TeeStream.cpp - src/TemporaryFile.cpp - src/TextConverter.cpp - src/TextEncoding.cpp - src/TextIterator.cpp - src/TextBufferIterator.cpp - src/Thread.cpp - src/ThreadTarget.cpp - src/ThreadLocal.cpp - src/ThreadPool.cpp - src/Timer.cpp - src/Timespan.cpp - src/Timestamp.cpp - src/Timezone.cpp - src/Token.cpp - src/URI.cpp - src/URIStreamFactory.cpp - src/URIStreamOpener.cpp - src/UTF16Encoding.cpp - src/UTF32Encoding.cpp - src/UTF8Encoding.cpp - src/UTF8String.cpp - src/UUID.cpp - src/UUIDGenerator.cpp - src/Unicode.cpp - src/UnicodeConverter.cpp - src/Var.cpp - src/VarHolder.cpp - src/Void.cpp - src/Windows1250Encoding.cpp - src/Windows1251Encoding.cpp - src/Windows1252Encoding.cpp - src/adler32.c - src/compress.c - src/crc32.c - src/deflate.c - src/gzclose.c - src/gzlib.c - src/gzread.c - src/gzwrite.c - src/uncompr.c - src/infback.c - src/inffast.c - src/inflate.c - src/inftrees.c - src/pcre_chartables.c - src/pcre_compile.c - src/pcre_exec.c - src/pcre_fullinfo.c - src/pcre_globals.c - src/pcre_maketables.c - src/pcre_newline.c - src/pcre_ord2utf8.c - src/pcre_study.c - src/pcre_tables.c - src/pcre_try_flipped.c - src/pcre_ucd.c - src/pcre_valid_utf8.c - src/pcre_xclass.c - src/pocomsg.mc - src/trees.c - src/zutil.c -) - -set(WIN_SRCS - src/EventLogChannel.cpp - src/WindowsConsoleChannel.cpp -) - -set(LIN_SRCS - src/SyslogChannel.cpp -) - -if(CMAKE_SYSTEM MATCHES "Windows") - set(SRCS ${BASE_SRCS} ${WIN_SRCS}) - add_definitions( -DPCRE_STATIC -DFoundation_EXPORTS) - set(SYSLIBS ${SYSLIBS} iphlpapi) -else (CMAKE_SYSTEM MATCHES "Windows") - set(SRCS ${BASE_SRCS} ${LIN_SRCS}) - add_definitions( -DPCRE_STATIC) -endif(CMAKE_SYSTEM MATCHES "Windows") - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -if (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") - set_target_properties( ${LIBNAME} PROPERTIES LINK_FLAGS "-library=stlport4") -endif (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") -target_link_libraries( ${LIBNAME} ${SYSLIBS}) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory( samples ) - add_subdirectory( testsuite ) -endif () - +set(LIBNAME "PocoFoundation") +if (CMAKE_BUILD_TYPE MATCHES Debug) + set(LIBNAME "${LIBNAME}d") +endif() + + +set( BASE_SRCS + src/ASCIIEncoding.cpp + src/Ascii.cpp + src/AtomicCounter.cpp + src/AbstractObserver.cpp + src/ActiveDispatcher.cpp + src/ArchiveStrategy.cpp + src/AsyncChannel.cpp + src/Base64Decoder.cpp + src/Base64Encoder.cpp + src/BinaryReader.cpp + src/BinaryWriter.cpp + src/Bugcheck.cpp + src/ByteOrder.cpp + src/Channel.cpp + src/Checksum.cpp + src/Condition.cpp + src/Configurable.cpp + src/ConsoleChannel.cpp + src/CountingStream.cpp + src/DateTime.cpp + src/DateTimeFormat.cpp + src/DateTimeFormatter.cpp + src/DateTimeParser.cpp + src/Debugger.cpp + src/DeflatingStream.cpp + src/DigestEngine.cpp + src/DigestStream.cpp + src/DirectoryIterator.cpp + src/Environment.cpp + src/ErrorHandler.cpp + src/Event.cpp + src/EventArgs.cpp + src/Exception.cpp + src/FPEnvironment.cpp + src/File.cpp + src/FIFOBufferStream.cpp + src/FileChannel.cpp + src/FileStream.cpp + src/FileStreamFactory.cpp + src/Format.cpp + src/Formatter.cpp + src/FormattingChannel.cpp + src/Glob.cpp + src/Hash.cpp + src/HashStatistic.cpp + src/HexBinaryDecoder.cpp + src/HexBinaryEncoder.cpp + src/InflatingStream.cpp + src/Latin1Encoding.cpp + src/Latin2Encoding.cpp + src/Latin9Encoding.cpp + src/LineEndingConverter.cpp + src/LocalDateTime.cpp + src/LogFile.cpp + src/LogStream.cpp + src/Logger.cpp + src/LoggingFactory.cpp + src/LoggingRegistry.cpp + src/MD4Engine.cpp + src/MD5Engine.cpp + src/Manifest.cpp + src/MemoryPool.cpp + src/MemoryStream.cpp + src/Message.cpp + src/Mutex.cpp + src/NamedEvent.cpp + src/NamedMutex.cpp + src/NestedDiagnosticContext.cpp + src/Notification.cpp + src/NotificationCenter.cpp + src/NotificationQueue.cpp + src/TimedNotificationQueue.cpp + src/PriorityNotificationQueue.cpp + src/NullChannel.cpp + src/NullStream.cpp + src/NumberFormatter.cpp + src/NumberParser.cpp +# src/OpcomChannel.cpp + src/Path.cpp + src/PatternFormatter.cpp + src/Pipe.cpp + src/PipeImpl.cpp + src/PipeStream.cpp + src/Process.cpp + src/PurgeStrategy.cpp + src/RWLock.cpp + src/Random.cpp + src/RandomStream.cpp + src/RefCountedObject.cpp + src/RegularExpression.cpp + src/RotateStrategy.cpp + src/Runnable.cpp + src/SHA1Engine.cpp + src/Semaphore.cpp + src/SharedLibrary.cpp + src/SharedMemory.cpp + src/SignalHandler.cpp + src/SimpleFileChannel.cpp + src/SplitterChannel.cpp + src/Stopwatch.cpp + src/StreamChannel.cpp + src/StreamConverter.cpp + src/StreamCopier.cpp + src/StreamTokenizer.cpp + src/String.cpp + src/StringTokenizer.cpp + src/SynchronizedObject.cpp + src/Task.cpp + src/TaskManager.cpp + src/TaskNotification.cpp + src/TeeStream.cpp + src/TemporaryFile.cpp + src/TextConverter.cpp + src/TextEncoding.cpp + src/TextIterator.cpp + src/TextBufferIterator.cpp + src/Thread.cpp + src/ThreadTarget.cpp + src/ThreadLocal.cpp + src/ThreadPool.cpp + src/Timer.cpp + src/Timespan.cpp + src/Timestamp.cpp + src/Timezone.cpp + src/Token.cpp + src/URI.cpp + src/URIStreamFactory.cpp + src/URIStreamOpener.cpp + src/UTF16Encoding.cpp + src/UTF32Encoding.cpp + src/UTF8Encoding.cpp + src/UTF8String.cpp + src/UUID.cpp + src/UUIDGenerator.cpp + src/Unicode.cpp + src/UnicodeConverter.cpp + src/Var.cpp + src/VarHolder.cpp + src/Void.cpp + src/Windows1250Encoding.cpp + src/Windows1251Encoding.cpp + src/Windows1252Encoding.cpp + src/adler32.c + src/compress.c + src/crc32.c + src/deflate.c + src/gzclose.c + src/gzlib.c + src/gzread.c + src/gzwrite.c + src/uncompr.c + src/infback.c + src/inffast.c + src/inflate.c + src/inftrees.c + src/pcre_chartables.c + src/pcre_compile.c + src/pcre_exec.c + src/pcre_fullinfo.c + src/pcre_globals.c + src/pcre_maketables.c + src/pcre_newline.c + src/pcre_ord2utf8.c + src/pcre_study.c + src/pcre_tables.c + src/pcre_try_flipped.c + src/pcre_ucd.c + src/pcre_valid_utf8.c + src/pcre_xclass.c + src/pocomsg.mc + src/trees.c + src/zutil.c +) + +set(WIN_SRCS + src/EventLogChannel.cpp + src/WindowsConsoleChannel.cpp +) + +set(LIN_SRCS + src/SyslogChannel.cpp +) + +if(CMAKE_SYSTEM MATCHES "Windows") + set(SRCS ${BASE_SRCS} ${WIN_SRCS}) + add_definitions( -DPCRE_STATIC -DFoundation_EXPORTS) + set(SYSLIBS ${SYSLIBS} iphlpapi) +else (CMAKE_SYSTEM MATCHES "Windows") + set(SRCS ${BASE_SRCS} ${LIN_SRCS}) + add_definitions( -DPCRE_STATIC) +endif(CMAKE_SYSTEM MATCHES "Windows") + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +if (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") + set_target_properties( ${LIBNAME} PROPERTIES LINK_FLAGS "-library=stlport4") +endif (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") +target_link_libraries( ${LIBNAME} ${SYSLIBS}) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory( samples ) + add_subdirectory( testsuite ) +endif () + diff --git a/JSON/CMakeLists.txt b/JSON/CMakeLists.txt index 6a3c0e5cb..4d6b8cc36 100644 --- a/JSON/CMakeLists.txt +++ b/JSON/CMakeLists.txt @@ -1,31 +1,31 @@ -set(LIBNAME "PocoJSON") -set(LIBNAME "${LIBNAME}${LIB_EXT}") - -aux_source_directory(src SRCS) - -if (NOT POCO_STATIC) - add_definitions(-DJSON_EXPORTS) -endif (NOT POCO_STATIC) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT}) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () - +set(LIBNAME "PocoJSON") +set(LIBNAME "${LIBNAME}${LIB_EXT}") + +aux_source_directory(src SRCS) + +if (NOT POCO_STATIC) + add_definitions(-DJSON_EXPORTS) +endif (NOT POCO_STATIC) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT}) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () + diff --git a/NetSSL_OpenSSL/CMakeLists.txt b/NetSSL_OpenSSL/CMakeLists.txt index 6868d40f2..773619756 100644 --- a/NetSSL_OpenSSL/CMakeLists.txt +++ b/NetSSL_OpenSSL/CMakeLists.txt @@ -1,32 +1,32 @@ -set(LIBNAME "PocoNetSSL") -set(LIBNAME "${LIBNAME}${LIB_EXT}") - -aux_source_directory(src SRCS) -include_directories( ${OPENSSL_INCLUDE_DIR} ) - -if (NOT POCO_STATIC) - add_definitions(-DNetSSL_EXPORTS) -endif (NOT POCO_STATIC) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoCrypto${LIB_EXT} PocoNet${LIB_EXT} PocoUtil${LIB_EXT} PocoFoundation${LIB_EXT} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () - +set(LIBNAME "PocoNetSSL") +set(LIBNAME "${LIBNAME}${LIB_EXT}") + +aux_source_directory(src SRCS) +include_directories( ${OPENSSL_INCLUDE_DIR} ) + +if (NOT POCO_STATIC) + add_definitions(-DNetSSL_EXPORTS) +endif (NOT POCO_STATIC) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoCrypto${LIB_EXT} PocoNet${LIB_EXT} PocoUtil${LIB_EXT} PocoFoundation${LIB_EXT} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () + diff --git a/PDF/CMakeLists.txt b/PDF/CMakeLists.txt index 31611c3d8..38d7891f8 100644 --- a/PDF/CMakeLists.txt +++ b/PDF/CMakeLists.txt @@ -1,32 +1,32 @@ -set(LIBNAME "PocoPDF") -set(LIBNAME "${LIBNAME}${LIB_EXT}") - -aux_source_directory(src SRCS) +set(LIBNAME "PocoPDF") +set(LIBNAME "${LIBNAME}${LIB_EXT}") + +aux_source_directory(src SRCS) include_directories(include/Poco/PDF) # zip src - -if (NOT POCO_STATIC) - add_definitions(-DJSON_EXPORTS) -endif (NOT POCO_STATIC) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT}) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () - + +if (NOT POCO_STATIC) + add_definitions(-DJSON_EXPORTS) +endif (NOT POCO_STATIC) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT}) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () + diff --git a/Util/CMakeLists.txt b/Util/CMakeLists.txt index 7074fb7dc..a019198c5 100644 --- a/Util/CMakeLists.txt +++ b/Util/CMakeLists.txt @@ -1,67 +1,67 @@ -set(LIBNAME "PocoUtil") -set(LIBNAME "${LIBNAME}${LIB_EXT}") - -set( BASE_SRCS -src/AbstractConfiguration.cpp -src/JSONConfiguration.cpp -src/Application.cpp -src/ConfigurationMapper.cpp -src/ConfigurationView.cpp -src/FilesystemConfiguration.cpp -src/HelpFormatter.cpp -src/IniFileConfiguration.cpp -src/IntValidator.cpp -src/LayeredConfiguration.cpp -src/LoggingConfigurator.cpp -src/LoggingSubsystem.cpp -src/MapConfiguration.cpp -src/Option.cpp -src/OptionCallback.cpp -src/OptionException.cpp -src/OptionProcessor.cpp -src/OptionSet.cpp -src/PropertyFileConfiguration.cpp -src/RegExpValidator.cpp -src/ServerApplication.cpp -src/Subsystem.cpp -src/SystemConfiguration.cpp -src/Validator.cpp -src/XMLConfiguration.cpp -src/Timer.cpp -src/TimerTask.cpp -) - -set( WIN_SRCS -src/WinRegistryConfiguration.cpp -src/WinRegistryKey.cpp -src/WinService.cpp -) - -if(CMAKE_SYSTEM MATCHES "Windows") - set(SRCS ${BASE_SRCS} ${WIN_SRCS}) - add_definitions(-DUtil_EXPORTS) -else (CMAKE_SYSTEM MATCHES "Windows") - set(SRCS ${BASE_SRCS}) -endif(CMAKE_SYSTEM MATCHES "Windows") - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoJSON${LIB_EXT} PocoXML${LIB_EXT} PocoFoundation${LIB_EXT}) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () +set(LIBNAME "PocoUtil") +set(LIBNAME "${LIBNAME}${LIB_EXT}") + +set( BASE_SRCS +src/AbstractConfiguration.cpp +src/JSONConfiguration.cpp +src/Application.cpp +src/ConfigurationMapper.cpp +src/ConfigurationView.cpp +src/FilesystemConfiguration.cpp +src/HelpFormatter.cpp +src/IniFileConfiguration.cpp +src/IntValidator.cpp +src/LayeredConfiguration.cpp +src/LoggingConfigurator.cpp +src/LoggingSubsystem.cpp +src/MapConfiguration.cpp +src/Option.cpp +src/OptionCallback.cpp +src/OptionException.cpp +src/OptionProcessor.cpp +src/OptionSet.cpp +src/PropertyFileConfiguration.cpp +src/RegExpValidator.cpp +src/ServerApplication.cpp +src/Subsystem.cpp +src/SystemConfiguration.cpp +src/Validator.cpp +src/XMLConfiguration.cpp +src/Timer.cpp +src/TimerTask.cpp +) + +set( WIN_SRCS +src/WinRegistryConfiguration.cpp +src/WinRegistryKey.cpp +src/WinService.cpp +) + +if(CMAKE_SYSTEM MATCHES "Windows") + set(SRCS ${BASE_SRCS} ${WIN_SRCS}) + add_definitions(-DUtil_EXPORTS) +else (CMAKE_SYSTEM MATCHES "Windows") + set(SRCS ${BASE_SRCS}) +endif(CMAKE_SYSTEM MATCHES "Windows") + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoJSON${LIB_EXT} PocoXML${LIB_EXT} PocoFoundation${LIB_EXT}) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt index a46b247b4..04699c5e0 100644 --- a/XML/CMakeLists.txt +++ b/XML/CMakeLists.txt @@ -1,29 +1,29 @@ -set(LIBNAME "PocoXML") -set(LIBNAME "${LIBNAME}${LIB_EXT}") - -aux_source_directory(src SRCS) - -add_definitions(-D_USRDLL -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H -DXML_EXPORTS) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT}) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () - +set(LIBNAME "PocoXML") +set(LIBNAME "${LIBNAME}${LIB_EXT}") + +aux_source_directory(src SRCS) + +add_definitions(-D_USRDLL -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H -DXML_EXPORTS) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT}) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () + diff --git a/Zip/CMakeLists.txt b/Zip/CMakeLists.txt index 47cb72ed4..d3ff62798 100644 --- a/Zip/CMakeLists.txt +++ b/Zip/CMakeLists.txt @@ -1,31 +1,31 @@ -set(LIBNAME "PocoZip") -set(LIBNAME "${LIBNAME}${LIB_EXT}") - -aux_source_directory(src SRCS) - -if (NOT POCO_STATIC) - add_definitions(-DZip_EXPORTS) -endif (NOT POCO_STATIC) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoUtil${LIB_EXT} PocoXML${LIB_EXT} PocoFoundation${LIB_EXT}) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () - +set(LIBNAME "PocoZip") +set(LIBNAME "${LIBNAME}${LIB_EXT}") + +aux_source_directory(src SRCS) + +if (NOT POCO_STATIC) + add_definitions(-DZip_EXPORTS) +endif (NOT POCO_STATIC) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoUtil${LIB_EXT} PocoXML${LIB_EXT} PocoFoundation${LIB_EXT}) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () + From 74cb6074710e2f4dc483fe03fe8518fabdcc3066 Mon Sep 17 00:00:00 2001 From: Rangel Reale Date: Sun, 11 Nov 2012 11:54:38 -0200 Subject: [PATCH 025/165] * BUGFIX: SQLiteStatement was return affected rows even when there were none * Allows binding of null Poco::Any. --- Data/SQLite/src/SQLiteStatementImpl.cpp | 4 ++-- Data/src/AbstractBinder.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Data/SQLite/src/SQLiteStatementImpl.cpp b/Data/SQLite/src/SQLiteStatementImpl.cpp index 58be0f305..56b83b7ac 100644 --- a/Data/SQLite/src/SQLiteStatementImpl.cpp +++ b/Data/SQLite/src/SQLiteStatementImpl.cpp @@ -194,12 +194,12 @@ void SQLiteStatementImpl::bindImpl() if (_bindBegin != bindings().end()) { - _affectedRowCount = (*_bindBegin)->numOfRowsHandled(); + std::size_t boundRowCount = (*_bindBegin)->numOfRowsHandled(); Bindings::iterator oldBegin = _bindBegin; for (std::size_t pos = 1; _bindBegin != bindEnd && (*_bindBegin)->canBind(); ++_bindBegin) { - if (_affectedRowCount != (*_bindBegin)->numOfRowsHandled()) + if (boundRowCount != (*_bindBegin)->numOfRowsHandled()) throw BindingException("Size mismatch in Bindings. All Bindings MUST have the same size"); (*_bindBegin)->bind(pos); diff --git a/Data/src/AbstractBinder.cpp b/Data/src/AbstractBinder.cpp index 09358df00..de71ed4f2 100644 --- a/Data/src/AbstractBinder.cpp +++ b/Data/src/AbstractBinder.cpp @@ -458,6 +458,8 @@ void AbstractBinder::bind(std::size_t pos, const Any& val, Direction dir) bind(pos, RefAnyCast @@ -689,18 +686,6 @@ WebSocket\Source Files - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - - - NetCore\Source Files - diff --git a/Net/include/Poco/Net/Route.h b/Net/include/Poco/Net/Route.h deleted file mode 100644 index 8043ba90c..000000000 --- a/Net/include/Poco/Net/Route.h +++ /dev/null @@ -1,413 +0,0 @@ -// -// Route.h -// -// $Id: //poco/1.4/Net/include/Poco/Net/Route.h#1 $ -// -// Library: Net -// Package: NetCore -// Module: Route -// -// Definition of the Route class. -// -// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef Net_Route_INCLUDED -#define Net_Route_INCLUDED - - -#include "Poco/Net/Net.h" - - -#if defined(POCO_OS_FAMILY_WINDOWS) && (_WIN32_WINNT >= 0x600) // only Vista/Longhorn and up - #ifndef POCO_NET_HAS_ROUTE - #define POCO_NET_HAS_ROUTE - #endif -#elif defined(POCO_OS_FAMILY_BSD) - #ifndef POCO_NET_HAS_ROUTE - #define POCO_NET_HAS_ROUTE - #endif -#elif defined(POCO_OS_FAMILY_UNIX) && (POCO_OS == POCO_OS_LINUX) - #ifndef POCO_NET_HAS_ROUTE - #define POCO_NET_HAS_ROUTE - #endif -#else - #ifdef POCO_NET_HAS_ROUTE - #undef POCO_NET_HAS_ROUTE - #endif -#endif - - -#ifdef POCO_NET_HAS_ROUTE - - -#include "Poco/Net/IPAddress.h" -#include "Poco/Net/NetworkInterface.h" -#include "Poco/Timestamp.h" -#include -#include - - -namespace Poco { -namespace Net { - - -class RouteHelper; - - -class Net_API Route -{ -public: - typedef std::list RouteList; - - static const unsigned int ROUTE_METRIC_UNKNOWN = ~0; - static const unsigned int ROUTE_MTU_UNKNOWN = 0; - static const unsigned int ROUTE_HOPS_UNKNOWN = ~0; - static const unsigned int ROUTE_USE_UNKNOWN = ~1; - static const unsigned int ROUTE_CREATED_UNKNOWN = 0; - - enum RouteType - { - ROUTE_NONE = 0, - ROUTE_OTHER = 1, - ROUTE_INVALID = 2, - ROUTE_DIRECT = 3, - ROUTE_INDIRECT = 4 - }; - - enum RouteProto - { - ROUTE_PROTO_NONE = 0, - ROUTE_PROTO_OTHER = 1, - ROUTE_PROTO_LOCAL = 2, - ROUTE_PROTO_NET_MGMT = 3, - ROUTE_PROTO_ICMP = 4, - ROUTE_PROTO_EGP = 5, - ROUTE_PROTO_GGP = 6, - ROUTE_PROTO_HELLO = 7, - ROUTE_PROTO_RIP = 8, - ROUTE_PROTO_ISIS = 9, - ROUTE_PROTO_ESIS = 10, - ROUTE_PROTO_CISCO = 11, // EIGRP? - ROUTE_PROTO_BBN = 12, - ROUTE_PROTO_OSPF = 13, - ROUTE_PROTO_BGP = 14, - }; - - Route(const IPAddress& dst, const IPAddress& netmask, const IPAddress& nextHop, unsigned ifIndex, RouteType type); - /// Creates Route. - - Route(const IPAddress& dst, const IPAddress& netmask, unsigned ifIndex, RouteType type); - /// Creates Route. - - Route(const IPAddress& dst, unsigned prefix, const IPAddress& nextHop, unsigned ifIndex, RouteType type); - /// Creates Route. - - Route(const IPAddress& dst, unsigned prefix, unsigned ifIndex, RouteType type); - /// Creates Route. - - ~Route(); - /// Destroys Route. - - const IPAddress getDest() const; - /// Returns destination. - - unsigned getPrefix() const; - /// Returns prefix. - - const IPAddress getNetmask() const; - /// Returns net mask (IPv4 only). - - const IPAddress getNextHop() const; - /// Returns next hop. - - unsigned getIfIndex() const; - /// Returns interface index. - - const NetworkInterface getNetworkInterface() const; - /// Returns netwrok interface. - - RouteType getType() const; - /// Returns route type. - - unsigned getMetric() const; - /// Returns metric; not available on all platforms. - - unsigned getHops() const; - /// Returns hops count; not available on all platforms. - - unsigned getMTU() const; - /// Returns MTU; not available on all platforms. - - unsigned getUsage() const; - /// Returns usage; not available on all platforms. - - RouteProto getProto() const; - /// Returns proto; not available on all platforms. - - std::time_t getAge() const; - /// Returns age; not available on all platforms. - - bool validMetric() const; - /// Returns true if metric is valid; not available on all platforms. - - bool validHops() const; - /// Returns true if hops are valid; not available on all platforms. - - bool validMTU() const; - /// Returns true if MTU is valid; not available on all platforms. - - bool validUsage() const; - /// Returns true if usage is valid; not available on all platforms. - - bool validProto() const; - /// Returns true if proto is valid; not available on all platforms. - - bool validAge() const; - /// Returns true if age is valid; not available on all platforms. - - - bool operator == (const Route& other) const; - /// Return strue if this route is equal to other. - - bool operator != (const Route& other) const; - /// Return strue if this route is not equal to other. - - static RouteList list(IPAddress::Family family); - /// Retruns the list of routes. - - static RouteList defaults(IPAddress::Family family); - /// Returns default routes. - - static RouteList match(IPAddress target); - /// Retruns routes matching target. - - static const IPAddress getDefaultAddress(IPAddress::Family family); - /// Returns default IP address for the family. - - static std::string protocolName(RouteProto proto); - /// Returns protocol as string. - - void setMTU(unsigned mtu); - /// Sets the MTU to specified value. - - void setAge(std::time_t created); - /// Sets MTU to specified value. - - void setProto(RouteProto proto); - /// Sets proto to specified value. - - void setMetric(unsigned metric); - /// Sets metric to specified value. - - void setHops(unsigned hops); - /// Sets hops to specified value. - - void setUsage(unsigned use); - /// Sets usage to specified value. - -private: - // portable attributes - IPAddress _dst; - IPAddress _netmask; - IPAddress _nextHop; - unsigned _ifIndex; - RouteType _type; - - // optional attributes supported on some platforms - unsigned _metric; - unsigned _mtu; - unsigned _hops; - unsigned _use; - RouteProto _proto; - Timestamp _created; -}; - - -// -// inlines -// - - -inline const IPAddress Route::getDest() const -{ - return _dst; -} - - -inline unsigned Route::getPrefix() const -{ - return _netmask.prefixLength(); -} - - -inline const IPAddress Route::getNetmask() const -{ - return _netmask; -} - - -inline const IPAddress Route::getNextHop() const -{ - return _nextHop; -} - - -inline unsigned Route::getIfIndex() const -{ - return _ifIndex; -} - - -inline const NetworkInterface Route::getNetworkInterface() const -{ - return NetworkInterface::forIndex(_ifIndex); -} - - -inline Route::RouteType Route::getType() const -{ - return _type; -} - - -inline unsigned Route::getMetric() const -{ - return _metric; -} - - -inline unsigned Route::getHops() const -{ - return _hops; -} - - -inline unsigned Route::getMTU() const -{ - return _mtu; -} - - -inline unsigned Route::getUsage() const -{ - return _use; -} - - -inline Route::RouteProto Route::getProto() const -{ - return _proto; -} - - -inline bool Route::validMetric() const -{ - return (_metric != ~0U); -} - - -inline bool Route::validHops() const -{ - return (_hops != ~0U); -} - - -inline bool Route::validMTU() const -{ - return (_mtu != 0U); -} - - -inline bool Route::validUsage() const -{ - return (_use != ~0U); -} - - -inline bool Route::validProto() const -{ - return (_proto != (RouteProto)0); -} - - -inline bool Route::validAge() const -{ - return (_created != 0U); -} - - -inline bool Route::operator == (const Route& other) const -{ - return (_dst == other._dst - && _netmask == other._netmask - && _nextHop == other._nextHop - && _metric == other._metric - && _ifIndex == other._ifIndex - && _type == other._type - && _proto == other._proto - && _created == other._created); -} - - -inline bool Route::operator != (const Route& other) const -{ - return !(*this == other); -} - - -inline void Route::setMTU(unsigned mtu) -{ - _mtu = mtu; -} - - -inline void Route::setMetric(unsigned metric) -{ - _metric = metric; -} - - -inline void Route::setHops(unsigned hops) -{ - _hops = hops; -} - - -inline void Route::setUsage(unsigned use) -{ - _use = use; -} - - -} } // Poco::Net - - -#endif // POCO_NET_HAS_ROUTE - - -#endif // Net_Route_INCLUDED diff --git a/Net/src/Route.cpp b/Net/src/Route.cpp deleted file mode 100644 index 3bfbf8cca..000000000 --- a/Net/src/Route.cpp +++ /dev/null @@ -1,265 +0,0 @@ -// -// Route.cpp -// -// $Id: //poco/1.4/Foundation/src/Route.cpp#2 $ -// -// Library: Net -// Package: NetCore -// Module: Route -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Net/Route.h" - - -#ifdef POCO_NET_HAS_ROUTE - - -#include "Poco/Net/IPAddress.h" -#include "Poco/Net/NetException.h" - - -#if defined(POCO_OS_FAMILY_WINDOWS) - #include - #include "Route_WIN32.cpp" -#elif defined(POCO_OS_FAMILY_BSD) - #include "Route_BSD.cpp" -#elif defined(POCO_OS_FAMILY_UNIX) && (POCO_OS == POCO_OS_LINUX) - #include "Route_Linux.cpp" -#endif - - -namespace Poco { -namespace Net { - - -Route::Route(const IPAddress& dst, const IPAddress& netmask, const IPAddress& nextHop, unsigned ifIndex, RouteType type) : - _dst(dst), - _netmask(netmask), - _nextHop(nextHop), - _ifIndex(ifIndex), - _type(type), - _metric(ROUTE_METRIC_UNKNOWN), - _mtu(ROUTE_MTU_UNKNOWN), - _hops(ROUTE_HOPS_UNKNOWN), - _use(~ROUTE_USE_UNKNOWN), - _proto(ROUTE_PROTO_NONE), - _created(ROUTE_CREATED_UNKNOWN) -{ - if (_dst.family() != _nextHop.family()) - throw InvalidArgumentException("Destination and nextHop have different families"); -} - - -Route::Route(const IPAddress& dst, const IPAddress& netmask, unsigned ifIndex, RouteType type) : - _dst(dst), - _netmask(netmask), - _nextHop(IPAddress(dst.family())), - _ifIndex(ifIndex), - _type(type), - _metric(ROUTE_METRIC_UNKNOWN), - _mtu(ROUTE_MTU_UNKNOWN), - _hops(ROUTE_HOPS_UNKNOWN), - _use(~ROUTE_USE_UNKNOWN), - _proto(ROUTE_PROTO_NONE), - _created(ROUTE_CREATED_UNKNOWN) -{ - if (_dst.family() != _nextHop.family()) - throw InvalidArgumentException("Destination and nextHop have different families"); -} - - -Route::Route(const IPAddress& dst, unsigned prefix, const IPAddress& nextHop, unsigned ifIndex, RouteType type) : - _dst(dst), - _netmask(IPAddress(prefix, dst.family())), - _nextHop(nextHop), - _ifIndex(ifIndex), - _type(type), - _metric(ROUTE_METRIC_UNKNOWN), - _mtu(ROUTE_MTU_UNKNOWN), - _hops(ROUTE_HOPS_UNKNOWN), - _use(~ROUTE_USE_UNKNOWN), - _proto(ROUTE_PROTO_NONE), - _created(ROUTE_CREATED_UNKNOWN) -{ - if (_dst.family() != _nextHop.family()) - throw InvalidArgumentException("Destination and nextHop have different families"); -} - - -Route::Route(const IPAddress& dst, unsigned prefix, unsigned ifIndex, RouteType type) : - _dst(dst), - _netmask(IPAddress(prefix, dst.family())), - _nextHop(IPAddress(dst.family())), - _ifIndex(ifIndex), - _type(type), - _metric(ROUTE_METRIC_UNKNOWN), - _mtu(ROUTE_MTU_UNKNOWN), - _hops(ROUTE_HOPS_UNKNOWN), - _use(~ROUTE_USE_UNKNOWN), - _proto(ROUTE_PROTO_NONE), - _created(ROUTE_CREATED_UNKNOWN) -{ - if (_dst.family() != _nextHop.family()) - throw InvalidArgumentException("Destination and nextHop have different families"); -} - - -Route::~Route() -{ -} - - -std::time_t Route::getAge() const -{ - std::time_t now = std::time(NULL); - return ((_created != 0) ? (now - _created.epochTime()) : 0); -} - - -void Route::setAge(std::time_t created) -{ - std::time_t now; - time(&now); - if (_created > now) - throw std::invalid_argument("Creation time can't be in future"); - _created = Timestamp::fromEpochTime(created); -} - - -void Route::setProto(RouteProto proto) -{ -#if defined(_WIN32) - if (proto > ROUTE_PROTO_BGP) proto = ROUTE_PROTO_OTHER; -#endif - _proto = proto; -} - - -Route::RouteList Route::defaults(IPAddress::Family family) -{ - Route::RouteList defaults, routes = Route::list(family); - RouteList::const_iterator it = routes.begin(); - RouteList::const_iterator end = routes.end(); - for (; it != end; ++it) - { - if (it->getPrefix() != 0) continue; - - // look for insertion point - Route::RouteList::iterator it2 = defaults.begin(); - Route::RouteList::const_iterator end = defaults.end(); - while (it2 != end && it2->getMetric() <= it->getMetric()) - ++it2; - defaults.insert(it2, *it); - } - - return defaults; -} - - -Route::RouteList Route::match(IPAddress target) -{ - Route::RouteList targets, routes = Route::list(target.family()); - RouteList::const_iterator it = routes.begin(); - RouteList::const_iterator end = routes.end(); - for (; it != end; ++it) - { - if ((target & it->getNetmask()) != it->getDest()) continue; - - // look for insertion point - Route::RouteList::iterator it2 = targets.begin(); - while (it2 != targets.end() - && (it2->getPrefix() > it->getPrefix() - || (it2->getPrefix() == it->getPrefix() && - it2->getMetric() <= it->getMetric()))) - { - ++it2; - } - targets.insert(it2, *it); - } - - return targets; -} - - -const IPAddress Route::getDefaultAddress(IPAddress::Family family) -{ - Route::RouteList routes = Route::defaults(family); - - if (! routes.empty()) { - Route::RouteList::const_iterator it = routes.begin(); - - IPAddress addr = it->getNetworkInterface().firstAddress(family); - return addr; - } - - return IPAddress::wildcard(family); -} - - -std::string Route::protocolName(Route::RouteProto proto) -{ - switch (proto) { - default: - return "unknown"; - case ROUTE_PROTO_OTHER: - return "other"; - case ROUTE_PROTO_LOCAL: - return "local"; - case ROUTE_PROTO_NET_MGMT: - return "netmgmt"; - case ROUTE_PROTO_ICMP: - return "icmp"; - case ROUTE_PROTO_EGP: - return "egp"; - case ROUTE_PROTO_GGP: - return "ggp"; - case ROUTE_PROTO_HELLO: - return "hello"; - case ROUTE_PROTO_RIP: - return "rip"; - case ROUTE_PROTO_ISIS: - return "isis"; - case ROUTE_PROTO_ESIS: - return "esis"; - case ROUTE_PROTO_CISCO: - return "cisco"; - case ROUTE_PROTO_BBN: - return "bbn"; - case ROUTE_PROTO_OSPF: - return "ospf"; - case ROUTE_PROTO_BGP: - return "bgp"; - } -} - - -}} // namespace Poco::Net - - -#endif // POCO_NET_HAS_ROUTE diff --git a/Net/src/Route_BSD.cpp b/Net/src/Route_BSD.cpp deleted file mode 100644 index 5c5ae4ff7..000000000 --- a/Net/src/Route_BSD.cpp +++ /dev/null @@ -1,267 +0,0 @@ -// -// Route_BSD.cpp -// -// $Id: //poco/1.4/Foundation/src/Route_BSD.cpp#2 $ -// -// Library: Net -// Package: NetCore -// Module: Route -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include -#include -#include -#include -#include -#include -#include -#include - - -#define RTMSG_LEN (sizeof(struct rt_msghdr) + 512) -#define ROUNDUP(a) ((a) > 0 ? (((a) + sizeof(uint32_t) - 1) & ~(sizeof(uint32_t) - 1)) : sizeof(long)) -#define NEXTADDR(w, u) \ - if (rtm_addrs & (w)) {\ - int l = ROUNDUP(u.sin_len); memmove(cp, &(u), l); cp += l;\ - } -#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) - -#define SIN_OFFSET (offsetof(sockaddr_in,sin_addr)) -#define SIN_LENGTH (sizeof(struct in_addr)) -#define SIN6_OFFSET (offsetof(sockaddr_in6,sin6_addr)) -#define SIN6_LENGTH (sizeof(struct in6_addr)) - - - -namespace Poco { -namespace Net { - - -static int seq = rand(); - - -static void get_rtaddrs(unsigned addrs, struct sockaddr *sa, struct sockaddr **rti_info) -{ - for (unsigned i = 0; i < RTAX_MAX; i++) { - if (addrs & (1 << i)) { - rti_info[i] = sa; - sa = (struct sockaddr *)((char *)sa + ROUNDUP(sa->sa_len)); - } else { - rti_info[i] = NULL; - } - } -} - - -static IPAddress unpack_sockaddr_inX(struct sockaddr *sa, bool ipv4) -{ - const unsigned offset = (ipv4 ? SIN_OFFSET : SIN6_OFFSET); - unsigned char *addr = (unsigned char*)sa + offset; - - // return wildcard - if (sa->sa_len == 0) - return IPAddress(ipv4 ? IPAddress::IPv4 : IPAddress::IPv6); - - struct in6_addr buf; - memset(&buf, 0, sizeof(buf)); - memcpy(&buf, addr, sa->sa_len - offset); - - IPAddress ip(&buf, (ipv4 ? SIN_LENGTH : SIN6_LENGTH)); - - return ip; -} - - -static Route createRoute(struct rt_msghdr2 *rtm, struct sockaddr **rti_info) -{ - IPAddress dest, netmask, nexthop; - int ifIndex = rtm->rtm_index; - bool adjacent = false; - sa_family_t family = AF_MAX; - char macaddr[16]; - - for (unsigned i = 0; i < RTAX_MAX; i++) - { - sockaddr* sa = (struct sockaddr*)rti_info[i]; - - if (sa == 0) continue; - - switch (i) - { - case RTAX_DST: - poco_assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6); - family = sa->sa_family; - if (family == AF_INET) - { - struct sockaddr_in *sin = (struct sockaddr_in *)sa; - dest = IPAddress(&sin->sin_addr, SIN_LENGTH); - } - else - { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; - dest = IPAddress(&sin6->sin6_addr, SIN6_LENGTH, rtm->rtm_index); - } - break; - - case RTAX_GATEWAY: - poco_assert((sa->sa_family == family || sa->sa_family == AF_LINK)); - switch (sa->sa_family) - { - case AF_INET: - { - struct sockaddr_in *sin = (struct sockaddr_in *)sa; - nexthop = IPAddress(&sin->sin_addr, SIN_LENGTH); - break; - } - case AF_INET6: - { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; - nexthop = IPAddress(&sin6->sin6_addr, SIN6_LENGTH, rtm->rtm_index); - break; - } - case AF_LINK: - { - struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa; - adjacent = true; - ifIndex = sdl->sdl_index; - memcpy(macaddr, sdl->sdl_data, sdl->sdl_alen); - break; - } - default: - break; - } - break; - - case RTAX_NETMASK: - netmask = unpack_sockaddr_inX(sa, (family == AF_INET)); - break; - - case RTAX_GENMASK: - // IPAddress genmask = unpack_sockaddr_inX(sa, (family == AF_INET)); - break; - - default: - // do something? - break; - } - } - - if (rtm->rtm_flags & RTF_HOST) - { - poco_assert(!(rtm->rtm_addrs & RTA_NETMASK)); - if (family == AF_INET) - netmask = IPAddress(32, IPAddress::IPv4); - else - netmask = IPAddress(128, IPAddress::IPv6); - } - - if (adjacent) - { - Route route(dest, netmask, ifIndex, Route::ROUTE_DIRECT); - route.setMTU(rtm->rtm_rmx.rmx_mtu); - route.setHops(rtm->rtm_rmx.rmx_hopcount); - route.setUsage(rtm->rtm_use); - // OSX uses expire, not metric; we reuse metric member here - if (rtm->rtm_rmx.rmx_expire) - { - time_t expTime; - if ((expTime = rtm->rtm_rmx.rmx_expire - ::time(0)) > 0) - route.setMetric(expTime); - else route.setMetric(Route::ROUTE_METRIC_UNKNOWN); - } - else route.setMetric(Route::ROUTE_METRIC_UNKNOWN); - return route; - } - else - { - Route route(dest, netmask, nexthop, ifIndex, Route::ROUTE_INDIRECT); - route.setMTU(rtm->rtm_rmx.rmx_mtu); - route.setHops(rtm->rtm_rmx.rmx_hopcount); - route.setUsage(rtm->rtm_use); - // OSX uses expire, not metric; we reuse metric member here - if (rtm->rtm_rmx.rmx_expire) - { - time_t expTime; - if ((expTime = rtm->rtm_rmx.rmx_expire - ::time(0)) > 0) - route.setMetric(expTime); - else route.setMetric(Route::ROUTE_METRIC_UNKNOWN); - } - else route.setMetric(Route::ROUTE_METRIC_UNKNOWN); - return route; - } -} - - -Route::RouteList Route::list(IPAddress::Family family) -{ - Route::RouteList routes; - int mib[6]; - - mib[0] = CTL_NET; - mib[1] = PF_ROUTE; - mib[2] = mib[3] = 0; - mib[4] = NET_RT_DUMP2; - mib[5] = 0; - - size_t needed = 0; - if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) - throw std::runtime_error("sysctl failed to return routing table size");; - - char *buf = new char[needed]; - - if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) - throw std::runtime_error("sysctl failed to populate routing table"); - - struct rt_msghdr2 *rtm = NULL; - for (char *next = buf, *lim = &buf[needed]; next < lim; next += rtm->rtm_msglen) - { - rtm = (struct rt_msghdr2 *)next; - - struct sockaddr_in *sin = (struct sockaddr_in*)(rtm + 1); - - if (sin->sin_family != ((family == IPAddress::IPv4) ? AF_INET : AF_INET6)) continue; - - // skip cloned routes - if (rtm->rtm_parentflags & RTF_PRCLONING) continue; - - struct sockaddr* rti_info[RTAX_MAX]; - get_rtaddrs(rtm->rtm_addrs, (struct sockaddr *)sin, rti_info); - - // RTF_IFSCOPE? - - routes.push_back(createRoute(rtm, rti_info)); - } - - delete[] buf; - - return routes; -} - - -}} // namespace Poco::Net diff --git a/Net/src/Route_Linux.cpp b/Net/src/Route_Linux.cpp deleted file mode 100644 index 97c49c44e..000000000 --- a/Net/src/Route_Linux.cpp +++ /dev/null @@ -1,332 +0,0 @@ -// -// Route_Linux.cpp -// -// $Id: //poco/1.4/Foundation/src/Route_Linux.cpp#2 $ -// -// Library: Net -// Package: NetCore -// Module: Route -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -#include -#include -#include - -#include -#include -#include -#include - -class RouteHelper -{ -public: - static void createRouteIPv4(Route::RouteList *routes, struct rt_container *rt_stuff); - static void createRouteIPv6(Route::RouteList *routes, struct rt_container *rt_stuff); - -private: - RouteHelper(); - ~RouteHelper(); -}; - -typedef union -{ - struct in_addr u_in; - struct in6_addr u_in6; -} in_addrX; - -#define in4 u_in -#define in6 u_in6 - -struct rt_container -{ - const struct nlattr *tb[RTA_MAX+1]; - in_addrX gw; - in_addrX dest; - in_addrX src; - in_addrX prefsrc; - uint32_t oif, flow, priority; - unsigned char family; - unsigned char prefix; - unsigned char table; - unsigned char protocol; - unsigned char scope; - unsigned char type; - uint32_t metrics[RTA_MAX+1]; -}; - -static inline bool in6zero(struct in6_addr in6) -{ - return ((in6.s6_addr32[0] | in6.s6_addr32[1] | in6.s6_addr32[2] | in6.s6_addr32[3]) == 0); -} - -static Route::RouteProto xlateProto(unsigned prot) -{ - switch (prot) { - default: - // fallthru - case RTPROT_UNSPEC: - return Route::ROUTE_PROTO_OTHER; - case RTPROT_REDIRECT: - return Route::ROUTE_PROTO_ICMP; - case RTPROT_KERNEL: - case RTPROT_BOOT: - case RTPROT_STATIC: - return Route::ROUTE_PROTO_LOCAL; - - // others? - } -} - -void RouteHelper::createRouteIPv4(Route::RouteList *routes, struct rt_container *rt_stuff) -{ - if (rt_stuff->table == RT_TABLE_MAIN && rt_stuff->type <= RTN_MULTICAST) { - Route *route; - - if (rt_stuff->gw.in4.s_addr != 0) - route = new Route(IPAddress(&rt_stuff->dest.in4, sizeof(rt_stuff->dest.in4)), IPAddress(rt_stuff->prefix, IPAddress::IPv4), IPAddress(&rt_stuff->gw.in4, sizeof(rt_stuff->gw.in4)), rt_stuff->oif, Route::ROUTE_INDIRECT); - else - route = new Route(IPAddress(&rt_stuff->dest.in4, sizeof(rt_stuff->dest.in4)), IPAddress(rt_stuff->prefix, IPAddress::IPv4), rt_stuff->oif, Route::ROUTE_DIRECT); - - route->setProto(xlateProto(rt_stuff->protocol)); - route->setMetric(rt_stuff->metrics[0]); - // route->setPriority(rt_stuff->priority); - - // no hops, usage, mtu, or age... - routes->push_back(route); - } -} - -void RouteHelper::createRouteIPv6(Route::RouteList *routes, struct rt_container *rt_stuff) -{ - if (rt_stuff->table == RT_TABLE_MAIN && rt_stuff->type <= RTN_MULTICAST) { - Route *route; - - if (!in6zero(rt_stuff->gw.in6)) - route = new Route(IPAddress(&rt_stuff->dest.in6, sizeof(rt_stuff->dest.in6)), IPAddress(rt_stuff->prefix, IPAddress::IPv6), IPAddress(&rt_stuff->gw.in6, sizeof(rt_stuff->gw.in6), rt_stuff->oif), rt_stuff->oif, Route::ROUTE_INDIRECT); - else - route = new Route(IPAddress(&rt_stuff->dest.in6, sizeof(rt_stuff->dest.in6)), IPAddress(rt_stuff->prefix, IPAddress::IPv6), rt_stuff->oif, Route::ROUTE_DIRECT); - - route->setProto(xlateProto(rt_stuff->protocol)); - route->setMetric(rt_stuff->metrics[0]); - // route->setPriority(rt_stuff->priority); - - // no hops, usage, mtu, or age... - routes->push_back(route); - } -} - -static int data_attr_cb2(const struct nlattr *attr, void *) -{ - // skip unsupported attribute in user-space - if (mnl_attr_type_valid(attr, RTAX_MAX) < 0) - return MNL_CB_OK; - - if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - return MNL_CB_OK; -} - -static void parse_attrs_ipv4(struct rt_container *rt_stuff) -{ - if (rt_stuff->tb[RTA_TABLE]) - rt_stuff->table = mnl_attr_get_u32(rt_stuff->tb[RTA_TABLE]); - if (rt_stuff->tb[RTA_DST]) - rt_stuff->dest.in4 = *(struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_DST]); - if (rt_stuff->tb[RTA_SRC]) - rt_stuff->src.in4 = *(struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_SRC]); - if (rt_stuff->tb[RTA_OIF]) - rt_stuff->oif = mnl_attr_get_u32(rt_stuff->tb[RTA_OIF]); - if (rt_stuff->tb[RTA_FLOW]) - rt_stuff->flow = mnl_attr_get_u32(rt_stuff->tb[RTA_FLOW]); - if (rt_stuff->tb[RTA_PRIORITY]) - rt_stuff->priority = mnl_attr_get_u32(rt_stuff->tb[RTA_PRIORITY]); - if (rt_stuff->tb[RTA_PREFSRC]) - rt_stuff->prefsrc.in4 = *(struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_PREFSRC]); - if (rt_stuff->tb[RTA_GATEWAY]) - rt_stuff->gw.in4 = *(struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_GATEWAY]); - if (rt_stuff->tb[RTA_METRICS]) { - struct nlattr *tbx[RTAX_MAX+1] = {}; - mnl_attr_parse_nested(rt_stuff->tb[RTA_METRICS], data_attr_cb2, tbx); - - for (unsigned i = 0; i < RTAX_MAX; ++i) - if (tbx[i]) - rt_stuff->metrics[i] = mnl_attr_get_u32(tbx[i]); - } -} - -static void parse_attrs_ipv6(struct rt_container *rt_stuff) -{ - if (rt_stuff->tb[RTA_TABLE]) - rt_stuff->table = mnl_attr_get_u32(rt_stuff->tb[RTA_TABLE]); - if (rt_stuff->tb[RTA_DST]) - memcpy(&rt_stuff->dest.in6, (struct in6_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_DST]), sizeof(struct in6_addr)); - if (rt_stuff->tb[RTA_SRC]) - memcpy(&rt_stuff->src.in6, (struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_SRC]), sizeof(struct in6_addr)); - if (rt_stuff->tb[RTA_OIF]) - rt_stuff->oif = mnl_attr_get_u32(rt_stuff->tb[RTA_OIF]); - if (rt_stuff->tb[RTA_FLOW]) - rt_stuff->flow = mnl_attr_get_u32(rt_stuff->tb[RTA_FLOW]); - if (rt_stuff->tb[RTA_PRIORITY]) - rt_stuff->priority = mnl_attr_get_u32(rt_stuff->tb[RTA_PRIORITY]); - if (rt_stuff->tb[RTA_PREFSRC]) - memcpy(&rt_stuff->prefsrc.in6, (struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_PREFSRC]), sizeof(struct in6_addr)); - if (rt_stuff->tb[RTA_GATEWAY]) - memcpy(&rt_stuff->gw.in6, (struct in_addr *)mnl_attr_get_payload(rt_stuff->tb[RTA_GATEWAY]), sizeof(struct in6_addr)); - if (rt_stuff->tb[RTA_METRICS]) { - struct nlattr *tbx[RTAX_MAX+1] = {}; - mnl_attr_parse_nested(rt_stuff->tb[RTA_METRICS], data_attr_cb2, tbx); - - for (unsigned i = 0; i < RTAX_MAX; ++i) - if (tbx[i]) - rt_stuff->metrics[i] = mnl_attr_get_u32(tbx[i]); - } -} - -static int data_attr_cb(const struct nlattr *attr, void *data) -{ - struct rt_container *rt_stuff = (struct rt_container*)data; - int type = mnl_attr_get_type(attr); - - if (mnl_attr_type_valid(attr, RTA_MAX) < 0) - return MNL_CB_OK; - - switch (type) { - case RTA_DST: - case RTA_SRC: - case RTA_PREFSRC: - case RTA_GATEWAY: - if (rt_stuff->family == AF_INET) { - if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - } else { - if (mnl_attr_validate2(attr, MNL_TYPE_BINARY, sizeof(struct in6_addr)) < 0) - return MNL_CB_ERROR; - } - break; - case RTA_TABLE: - case RTA_OIF: - case RTA_FLOW: - case RTA_PRIORITY: - if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - break; - case RTA_METRICS: - if (mnl_attr_validate(attr, MNL_TYPE_NESTED) < 0) - return MNL_CB_ERROR; - break; - } - rt_stuff->tb[type] = attr; - return MNL_CB_OK; -} - -static int data_cb(const struct nlmsghdr *nlh, void *data) -{ - const struct rtmsg *rm = (const struct rtmsg *)mnl_nlmsg_get_payload(nlh); - Route::RouteList *routes = (Route::RouteList *)data; - struct rt_container rt_stuff; - - memset(&rt_stuff, 0, sizeof(rt_stuff)); - - rt_stuff.family = rm->rtm_family; - rt_stuff.prefix = rm->rtm_dst_len; - rt_stuff.protocol = rm->rtm_protocol; - rt_stuff.scope = rm->rtm_scope; - rt_stuff.type = rm->rtm_type; - - mnl_attr_parse(nlh, sizeof(*rm), data_attr_cb, &rt_stuff); - - switch (rm->rtm_family) { - case AF_INET: - parse_attrs_ipv4(&rt_stuff); - - RouteHelper::createRouteIPv4(routes, &rt_stuff); - break; - - case AF_INET6: - parse_attrs_ipv6(&rt_stuff); - - RouteHelper::createRouteIPv6(routes, &rt_stuff); - break; - } - - return MNL_CB_OK; -} - -Route::RouteList Route::list(IPAddress::Family family) -{ - struct mnl_socket *nl; - char buf[MNL_SOCKET_BUFFER_SIZE]; - struct nlmsghdr *nlh; - struct rtmsg *rtm; - int ret; - unsigned seq, portid; - - nlh = mnl_nlmsg_put_header(buf); - nlh->nlmsg_type = RTM_GETROUTE; - nlh->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; - nlh->nlmsg_seq = seq = time(NULL); - - rtm = (struct rtmsg *)mnl_nlmsg_put_extra_header(nlh, sizeof(struct rtmsg)); - rtm->rtm_family = ((family == IPAddress::IPv4) ? AF_INET : AF_INET6); - - Route::RouteList routes; - - do { - - nl = mnl_socket_open(NETLINK_ROUTE); - if (nl == NULL) - break; - - if (mnl_socket_bind(nl, 0, MNL_SOCKET_AUTOPID) < 0) - break; - - portid = mnl_socket_get_portid(nl); - - if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) - break; - - while (1) { - ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); - if (ret <= 0) - break; - ret = mnl_cb_run(buf, ret, seq, portid, data_cb, &routes); - if (ret == MNL_CB_ERROR) - throw std::runtime_error("Couldn't parse routing table"); - else if (ret == MNL_CB_STOP) - break; - } - if (ret == -1) - throw std::runtime_error("Couldn't talk to kernel"); - - } while (false); - - if (nl) - mnl_socket_close(nl); - - return routes; -} diff --git a/Net/src/Route_WIN32.cpp b/Net/src/Route_WIN32.cpp deleted file mode 100644 index d632e3a82..000000000 --- a/Net/src/Route_WIN32.cpp +++ /dev/null @@ -1,108 +0,0 @@ -// -// Route_WIN32.cpp -// -// $Id: //poco/1.4/Foundation/src/Route_WIN32.cpp#2 $ -// -// Library: Net -// Package: NetCore -// Module: Route -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Error.h" - - -namespace Poco { -namespace Net { - - -static unsigned int getCompleteMetric(PMIB_IPFORWARD_ROW2 pIp2) - /// The route metric specified in the Metric member of the MIB_IPFORWARD_ROW2 structure - /// represents just the route metric offset. The complete metric is a combination of this - /// route metric offset added to the interface metric specified in the Metric member of - /// the MIB_IPINTERFACE_ROW structure of the associated interface. -{ - MIB_IPINTERFACE_ROW intfcRow; - intfcRow.InterfaceLuid = pIp2->InterfaceLuid; - intfcRow.InterfaceIndex = pIp2->InterfaceIndex; - intfcRow.Family = pIp2->DestinationPrefix.Prefix.si_family; - DWORD ret = GetIpInterfaceEntry(&intfcRow); - if (NO_ERROR == ret) return pIp2->Metric + intfcRow.Metric; - - std::string error; - switch (ret) - { - case ERROR_FILE_NOT_FOUND: - throw RuntimeException("Unknown network interface LUID or interface index"); - case ERROR_INVALID_PARAMETER: - throw RuntimeException("An invalid parameter was passed to the function."); - case ERROR_NOT_FOUND: - throw RuntimeException("Network interface/family mismatch."); - default: - throw RuntimeException(Error::getMessage(ret)); - } -} - - -Route::RouteList Route::list(IPAddress::Family family) -{ - std::time_t now; - PMIB_IPFORWARD_TABLE2 pIpForwardTable2 = 0; - - if (GetIpForwardTable2(((family == IPAddress::IPv4) ? AF_INET : AF_INET6), &pIpForwardTable2) != NO_ERROR) - throw RuntimeException("Couldn't fetch routing table."); - - ::time(&now); - - RouteList list; - - for (unsigned i = 0; i < pIpForwardTable2->NumEntries; ++i) - { - PMIB_IPFORWARD_ROW2 pIp2 = &pIpForwardTable2->Table[i]; - IPAddress::Family family2 = (pIp2->DestinationPrefix.Prefix.si_family == AF_INET ? IPAddress::IPv4 : IPAddress::IPv6); - - IPAddress dest(*(struct sockaddr *)&pIp2->DestinationPrefix.Prefix); - IPAddress netmask(pIp2->DestinationPrefix.PrefixLength, family2); - IPAddress nexthop(*(struct sockaddr *)&pIp2->NextHop); - - Route route(dest, netmask, nexthop, pIp2->InterfaceIndex, nexthop.isWildcard() ? ROUTE_DIRECT : ROUTE_INDIRECT); - - route.setMetric(getCompleteMetric(pIp2)); - route.setAge(now - pIp2->Age); - route.setProto((RouteProto) pIp2->Protocol); - - list.push_back(route); - } - - FreeMibTable(pIpForwardTable2); - - return list; -} - - -}} // namespace Poco::Net diff --git a/Net/testsuite/TestSuite_vs100.vcxproj b/Net/testsuite/TestSuite_vs100.vcxproj index fd74296d7..94bdabd5e 100644 --- a/Net/testsuite/TestSuite_vs100.vcxproj +++ b/Net/testsuite/TestSuite_vs100.vcxproj @@ -304,7 +304,6 @@ - @@ -362,7 +361,6 @@ - diff --git a/Net/testsuite/TestSuite_vs100.vcxproj.filters b/Net/testsuite/TestSuite_vs100.vcxproj.filters index d658d7770..5059d8153 100644 --- a/Net/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs100.vcxproj.filters @@ -309,9 +309,6 @@ WebSocket\Header Files - - NetCore\Header Files - @@ -482,8 +479,5 @@ WebSocket\Source Files - - NetCore\Source Files - \ No newline at end of file diff --git a/Net/testsuite/src/NetCoreTestSuite.cpp b/Net/testsuite/src/NetCoreTestSuite.cpp index aa332b175..545480c77 100644 --- a/Net/testsuite/src/NetCoreTestSuite.cpp +++ b/Net/testsuite/src/NetCoreTestSuite.cpp @@ -35,7 +35,6 @@ #include "SocketAddressTest.h" #include "DNSTest.h" #include "NetworkInterfaceTest.h" -#include "RouteTest.h" CppUnit::Test* NetCoreTestSuite::suite() @@ -46,7 +45,6 @@ CppUnit::Test* NetCoreTestSuite::suite() pSuite->addTest(SocketAddressTest::suite()); pSuite->addTest(DNSTest::suite()); pSuite->addTest(NetworkInterfaceTest::suite()); - pSuite->addTest(RouteTest::suite()); return pSuite; } diff --git a/Net/testsuite/src/RouteTest.cpp b/Net/testsuite/src/RouteTest.cpp deleted file mode 100644 index 22e3f53d5..000000000 --- a/Net/testsuite/src/RouteTest.cpp +++ /dev/null @@ -1,190 +0,0 @@ -// -// RouteTest.cpp -// -// $Id: //poco/1.4/Net/testsuite/src/RouteTest.cpp#2 $ -// -// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "RouteTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" -#include "Poco/Net/IPAddress.h" -#include "Poco/Net/Route.h" -#include "Poco/Net/NetException.h" -#include -#include - - -using Poco::Net::IPAddress; -using Poco::Net::Route; -using Poco::Net::InvalidAddressException; - - -RouteTest::RouteTest(const std::string& name): CppUnit::TestCase(name) -{ -} - - -RouteTest::~RouteTest() -{ -} - -// -// we should have on most systems at least 3 routes: one for the local subnet, -// one for the loopback subnet, and a default route. -// -// we should have at least one default route (possibly more on a multi-homed -// system). -// -// we should have at least 2 multicast all-hosts routes: one for the local subnet, -// and one for the loopback subnet. -// -// if we wish to do more sanity checking than this, we'd need to correlate it -// with results we get back from NetworkInterface::list(). -// - - -void RouteTest::testDefaultRoute() -{ - Route::RouteList defaults = Route::defaults(IPAddress::IPv4); - assert(defaults.size() >= 1); -} - - -void RouteTest::testAllHostsRoutes() -{ - IPAddress target("224.0.0.1"); - Route::RouteList targets = Route::match(target); - assert(targets.size() >= 2); -} - - -void RouteTest::testLoopbackRoute() -{ - IPAddress target("127.0.0.1"); - Route::RouteList targets = Route::match(target); - assert(targets.size() >= 1); -} - - -void RouteTest::setUp() -{ -} - - -void RouteTest::tearDown() -{ -} - - -void RouteTest::testAllRoutes() -{ - std::string metric = "Metric"; -#if defined(POCO_OS_FAMILY_BSD) - metric = "Expire"; -#endif - Route::RouteList routes = Route::list(IPAddress::IPv4); - assert(routes.size() >= 3); - - std::cout << std::endl << "Active IPv4 Routes:" << std::endl; - std::cout << "=============================================================================" << std::endl; - std::cout << std::setw(17) << "Destinaton" - << std::setw(17) << "Netmask" - << std::setw(17) << "Gateway" - << std::setw(17) << "Interface" - << std::setw(8) << metric << std::endl; - - Route::RouteList::const_iterator it = routes.begin(); - Route::RouteList::const_iterator end = routes.end(); - for (; it != end; ++it) - { - IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv4); - if (!ip.isLinkLocal()) - { - std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString(); - std::cout << std::setw(17) << it->getDest().toString() - << std::setw(17) << it->getNetmask().toString() - << std::setw(17) << gateway -#if defined(POCO_OS_FAMILY_BSD) - << std::setw(17) << it->getNetworkInterface().name(); -#else - << std::setw(17) << ip.toString(); -#endif - if (it->getMetric() != Route::ROUTE_METRIC_UNKNOWN) - std::cout << std::setw(8) << it->getMetric(); - std::cout << std::endl; - } - } - std::cout << "=============================================================================" << std::endl; - - routes = Route::list(IPAddress::IPv6); - assert(routes.size() >= 3); - - std::cout << std::endl << "Active IPv6 Routes:" << std::endl; - std::cout << "=============================================================" << std::endl; - std::cout << std::setw(4) << "If" - << std::setw(7) << metric - << std::setw(41) << "Destinaton" - << std::setw(41) << "Gateway" - << std::endl; - - it = routes.begin(); - for (; it != end; ++it) - { - IPAddress ip = it->getNetworkInterface().firstAddress(IPAddress::IPv6); - if (!ip.isLinkLocal()) - { - std::string gateway = it->getNextHop().isWildcard() ? "On-link" : it->getNextHop().toString(); -#if defined(POCO_OS_FAMILY_BSD) - std::cout << std::setw(4) << it->getNetworkInterface().name(); -#else - std::cout << std::setw(4) << it->getIfIndex(); -#endif - if (it->getMetric() != Route::ROUTE_METRIC_UNKNOWN) - std::cout << std::setw(7) << it->getMetric(); - else - std::cout << std::setw(7) << ""; - std::cout << std::setw(41) << it->getDest().toString() - << std::setw(41) << gateway << std::endl; - } - } - std::cout << "=============================================================" << std::endl; -} - - -CppUnit::Test* RouteTest::suite() -{ - CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("RouteTest"); - - CppUnit_addTest(pSuite, RouteTest, testDefaultRoute); - CppUnit_addTest(pSuite, RouteTest, testAllRoutes); -// CppUnit_addTest(pSuite, RouteTest, testAllHostsRoutes); - CppUnit_addTest(pSuite, RouteTest, testLoopbackRoute); - - return pSuite; -} diff --git a/Net/testsuite/src/RouteTest.h b/Net/testsuite/src/RouteTest.h deleted file mode 100644 index 9c9d6fadb..000000000 --- a/Net/testsuite/src/RouteTest.h +++ /dev/null @@ -1,63 +0,0 @@ -// -// RouteTest.h -// -// $Id: //poco/1.4/Net/testsuite/src/RouteTest.h#1 $ -// -// Definition of the RouteTest class. -// -// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef RouteTest_INCLUDED -#define RouteTest_INCLUDED - - -#include "Poco/Net/Net.h" -#include "CppUnit/TestCase.h" - - -class RouteTest: public CppUnit::TestCase -{ -public: - RouteTest(const std::string& name); - ~RouteTest(); - - void testDefaultRoute(); - void testAllRoutes(); - void testAllHostsRoutes(); - void testLoopbackRoute(); - - void setUp(); - void tearDown(); - - static CppUnit::Test* suite(); - -private: -}; - - -#endif // RouteTest_INCLUDED From 744ea4bc7d398646cac940af4f90565eb205f525 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 11 Nov 2012 15:04:31 -0600 Subject: [PATCH 033/165] Removed Route from Makefiles --- Net/Makefile | 2 +- Net/testsuite/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Net/Makefile b/Net/Makefile index f27a22267..6d3a041ca 100644 --- a/Net/Makefile +++ b/Net/Makefile @@ -28,7 +28,7 @@ objects = \ FTPClientSession FTPStreamFactory PartHandler PartSource NullPartHandler \ SocketReactor SocketNotifier SocketNotification AbstractHTTPRequestHandler \ MailRecipient MailMessage MailStream SMTPClientSession POP3ClientSession \ - RawSocket RawSocketImpl Route ICMPClient ICMPEventArgs ICMPPacket ICMPPacketImpl \ + RawSocket RawSocketImpl ICMPClient ICMPEventArgs ICMPPacket ICMPPacketImpl \ ICMPSocket ICMPSocketImpl ICMPv4PacketImpl \ RemoteSyslogChannel RemoteSyslogListener SMTPChannel \ WebSocket WebSocketImpl diff --git a/Net/testsuite/Makefile b/Net/testsuite/Makefile index 69fec0428..be3c6d90a 100644 --- a/Net/testsuite/Makefile +++ b/Net/testsuite/Makefile @@ -24,7 +24,7 @@ objects = \ SocketReactorTest ReactorTestSuite \ MailTestSuite MailMessageTest MailStreamTest \ SMTPClientSessionTest POP3ClientSessionTest \ - RawSocketTest RouteTest ICMPClientTest ICMPSocketTest ICMPClientTestSuite \ + RawSocketTest ICMPClientTest ICMPSocketTest ICMPClientTestSuite \ WebSocketTest WebSocketTestSuite \ SyslogTest From ff0d0907984bfe916ded7147f7def0567a51a7a9 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 11 Nov 2012 16:38:42 -0600 Subject: [PATCH 034/165] added more send* members Added: void sendMessage(std::istream& istr); void sendAddresses(const std::string& from, const Recipients& recipients); void sendData(); --- Net/include/Poco/Net/SMTPClientSession.h | 18 ++++++++ Net/src/SMTPClientSession.cpp | 56 ++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/Net/include/Poco/Net/SMTPClientSession.h b/Net/include/Poco/Net/SMTPClientSession.h index d734d1ee7..e5cf34de8 100644 --- a/Net/include/Poco/Net/SMTPClientSession.h +++ b/Net/include/Poco/Net/SMTPClientSession.h @@ -148,6 +148,11 @@ public: /// Throws a SMTPException in case of a SMTP-specific error, or a /// NetException in case of a general network communication failure. + void sendMessage(std::istream& istr); + /// Sends the mail message from the supplied stream. Content of the stream + /// is copied without any checking. Only the completion status is checked and, + /// if not valid, SMTPExcpetion is thrown. + int sendCommand(const std::string& command, std::string& response); /// Sends the given command verbatim to the server /// and waits for a response. @@ -162,6 +167,19 @@ public: /// Throws a SMTPException in case of a SMTP-specific error, or a /// NetException in case of a general network communication failure. + void sendAddresses(const std::string& from, const Recipients& recipients); + /// Sends the message preamble by sending a MAIL FROM command, + /// and a RCPT TO command for every recipient. + /// + /// Throws a SMTPException in case of a SMTP-specific error, or a + /// NetException in case of a general network communication failure. + + void sendData(); + /// Sends the message preamble by sending a DATA command. + /// + /// Throws a SMTPException in case of a SMTP-specific error, or a + /// NetException in case of a general network communication failure. + protected: enum StatusClass { diff --git a/Net/src/SMTPClientSession.cpp b/Net/src/SMTPClientSession.cpp index a6df7253c..dcaebde0c 100644 --- a/Net/src/SMTPClientSession.cpp +++ b/Net/src/SMTPClientSession.cpp @@ -365,6 +365,47 @@ void SMTPClientSession::sendCommands(const MailMessage& message, const Recipient } +void SMTPClientSession::sendAddresses(const std::string& from, const Recipients& recipients) +{ + std::string response; + int status = 0; + + std::string::size_type emailPos = from.find('<'); + if (emailPos == std::string::npos) + { + std::string sender("<"); + sender.append(from); + sender.append(">"); + status = sendCommand("MAIL FROM:", sender, response); + } + else + { + status = sendCommand("MAIL FROM:", from.substr(emailPos, from.size() - emailPos), response); + } + + if (!isPositiveCompletion(status)) throw SMTPException("Cannot send message", response, status); + + std::ostringstream recipient; + + for (Recipients::const_iterator it = recipients.begin(); it != recipients.end(); ++it) + { + + recipient << '<' << *it << '>'; + int status = sendCommand("RCPT TO:", recipient.str(), response); + if (!isPositiveCompletion(status)) throw SMTPException(std::string("Recipient rejected: ") + recipient.str(), response, status); + recipient.str(""); + } +} + + +void SMTPClientSession::sendData() +{ + std::string response; + int status = sendCommand("DATA", response); + if (!isPositiveIntermediate(status)) throw SMTPException("Cannot send message data", response, status); +} + + void SMTPClientSession::sendMessage(const MailMessage& message) { sendCommands(message); @@ -408,4 +449,19 @@ int SMTPClientSession::sendCommand(const std::string& command, const std::string } +void SMTPClientSession::sendMessage(std::istream& istr) +{ + std::string response; + int status = 0; + + SocketOutputStream socketStream(_socket); + MailOutputStream mailStream(socketStream); + StreamCopier::copyStream(istr, mailStream); + mailStream.close(); + socketStream.flush(); + status = _socket.receiveStatusMessage(response); + if (!isPositiveCompletion(status)) throw SMTPException("The server rejected the message", response, status); +} + + } } // namespace Poco::Net From 3d5add4c063f58f39fb3c7561462b972dce9efbb Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Mon, 12 Nov 2012 11:11:46 +0100 Subject: [PATCH 035/165] fixed a minor issue with VS71 solution file generation - fixedBuildOrder setting was not used --- ProGen/src/ProGen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ProGen/src/ProGen.cpp b/ProGen/src/ProGen.cpp index 02aa8d2ee..4a431ba09 100644 --- a/ProGen/src/ProGen.cpp +++ b/ProGen/src/ProGen.cpp @@ -1,7 +1,7 @@ // // ProGen.cpp // -// $Id: //poco/1.4/ProGen/src/ProGen.cpp#6 $ +// $Id: //poco/1.4/ProGen/src/ProGen.cpp#7 $ // // Visual Studio project file generator. // @@ -354,7 +354,7 @@ protected: std::string projectGUID = projectConfig.getString("vc.project.guid", ""); std::string projectPlatform = templateProps.getString("project.platform", platform); std::string projectSuffix = templateProps.getString("project.finalSuffix", templateProps.getString("project.suffix")); - bool includesHaveDependencies = false; + bool includesHaveDependencies = projectConfig.getBool("vc.solution.fixedBuildOrder", false); if (!projectName.empty()) { solutionStream << "Project(\"{" << solutionGUID << "}\") = \"" << projectName << "\", \"" << projectName << projectSuffix << "\", \"{" << projectGUID << "}\"\r\n"; From 12a7813e01fe3f681e2e86704e0667225ba66c73 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 12 Nov 2012 16:13:06 -0600 Subject: [PATCH 036/165] Changed file name in documentation Changed file name (Types.h => UTFString.h) in documentation --- Foundation/include/Poco/UTFString.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/include/Poco/UTFString.h b/Foundation/include/Poco/UTFString.h index 2b61b4dd0..78da610eb 100644 --- a/Foundation/include/Poco/UTFString.h +++ b/Foundation/include/Poco/UTFString.h @@ -1,5 +1,5 @@ // -// Types.h +// UTFString.h // // $Id: //poco/1.4/Foundation/include/Poco/UTFString.h#2 $ // From 9b89394b5bac2d3c814af1f4f29912019f8bf6d7 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Mon, 12 Nov 2012 20:00:37 -0600 Subject: [PATCH 037/165] Base32 Encoder/Decoder Base 32 Encoder/Decoder --- Foundation/Foundation_CE_vs90.vcproj | 16 ++ Foundation/Foundation_vs100.vcxproj | 4 + Foundation/Foundation_vs100.vcxproj.filters | 12 + Foundation/Foundation_vs110.vcxproj | 4 + Foundation/Foundation_vs110.vcxproj.filters | 12 + Foundation/Foundation_vs71.vcproj | 12 + Foundation/Foundation_vs80.vcproj | 16 ++ Foundation/Foundation_vs90.vcproj | 16 ++ Foundation/Foundation_x64_vs100.vcxproj | 4 + .../Foundation_x64_vs100.vcxproj.filters | 12 + Foundation/Foundation_x64_vs110.vcxproj | 4 + .../Foundation_x64_vs110.vcxproj.filters | 12 + Foundation/Foundation_x64_vs90.vcproj | 16 ++ Foundation/Makefile | 3 +- Foundation/include/Poco/Base32Decoder.h | 126 ++++++++++ Foundation/include/Poco/Base32Encoder.h | 131 ++++++++++ Foundation/src/Base32Decoder.cpp | 181 ++++++++++++++ Foundation/src/Base32Encoder.cpp | 223 ++++++++++++++++++ Foundation/testsuite/Makefile-Driver | 4 +- Foundation/testsuite/TestSuite_CE_vs90.vcproj | 8 + Foundation/testsuite/TestSuite_vs100.vcxproj | 2 + .../testsuite/TestSuite_vs100.vcxproj.filters | 6 + Foundation/testsuite/TestSuite_vs110.vcxproj | 2 + .../testsuite/TestSuite_vs110.vcxproj.filters | 6 + Foundation/testsuite/TestSuite_vs71.vcproj | 6 + Foundation/testsuite/TestSuite_vs80.vcproj | 8 + Foundation/testsuite/TestSuite_vs90.vcproj | 8 + .../testsuite/TestSuite_x64_vs100.vcxproj | 2 + .../TestSuite_x64_vs100.vcxproj.filters | 6 + .../testsuite/TestSuite_x64_vs110.vcxproj | 2 + .../TestSuite_x64_vs110.vcxproj.filters | 6 + .../testsuite/TestSuite_x64_vs90.vcproj | 8 + Foundation/testsuite/src/Base32Test.cpp | 197 ++++++++++++++++ Foundation/testsuite/src/Base32Test.h | 62 +++++ Foundation/testsuite/src/StreamsTestSuite.cpp | 2 + 35 files changed, 1136 insertions(+), 3 deletions(-) create mode 100644 Foundation/include/Poco/Base32Decoder.h create mode 100644 Foundation/include/Poco/Base32Encoder.h create mode 100644 Foundation/src/Base32Decoder.cpp create mode 100644 Foundation/src/Base32Encoder.cpp create mode 100644 Foundation/testsuite/src/Base32Test.cpp create mode 100644 Foundation/testsuite/src/Base32Test.h diff --git a/Foundation/Foundation_CE_vs90.vcproj b/Foundation/Foundation_CE_vs90.vcproj index 532c19235..a3d1b490f 100644 --- a/Foundation/Foundation_CE_vs90.vcproj +++ b/Foundation/Foundation_CE_vs90.vcproj @@ -553,6 +553,14 @@ + + + + @@ -733,6 +741,14 @@ + + + + diff --git a/Foundation/Foundation_vs100.vcxproj b/Foundation/Foundation_vs100.vcxproj index bb79f5be5..928dcb278 100644 --- a/Foundation/Foundation_vs100.vcxproj +++ b/Foundation/Foundation_vs100.vcxproj @@ -290,6 +290,8 @@ + + @@ -977,6 +979,8 @@ + + diff --git a/Foundation/Foundation_vs100.vcxproj.filters b/Foundation/Foundation_vs100.vcxproj.filters index b5213e459..4b81261e7 100644 --- a/Foundation/Foundation_vs100.vcxproj.filters +++ b/Foundation/Foundation_vs100.vcxproj.filters @@ -888,6 +888,12 @@ Core\Source Files + + Streams\Source Files + + + Streams\Source Files + @@ -1838,6 +1844,12 @@ Core\Header Files + + Streams\Header Files + + + Streams\Header Files + diff --git a/Foundation/Foundation_vs110.vcxproj b/Foundation/Foundation_vs110.vcxproj index 5cd999f1e..07b70d901 100644 --- a/Foundation/Foundation_vs110.vcxproj +++ b/Foundation/Foundation_vs110.vcxproj @@ -390,6 +390,8 @@ + + @@ -1041,6 +1043,8 @@ + + diff --git a/Foundation/Foundation_vs110.vcxproj.filters b/Foundation/Foundation_vs110.vcxproj.filters index 13c94e4a0..c4f7b5adb 100644 --- a/Foundation/Foundation_vs110.vcxproj.filters +++ b/Foundation/Foundation_vs110.vcxproj.filters @@ -270,6 +270,12 @@ Core\Source Files + + Streams\Source Files + + + Streams\Source Files + Streams\Source Files @@ -1046,6 +1052,12 @@ Core\Header Files + + Streams\Header Files + + + Streams\Header Files + Streams\Header Files diff --git a/Foundation/Foundation_vs71.vcproj b/Foundation/Foundation_vs71.vcproj index de1d691f6..fc727e3fb 100644 --- a/Foundation/Foundation_vs71.vcproj +++ b/Foundation/Foundation_vs71.vcproj @@ -951,6 +951,12 @@ + + + + @@ -1084,6 +1090,12 @@ + + + + diff --git a/Foundation/Foundation_vs80.vcproj b/Foundation/Foundation_vs80.vcproj index 3be5ddbd8..02d04f887 100644 --- a/Foundation/Foundation_vs80.vcproj +++ b/Foundation/Foundation_vs80.vcproj @@ -1267,6 +1267,14 @@ + + + + @@ -1447,6 +1455,14 @@ + + + + diff --git a/Foundation/Foundation_vs90.vcproj b/Foundation/Foundation_vs90.vcproj index a5188311c..db163bd3e 100644 --- a/Foundation/Foundation_vs90.vcproj +++ b/Foundation/Foundation_vs90.vcproj @@ -1264,6 +1264,14 @@ + + + + @@ -1444,6 +1452,14 @@ + + + + diff --git a/Foundation/Foundation_x64_vs100.vcxproj b/Foundation/Foundation_x64_vs100.vcxproj index a68ba19f0..c6a19d868 100644 --- a/Foundation/Foundation_x64_vs100.vcxproj +++ b/Foundation/Foundation_x64_vs100.vcxproj @@ -390,6 +390,8 @@ + + @@ -1038,6 +1040,8 @@ + + diff --git a/Foundation/Foundation_x64_vs100.vcxproj.filters b/Foundation/Foundation_x64_vs100.vcxproj.filters index d91d36795..52e52d905 100644 --- a/Foundation/Foundation_x64_vs100.vcxproj.filters +++ b/Foundation/Foundation_x64_vs100.vcxproj.filters @@ -270,6 +270,12 @@ Core\Source Files + + Streams\Source Files + + + Streams\Source Files + Streams\Source Files @@ -1046,6 +1052,12 @@ Core\Header Files + + Streams\Header Files + + + Streams\Header Files + Streams\Header Files diff --git a/Foundation/Foundation_x64_vs110.vcxproj b/Foundation/Foundation_x64_vs110.vcxproj index ed1ad3eac..a27509657 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj +++ b/Foundation/Foundation_x64_vs110.vcxproj @@ -396,6 +396,8 @@ + + @@ -1044,6 +1046,8 @@ + + diff --git a/Foundation/Foundation_x64_vs110.vcxproj.filters b/Foundation/Foundation_x64_vs110.vcxproj.filters index d91d36795..52e52d905 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj.filters +++ b/Foundation/Foundation_x64_vs110.vcxproj.filters @@ -270,6 +270,12 @@ Core\Source Files + + Streams\Source Files + + + Streams\Source Files + Streams\Source Files @@ -1046,6 +1052,12 @@ Core\Header Files + + Streams\Header Files + + + Streams\Header Files + Streams\Header Files diff --git a/Foundation/Foundation_x64_vs90.vcproj b/Foundation/Foundation_x64_vs90.vcproj index d745db9be..282134404 100644 --- a/Foundation/Foundation_x64_vs90.vcproj +++ b/Foundation/Foundation_x64_vs90.vcproj @@ -1266,6 +1266,14 @@ + + + + @@ -1442,6 +1450,14 @@ + + + + diff --git a/Foundation/Makefile b/Foundation/Makefile index 14822e9a8..f8e150e83 100644 --- a/Foundation/Makefile +++ b/Foundation/Makefile @@ -8,7 +8,8 @@ include $(POCO_BASE)/build/rules/global -objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \ +objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel \ + Base32Decoder Base32Encoder Base64Decoder Base64Encoder \ BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \ CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \ Debugger DeflatingStream DigestEngine DigestStream DirectoryIterator DirectoryWatcher \ diff --git a/Foundation/include/Poco/Base32Decoder.h b/Foundation/include/Poco/Base32Decoder.h new file mode 100644 index 000000000..2ffed1926 --- /dev/null +++ b/Foundation/include/Poco/Base32Decoder.h @@ -0,0 +1,126 @@ +// +// Base32Decoder.h +// +// $Id: //poco/1.4/Foundation/include/Poco/Base32Decoder.h#2 $ +// +// Library: Foundation +// Package: Streams +// Module: Base32 +// +// Definition of class Base32Decoder. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Foundation_Base32Decoder_INCLUDED +#define Foundation_Base32Decoder_INCLUDED + + +#include "Poco/Foundation.h" +#include "Poco/UnbufferedStreamBuf.h" +#include + + +namespace Poco { + + +class Foundation_API Base32DecoderBuf: public UnbufferedStreamBuf + /// This streambuf base32-decodes all data read + /// from the istream connected to it. + /// + /// Note: For performance reasons, the characters + /// are read directly from the given istream's + /// underlying streambuf, so the state + /// of the istream will not reflect that of + /// its streambuf. +{ +public: + Base32DecoderBuf(std::istream& istr); + ~Base32DecoderBuf(); + +private: + int readFromDevice(); + int readOne(); + + unsigned char _group[8]; + int _groupLength; + int _groupIndex; + std::streambuf& _buf; + + static unsigned char IN_ENCODING[256]; + static bool IN_ENCODING_INIT; + +private: + Base32DecoderBuf(const Base32DecoderBuf&); + Base32DecoderBuf& operator = (const Base32DecoderBuf&); +}; + + +class Foundation_API Base32DecoderIOS: public virtual std::ios + /// The base class for Base32Decoder. + /// + /// This class is needed to ensure the correct initialization + /// order of the stream buffer and base classes. +{ +public: + Base32DecoderIOS(std::istream& istr); + ~Base32DecoderIOS(); + Base32DecoderBuf* rdbuf(); + +protected: + Base32DecoderBuf _buf; + +private: + Base32DecoderIOS(const Base32DecoderIOS&); + Base32DecoderIOS& operator = (const Base32DecoderIOS&); +}; + + +class Foundation_API Base32Decoder: public Base32DecoderIOS, public std::istream + /// This istream base32-decodes all data + /// read from the istream connected to it. + /// + /// Note: For performance reasons, the characters + /// are read directly from the given istream's + /// underlying streambuf, so the state + /// of the istream will not reflect that of + /// its streambuf. +{ +public: + Base32Decoder(std::istream& istr); + ~Base32Decoder(); + +private: + Base32Decoder(const Base32Decoder&); + Base32Decoder& operator = (const Base32Decoder&); +}; + + +} // namespace Poco + + +#endif // Foundation_Base32Decoder_INCLUDED diff --git a/Foundation/include/Poco/Base32Encoder.h b/Foundation/include/Poco/Base32Encoder.h new file mode 100644 index 000000000..cf3dd916e --- /dev/null +++ b/Foundation/include/Poco/Base32Encoder.h @@ -0,0 +1,131 @@ +// +// Base32Encoder.h +// +// $Id: //poco/1.4/Foundation/include/Poco/Base32Encoder.h#2 $ +// +// Library: Foundation +// Package: Streams +// Module: Base32 +// +// Definition of class Base32Encoder. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Foundation_Base32Encoder_INCLUDED +#define Foundation_Base32Encoder_INCLUDED + + +#include "Poco/Foundation.h" +#include "Poco/UnbufferedStreamBuf.h" +#include + + +namespace Poco { + + +class Foundation_API Base32EncoderBuf: public UnbufferedStreamBuf + /// This streambuf base32-encodes all data written + /// to it and forwards it to a connected + /// ostream. + /// + /// Note: The characters are directly written + /// to the ostream's streambuf, thus bypassing + /// the ostream. The ostream's state is therefore + /// not updated to match the buffer's state. +{ +public: + Base32EncoderBuf(std::ostream& ostr); + ~Base32EncoderBuf(); + + int close(); + /// Closes the stream buffer. + +private: + int writeToDevice(char c); + + unsigned char _group[5]; + int _groupLength; + std::streambuf& _buf; + + static const unsigned char OUT_ENCODING[32]; + + friend class Base32DecoderBuf; + + Base32EncoderBuf(const Base32EncoderBuf&); + Base32EncoderBuf& operator = (const Base32EncoderBuf&); +}; + + +class Foundation_API Base32EncoderIOS: public virtual std::ios + /// The base class for Base32Encoder. + /// + /// This class is needed to ensure the correct initialization + /// order of the stream buffer and base classes. +{ +public: + Base32EncoderIOS(std::ostream& ostr); + ~Base32EncoderIOS(); + int close(); + Base32EncoderBuf* rdbuf(); + +protected: + Base32EncoderBuf _buf; + +private: + Base32EncoderIOS(const Base32EncoderIOS&); + Base32EncoderIOS& operator = (const Base32EncoderIOS&); +}; + + +class Foundation_API Base32Encoder: public Base32EncoderIOS, public std::ostream + /// This ostream base32-encodes all data + /// written to it and forwards it to + /// a connected ostream. + /// Always call close() when done + /// writing data, to ensure proper + /// completion of the encoding operation. + /// + /// Note: The characters are directly written + /// to the ostream's streambuf, thus bypassing + /// the ostream. The ostream's state is therefore + /// not updated to match the buffer's state. +{ +public: + Base32Encoder(std::ostream& ostr); + ~Base32Encoder(); + +private: + Base32Encoder(const Base32Encoder&); + Base32Encoder& operator = (const Base32Encoder&); +}; + + +} // namespace Poco + + +#endif // Foundation_Base32Encoder_INCLUDED diff --git a/Foundation/src/Base32Decoder.cpp b/Foundation/src/Base32Decoder.cpp new file mode 100644 index 000000000..71156ac62 --- /dev/null +++ b/Foundation/src/Base32Decoder.cpp @@ -0,0 +1,181 @@ +// +// Base32Decoder.cpp +// +// $Id: //poco/1.4/Foundation/src/Base32Decoder.cpp#2 $ +// +// Library: Foundation +// Package: Streams +// Module: Base32 +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Base32Decoder.h" +#include "Poco/Base32Encoder.h" +#include "Poco/Exception.h" +#include "Poco/Mutex.h" + + +namespace Poco { + + +unsigned char Base32DecoderBuf::IN_ENCODING[256]; +bool Base32DecoderBuf::IN_ENCODING_INIT = false; + + +namespace +{ + static FastMutex mutex; +} + + +Base32DecoderBuf::Base32DecoderBuf(std::istream& istr): + _groupLength(0), + _groupIndex(0), + _buf(*istr.rdbuf()) +{ + FastMutex::ScopedLock lock(mutex); + if (!IN_ENCODING_INIT) + { + for (unsigned i = 0; i < sizeof(IN_ENCODING); i++) + { + IN_ENCODING[i] = 0xFF; + } + for (unsigned i = 0; i < sizeof(Base32EncoderBuf::OUT_ENCODING); i++) + { + IN_ENCODING[Base32EncoderBuf::OUT_ENCODING[i]] = i; + } + IN_ENCODING[static_cast('=')] = '\0'; + IN_ENCODING_INIT = true; + } +} + + +Base32DecoderBuf::~Base32DecoderBuf() +{ +} + + +int Base32DecoderBuf::readFromDevice() +{ + if (_groupIndex < _groupLength) + { + return _group[_groupIndex++]; + } + else + { + unsigned char buffer[8]; + memset(buffer, '=', sizeof(buffer)); + int c; + + // per RFC-4648, Section 6, permissible block lengths are: + // 2, 4, 5, 7, and 8 bytes. Any other length is malformed. + // + do { + if ((c = readOne()) == -1) return -1; + buffer[0] = (unsigned char) c; + if (IN_ENCODING[buffer[0]] == 0xFF) throw DataFormatException(); + if ((c = readOne()) == -1) throw DataFormatException(); + buffer[1] = (unsigned char) c; + if (IN_ENCODING[buffer[1]] == 0xFF) throw DataFormatException(); + if ((c = readOne()) == -1) break; + buffer[2] = (unsigned char) c; + if (IN_ENCODING[buffer[2]] == 0xFF) throw DataFormatException(); + if ((c = readOne()) == -1) throw DataFormatException(); + buffer[3] = (unsigned char) c; + if (IN_ENCODING[buffer[3]] == 0xFF) throw DataFormatException(); + if ((c = readOne()) == -1) break; + buffer[4] = (unsigned char) c; + if (IN_ENCODING[buffer[4]] == 0xFF) throw DataFormatException(); + if ((c = readOne()) == -1) break; + buffer[5] = (unsigned char) c; + if (IN_ENCODING[buffer[5]] == 0xFF) throw DataFormatException(); + if ((c = readOne()) == -1) throw DataFormatException(); + buffer[6] = (unsigned char) c; + if (IN_ENCODING[buffer[6]] == 0xFF) throw DataFormatException(); + if ((c = readOne()) == -1) break; + buffer[7] = (unsigned char) c; + if (IN_ENCODING[buffer[7]] == 0xFF) throw DataFormatException(); + } while (false); + + _group[0] = (IN_ENCODING[buffer[0]] << 3) | (IN_ENCODING[buffer[1]] >> 2); + _group[1] = ((IN_ENCODING[buffer[1]] & 0x03) << 6) | (IN_ENCODING[buffer[2]] << 1) | (IN_ENCODING[buffer[3]] >> 4); + _group[2] = ((IN_ENCODING[buffer[3]] & 0x0F) << 4) | (IN_ENCODING[buffer[4]] >> 1); + _group[3] = ((IN_ENCODING[buffer[4]] & 0x01) << 7) | (IN_ENCODING[buffer[5]] << 2) | (IN_ENCODING[buffer[6]] >> 3); + _group[4] = ((IN_ENCODING[buffer[6]] & 0x07) << 5) | IN_ENCODING[buffer[7]]; + + if (buffer[2] == '=') + _groupLength = 1; + else if (buffer[4] == '=') + _groupLength = 2; + else if (buffer[5] == '=') + _groupLength = 3; + else if (buffer[7] == '=') + _groupLength = 4; + else + _groupLength = 5; + _groupIndex = 1; + return _group[0]; + } +} + + +int Base32DecoderBuf::readOne() +{ + int ch = _buf.sbumpc(); + return ch; +} + + +Base32DecoderIOS::Base32DecoderIOS(std::istream& istr): _buf(istr) +{ + poco_ios_init(&_buf); +} + + +Base32DecoderIOS::~Base32DecoderIOS() +{ +} + + +Base32DecoderBuf* Base32DecoderIOS::rdbuf() +{ + return &_buf; +} + + +Base32Decoder::Base32Decoder(std::istream& istr): Base32DecoderIOS(istr), std::istream(&_buf) +{ +} + + +Base32Decoder::~Base32Decoder() +{ +} + + +} // namespace Poco diff --git a/Foundation/src/Base32Encoder.cpp b/Foundation/src/Base32Encoder.cpp new file mode 100644 index 000000000..1a742d8bf --- /dev/null +++ b/Foundation/src/Base32Encoder.cpp @@ -0,0 +1,223 @@ +// +// Base32Encoder.cpp +// +// $Id: //poco/1.4/Foundation/src/Base32Encoder.cpp#2 $ +// +// Library: Foundation +// Package: Streams +// Module: Base32 +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Base32Encoder.h" + + +namespace Poco { + + +const unsigned char Base32EncoderBuf::OUT_ENCODING[32] = +{ + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', + 'Y', 'Z', '2', '3', '4', '5', '6', '8', +}; + + +Base32EncoderBuf::Base32EncoderBuf(std::ostream& ostr): + _groupLength(0), + _buf(*ostr.rdbuf()) +{ +} + + +Base32EncoderBuf::~Base32EncoderBuf() +{ + try + { + close(); + } + catch (...) + { + } +} + + + +int Base32EncoderBuf::writeToDevice(char c) +{ + static const int eof = std::char_traits::eof(); + + _group[_groupLength++] = (unsigned char) c; + if (_groupLength == 5) + { + unsigned char idx; + idx = _group[0] >> 3; + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[0] & 0x07) << 2) | (_group[1] >> 6); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[1] & 0x3E) >> 1); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[1] & 0x01) << 4) | (_group[2] >> 4); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[2] & 0x0F) << 1) | (_group[3] >> 7); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[3] & 0x7C) >> 2); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[3] & 0x03) << 3) | (_group[4] >> 5); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = (_group[4] & 0x1F); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + _groupLength = 0; + } + return charToInt(c); +} + + +int Base32EncoderBuf::close() +{ + static const int eof = std::char_traits::eof(); + + if (sync() == eof) return eof; + if (_groupLength == 1) + { + _group[1] = 0; + unsigned char idx; + idx = _group[0] >> 3; + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[0] & 0x07) << 2); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; +#if 0 + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; +#endif + } + else if (_groupLength == 2) + { + _group[2] = 0; + unsigned char idx; + idx = _group[0] >> 3; + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[0] & 0x07) << 2) | (_group[1] >> 6); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[1] & 0x3E) >> 1); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[1] & 0x01) << 4); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; +#if 0 + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; +#endif + } + else if (_groupLength == 3) + { + _group[3] = 0; + unsigned char idx; + idx = _group[0] >> 3; + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[0] & 0x07) << 2) | (_group[1] >> 6); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[1] & 0x3E) >> 1); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[1] & 0x01) << 4) | (_group[2] >> 4); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[2] & 0x0F) << 1); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; +#if 0 + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; +#endif + } + else if (_groupLength == 4) + { + _group[4] = 0; + unsigned char idx; + idx = _group[0] >> 3; + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[0] & 0x07) << 2) | (_group[1] >> 6); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[1] & 0x3E) >> 1); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[1] & 0x01) << 4) | (_group[2] >> 4); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[2] & 0x0F) << 1) | (_group[3] >> 7); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[3] & 0x7C) >> 2); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; + idx = ((_group[3] & 0x03) << 3); + if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; +#if 0 + if (_buf.sputc('=') == eof) return eof; +#endif + } + _groupLength = 0; + return _buf.pubsync(); +} + + +Base32EncoderIOS::Base32EncoderIOS(std::ostream& ostr): _buf(ostr) +{ + poco_ios_init(&_buf); +} + + +Base32EncoderIOS::~Base32EncoderIOS() +{ +} + + +int Base32EncoderIOS::close() +{ + return _buf.close(); +} + + +Base32EncoderBuf* Base32EncoderIOS::rdbuf() +{ + return &_buf; +} + + +Base32Encoder::Base32Encoder(std::ostream& ostr): Base32EncoderIOS(ostr), std::ostream(&_buf) +{ +} + + +Base32Encoder::~Base32Encoder() +{ +} + + +} // namespace Poco diff --git a/Foundation/testsuite/Makefile-Driver b/Foundation/testsuite/Makefile-Driver index bd71c490e..5645e3355 100644 --- a/Foundation/testsuite/Makefile-Driver +++ b/Foundation/testsuite/Makefile-Driver @@ -9,8 +9,8 @@ include $(POCO_BASE)/build/rules/global objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \ - AutoPtrTest ArrayTest SharedPtrTest AutoReleasePoolTest Base64Test \ - BinaryReaderWriterTest LineEndingConverterTest \ + AutoPtrTest ArrayTest SharedPtrTest AutoReleasePoolTest \ + Base32Test Base64Test BinaryReaderWriterTest LineEndingConverterTest \ ByteOrderTest ChannelTest ClassLoaderTest CoreTest CoreTestSuite \ CountingStreamTest CryptTestSuite DateTimeFormatterTest \ DateTimeParserTest DateTimeTest LocalDateTimeTest DateTimeTestSuite DigestStreamTest \ diff --git a/Foundation/testsuite/TestSuite_CE_vs90.vcproj b/Foundation/testsuite/TestSuite_CE_vs90.vcproj index 39baa7482..c657fd3bb 100644 --- a/Foundation/testsuite/TestSuite_CE_vs90.vcproj +++ b/Foundation/testsuite/TestSuite_CE_vs90.vcproj @@ -774,6 +774,10 @@ + + @@ -834,6 +838,10 @@ + + diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj b/Foundation/testsuite/TestSuite_vs100.vcxproj index eeba4428f..c4b37bbdc 100644 --- a/Foundation/testsuite/TestSuite_vs100.vcxproj +++ b/Foundation/testsuite/TestSuite_vs100.vcxproj @@ -304,6 +304,7 @@ + @@ -437,6 +438,7 @@ + diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters index 55ebe9310..1977900db 100644 --- a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters @@ -573,6 +573,9 @@ Streams\Source Files + + Streams\Source Files + @@ -965,5 +968,8 @@ Core\Header Files + + Streams\Header Files + \ No newline at end of file diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj b/Foundation/testsuite/TestSuite_vs110.vcxproj index 7d9a0f1dc..45a580e51 100644 --- a/Foundation/testsuite/TestSuite_vs110.vcxproj +++ b/Foundation/testsuite/TestSuite_vs110.vcxproj @@ -330,6 +330,7 @@ + @@ -463,6 +464,7 @@ + diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters index f39e374ab..a137b507f 100644 --- a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters @@ -240,6 +240,9 @@ Core\Source Files + + Streams\Source Files + Streams\Source Files @@ -635,6 +638,9 @@ Core\Header Files + + Streams\Header Files + Streams\Header Files diff --git a/Foundation/testsuite/TestSuite_vs71.vcproj b/Foundation/testsuite/TestSuite_vs71.vcproj index 357b736f0..9f88635bd 100644 --- a/Foundation/testsuite/TestSuite_vs71.vcproj +++ b/Foundation/testsuite/TestSuite_vs71.vcproj @@ -547,6 +547,9 @@ + + @@ -590,6 +593,9 @@ + + diff --git a/Foundation/testsuite/TestSuite_vs80.vcproj b/Foundation/testsuite/TestSuite_vs80.vcproj index 7f072c28c..b6c28d8f2 100644 --- a/Foundation/testsuite/TestSuite_vs80.vcproj +++ b/Foundation/testsuite/TestSuite_vs80.vcproj @@ -743,6 +743,10 @@ + + @@ -803,6 +807,10 @@ + + diff --git a/Foundation/testsuite/TestSuite_vs90.vcproj b/Foundation/testsuite/TestSuite_vs90.vcproj index a63fd9051..d469b5d47 100644 --- a/Foundation/testsuite/TestSuite_vs90.vcproj +++ b/Foundation/testsuite/TestSuite_vs90.vcproj @@ -729,6 +729,10 @@ + + @@ -789,6 +793,10 @@ + + diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj index 075258c75..ed762843e 100644 --- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj @@ -324,6 +324,7 @@ + @@ -458,6 +459,7 @@ + diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters index e1c5c67b1..0d596394a 100644 --- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -240,6 +240,9 @@ Core\Source Files + + Streams\Source Files + Streams\Source Files @@ -638,6 +641,9 @@ Core\Header Files + + Streams\Header Files + Streams\Header Files diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj index e44a6b5ec..9a764a03b 100644 --- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj @@ -330,6 +330,7 @@ + @@ -464,6 +465,7 @@ + diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters index e1c5c67b1..0d596394a 100644 --- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -240,6 +240,9 @@ Core\Source Files + + Streams\Source Files + Streams\Source Files @@ -638,6 +641,9 @@ Core\Header Files + + Streams\Header Files + Streams\Header Files diff --git a/Foundation/testsuite/TestSuite_x64_vs90.vcproj b/Foundation/testsuite/TestSuite_x64_vs90.vcproj index a2a89957d..927785125 100644 --- a/Foundation/testsuite/TestSuite_x64_vs90.vcproj +++ b/Foundation/testsuite/TestSuite_x64_vs90.vcproj @@ -719,6 +719,10 @@ + + @@ -775,6 +779,10 @@ + + diff --git a/Foundation/testsuite/src/Base32Test.cpp b/Foundation/testsuite/src/Base32Test.cpp new file mode 100644 index 000000000..f2d537d94 --- /dev/null +++ b/Foundation/testsuite/src/Base32Test.cpp @@ -0,0 +1,197 @@ +// +// Base32Test.cpp +// +// $Id: //poco/1.4/Foundation/testsuite/src/Base32Test.cpp#1 $ +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Base32Test.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" +#include "Poco/Base32Encoder.h" +#include "Poco/Base32Decoder.h" +#include "Poco/Exception.h" +#include + + +using Poco::Base32Encoder; +using Poco::Base32Decoder; +using Poco::DataFormatException; + + +Base32Test::Base32Test(const std::string& name): CppUnit::TestCase(name) +{ +} + + +Base32Test::~Base32Test() +{ +} + + +void Base32Test::testEncoder() +{ + { + std::ostringstream str; + Base32Encoder encoder(str); + encoder << std::string("\00\01\02\03\04\05", 6); + encoder.close(); + assert (str.str() == "AAAQEAYEAU"); + } + { + std::ostringstream str; + Base32Encoder encoder(str); + encoder << std::string("\00\01\02\03", 4); + encoder.close(); + assert (str.str() == "AAAQEAY"); + } + { + std::ostringstream str; + Base32Encoder encoder(str); + encoder << "ABCDEF"; + encoder.close(); + assert (str.str() == "IFBEGRCFIY"); + } + { + std::ostringstream str; + Base32Encoder encoder(str); + encoder << "ABCDE"; + encoder.close(); + assert (str.str() == "IFBEGRCF"); + } +} + + +void Base32Test::testDecoder() +{ + { + std::istringstream istr("AAAQEAYEAU"); + Base32Decoder decoder(istr); + assert (decoder.good() && decoder.get() == 0); + assert (decoder.good() && decoder.get() == 1); + assert (decoder.good() && decoder.get() == 2); + assert (decoder.good() && decoder.get() == 3); + assert (decoder.good() && decoder.get() == 4); + assert (decoder.good() && decoder.get() == 5); + assert (decoder.good() && decoder.get() == -1); + } + { + std::istringstream istr("AAAQEAYE"); + Base32Decoder decoder(istr); + assert (decoder.good() && decoder.get() == 0); + assert (decoder.good() && decoder.get() == 1); + assert (decoder.good() && decoder.get() == 2); + assert (decoder.good() && decoder.get() == 3); + assert (decoder.good() && decoder.get() == 4); + assert (decoder.good() && decoder.get() == -1); + } + { + std::istringstream istr("AAAQEAY"); + Base32Decoder decoder(istr); + assert (decoder.good() && decoder.get() == 0); + assert (decoder.good() && decoder.get() == 1); + assert (decoder.good() && decoder.get() == 2); + assert (decoder.good() && decoder.get() == 3); + assert (decoder.good() && decoder.get() == -1); + } + { + std::istringstream istr("IFBEGRCFIY"); + Base32Decoder decoder(istr); + std::string s; + decoder >> s; + assert (s == "ABCDEF"); + assert (decoder.eof()); + assert (!decoder.fail()); + } + { + std::istringstream istr("QUJD#REVG"); + Base32Decoder decoder(istr); + std::string s; + try + { + decoder >> s; + assert (decoder.bad()); + } + catch (DataFormatException&) + { + } + assert (!decoder.eof()); + } +} + + +void Base32Test::testEncodeDecode() +{ + { + std::stringstream str; + Base32Encoder encoder(str); + encoder << "The quick brown fox "; + encoder << "jumped over the lazy dog."; + encoder.close(); + Base32Decoder decoder(str); + std::string s; + int c = decoder.get(); + while (c != -1) { s += char(c); c = decoder.get(); } + assert (s == "The quick brown fox jumped over the lazy dog."); + } + { + std::string src; + for (int i = 0; i < 255; ++i) src += char(i); + std::stringstream str; + Base32Encoder encoder(str); + encoder.write(src.data(), (std::streamsize) src.size()); + encoder.close(); + Base32Decoder decoder(str); + std::string s; + int c = decoder.get(); + while (c != -1) { s += char(c); c = decoder.get(); } + assert (s == src); + } +} + + +void Base32Test::setUp() +{ +} + + +void Base32Test::tearDown() +{ +} + + +CppUnit::Test* Base32Test::suite() +{ + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("Base32Test"); + + CppUnit_addTest(pSuite, Base32Test, testEncoder); + CppUnit_addTest(pSuite, Base32Test, testDecoder); + CppUnit_addTest(pSuite, Base32Test, testEncodeDecode); + + return pSuite; +} diff --git a/Foundation/testsuite/src/Base32Test.h b/Foundation/testsuite/src/Base32Test.h new file mode 100644 index 000000000..509c19954 --- /dev/null +++ b/Foundation/testsuite/src/Base32Test.h @@ -0,0 +1,62 @@ +// +// Base32Test.h +// +// $Id: //poco/1.4/Foundation/testsuite/src/Base32Test.h#1 $ +// +// Definition of the Base32Test class. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Base32Test_INCLUDED +#define Base32Test_INCLUDED + + +#include "Poco/Foundation.h" +#include "CppUnit/TestCase.h" + + +class Base32Test: public CppUnit::TestCase +{ +public: + Base32Test(const std::string& name); + ~Base32Test(); + + void testEncoder(); + void testDecoder(); + void testEncodeDecode(); + + void setUp(); + void tearDown(); + + static CppUnit::Test* suite(); + +private: +}; + + +#endif // Base32Test_INCLUDED diff --git a/Foundation/testsuite/src/StreamsTestSuite.cpp b/Foundation/testsuite/src/StreamsTestSuite.cpp index b0bc2a738..800e1ff61 100644 --- a/Foundation/testsuite/src/StreamsTestSuite.cpp +++ b/Foundation/testsuite/src/StreamsTestSuite.cpp @@ -31,6 +31,7 @@ #include "StreamsTestSuite.h" +#include "Base32Test.h" #include "Base64Test.h" #include "HexBinaryTest.h" #include "StreamCopierTest.h" @@ -50,6 +51,7 @@ CppUnit::Test* StreamsTestSuite::suite() { CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("StreamsTestSuite"); + pSuite->addTest(Base32Test::suite()); pSuite->addTest(Base64Test::suite()); pSuite->addTest(HexBinaryTest::suite()); pSuite->addTest(StreamCopierTest::suite()); From df8f4eb7c035c786b86143acf08c76b4a800ab2e Mon Sep 17 00:00:00 2001 From: aleks-f Date: Mon, 12 Nov 2012 20:45:16 -0600 Subject: [PATCH 038/165] Replaced space indentations with tabs Replaced intermittent space indentations with tabs; removed test.txt file --- Foundation/include/Poco/DigestEngine.h | 12 +- Foundation/include/Poco/FIFOBufferStream.h | 2 +- Foundation/include/Poco/MetaObject.h | 2 +- Foundation/include/Poco/NamedTuple.h | 6526 +++++++++--------- Foundation/include/Poco/StreamCopier.h | 12 +- Foundation/include/Poco/Thread_POSIX.h | 6 +- Foundation/include/Poco/Thread_WIN32.h | 2 +- Foundation/include/Poco/TypeList.h | 4 +- Foundation/src/Debugger.cpp | 6 +- Foundation/src/File.cpp | 10 +- Foundation/src/Thread_WIN32.cpp | 2 +- Foundation/src/Timestamp.cpp | 54 +- Foundation/src/UTF8String.cpp | 44 +- Foundation/testsuite/src/DateTimeTest.cpp | 698 +- Foundation/testsuite/src/FileChannelTest.cpp | 20 +- Foundation/testsuite/src/FileChannelTest.h | 14 +- Foundation/testsuite/src/NamedTuplesTest.cpp | 558 +- Foundation/testsuite/src/URITest.cpp | 42 +- Foundation/testsuite/test.txt | 3 - 19 files changed, 4007 insertions(+), 4010 deletions(-) delete mode 100644 Foundation/testsuite/test.txt diff --git a/Foundation/include/Poco/DigestEngine.h b/Foundation/include/Poco/DigestEngine.h index 0b1b09100..0b7400785 100644 --- a/Foundation/include/Poco/DigestEngine.h +++ b/Foundation/include/Poco/DigestEngine.h @@ -82,15 +82,15 @@ public: /// The returned reference is valid until the next /// time digest() is called, or the engine object is destroyed. - static std::string digestToHex(const Digest& bytes); - /// Converts a message digest into a string of hexadecimal numbers. + static std::string digestToHex(const Digest& bytes); + /// Converts a message digest into a string of hexadecimal numbers. - static Digest digestFromHex(const std::string& digest); - /// Converts a string created by digestToHex back to its Digest presentation + static Digest digestFromHex(const std::string& digest); + /// Converts a string created by digestToHex back to its Digest presentation protected: - virtual void updateImpl(const void* data, std::size_t length) = 0; - /// Updates the digest with the given data. Must be implemented + virtual void updateImpl(const void* data, std::size_t length) = 0; + /// Updates the digest with the given data. Must be implemented /// by subclasses. private: diff --git a/Foundation/include/Poco/FIFOBufferStream.h b/Foundation/include/Poco/FIFOBufferStream.h index f36d9c3bf..b75c86537 100644 --- a/Foundation/include/Poco/FIFOBufferStream.h +++ b/Foundation/include/Poco/FIFOBufferStream.h @@ -132,7 +132,7 @@ class Foundation_API FIFOBufferStream: public FIFOIOS, public std::iostream /// An output stream for writing to a FIFO. { public: - Poco::BasicEvent& readable; + Poco::BasicEvent& readable; Poco::BasicEvent& writable; explicit FIFOBufferStream(FIFOBuffer& buffer); diff --git a/Foundation/include/Poco/MetaObject.h b/Foundation/include/Poco/MetaObject.h index 643ee573b..971828295 100644 --- a/Foundation/include/Poco/MetaObject.h +++ b/Foundation/include/Poco/MetaObject.h @@ -206,7 +206,7 @@ public: { return *_object.get(); } - + bool isAutoDelete(B* pObject) const { return true; diff --git a/Foundation/include/Poco/NamedTuple.h b/Foundation/include/Poco/NamedTuple.h index 1fd8b8393..da9513c2a 100644 --- a/Foundation/include/Poco/NamedTuple.h +++ b/Foundation/include/Poco/NamedTuple.h @@ -52,167 +52,167 @@ namespace Poco { template + class T1 = NullTypeList, + class T2 = NullTypeList, + class T3 = NullTypeList, + class T4 = NullTypeList, + class T5 = NullTypeList, + class T6 = NullTypeList, + class T7 = NullTypeList, + class T8 = NullTypeList, + class T9 = NullTypeList, + class T10 = NullTypeList, + class T11 = NullTypeList, + class T12 = NullTypeList, + class T13 = NullTypeList, + class T14 = NullTypeList, + class T15 = NullTypeList, + class T16 = NullTypeList, + class T17 = NullTypeList, + class T18 = NullTypeList, + class T19 = NullTypeList> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), - typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), - typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), - typename TypeWrapper::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), + typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), + typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), + typename TypeWrapper::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), - typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), - typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), - typename TypeWrapper::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), + typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), + typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), + typename TypeWrapper::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - const std::string& n10 = "K", - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - const std::string& n11 = "L", - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - const std::string& n12 = "M", - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - const std::string& n13 = "N", - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - const std::string& n14 = "O", - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - const std::string& n15 = "P", - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - const std::string& n16 = "Q", - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), - const std::string& n17 = "R", - typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), - const std::string& n18 = "S", - typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + const std::string& n10 = "K", + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + const std::string& n11 = "L", + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + const std::string& n12 = "M", + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + const std::string& n13 = "N", + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + const std::string& n14 = "O", + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + const std::string& n15 = "P", + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + const std::string& n16 = "Q", + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), + const std::string& n17 = "R", + typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), + const std::string& n18 = "S", + typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), const std::string& n19 = "T", - typename TypeWrapper::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): + typename TypeWrapper::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); case 10: return TupleType::template get<10>(); case 11: return TupleType::template get<11>(); case 12: return TupleType::template get<12>(); @@ -223,41 +223,41 @@ struct NamedTuple: public Tuple(); case 18: return TupleType::template get<18>(); case 19: return TupleType::template get<19>(); - default: throw RangeException(); - } - } - } + default: throw RangeException(); + } + } + } - throw NotFoundException("Name not found: " + name); - } + throw NotFoundException("Name not found: " + name); + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } void setName(std::size_t index, const std::string& name) { @@ -275,61 +275,61 @@ struct NamedTuple: public Tuplepush_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J", + const std::string& n10 = "K", + const std::string& n11 = "L", + const std::string& n12 = "M", + const std::string& n13 = "N", + const std::string& n14 = "O", + const std::string& n15 = "P", + const std::string& n16 = "Q", + const std::string& n17 = "R", + const std::string& n18 = "S", + const std::string& n19 = "T") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); _pNames->push_back(n10); _pNames->push_back(n11); _pNames->push_back(n12); @@ -340,171 +340,171 @@ private: _pNames->push_back(n17); _pNames->push_back(n18); _pNames->push_back(n19); - } - } + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8, + class T9, + class T10, + class T11, + class T12, + class T13, + class T14, + class T15, + class T16, + class T17, + class T18> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), - typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), - typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), + typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), + typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), - typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), - typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), + typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), + typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - const std::string& n10 = "K", - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - const std::string& n11 = "L", - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - const std::string& n12 = "M", - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - const std::string& n13 = "N", - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - const std::string& n14 = "O", - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - const std::string& n15 = "P", - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - const std::string& n16 = "Q", - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), - const std::string& n17 = "R", - typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), - const std::string& n18 = "S", - typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + const std::string& n10 = "K", + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + const std::string& n11 = "L", + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + const std::string& n12 = "M", + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + const std::string& n13 = "N", + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + const std::string& n14 = "O", + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + const std::string& n15 = "P", + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + const std::string& n16 = "Q", + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), + const std::string& n17 = "R", + typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), + const std::string& n18 = "S", + typename TypeWrapper::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); case 10: return TupleType::template get<10>(); case 11: return TupleType::template get<11>(); case 12: return TupleType::template get<12>(); @@ -514,43 +514,43 @@ struct NamedTuple(); case 17: return TupleType::template get<17>(); case 18: return TupleType::template get<18>(); - default: throw RangeException(); - } - } - } + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -566,60 +566,60 @@ struct NamedTuplepush_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J", + const std::string& n10 = "K", + const std::string& n11 = "L", + const std::string& n12 = "M", + const std::string& n13 = "N", + const std::string& n14 = "O", + const std::string& n15 = "P", + const std::string& n16 = "Q", + const std::string& n17 = "R", + const std::string& n18 = "S") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); _pNames->push_back(n10); _pNames->push_back(n11); _pNames->push_back(n12); @@ -629,166 +629,166 @@ private: _pNames->push_back(n16); _pNames->push_back(n17); _pNames->push_back(n18); - } - } + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8, + class T9, + class T10, + class T11, + class T12, + class T13, + class T14, + class T15, + class T16, + class T17> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), - typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), + typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), - typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), + typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - const std::string& n10 = "K", - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - const std::string& n11 = "L", - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - const std::string& n12 = "M", - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - const std::string& n13 = "N", - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - const std::string& n14 = "O", - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - const std::string& n15 = "P", - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - const std::string& n16 = "Q", - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), - const std::string& n17 = "R", - typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + const std::string& n10 = "K", + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + const std::string& n11 = "L", + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + const std::string& n12 = "M", + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + const std::string& n13 = "N", + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + const std::string& n14 = "O", + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + const std::string& n15 = "P", + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + const std::string& n16 = "Q", + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), + const std::string& n17 = "R", + typename TypeWrapper::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); case 10: return TupleType::template get<10>(); case 11: return TupleType::template get<11>(); case 12: return TupleType::template get<12>(); @@ -797,43 +797,43 @@ struct NamedTuple(); case 16: return TupleType::template get<16>(); case 17: return TupleType::template get<17>(); - default: throw RangeException(); - } - } - } + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -849,59 +849,59 @@ struct NamedTuplepush_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J", + const std::string& n10 = "K", + const std::string& n11 = "L", + const std::string& n12 = "M", + const std::string& n13 = "N", + const std::string& n14 = "O", + const std::string& n15 = "P", + const std::string& n16 = "Q", + const std::string& n17 = "R") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); _pNames->push_back(n10); _pNames->push_back(n11); _pNames->push_back(n12); @@ -910,161 +910,161 @@ private: _pNames->push_back(n15); _pNames->push_back(n16); _pNames->push_back(n17); - } - } + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8, + class T9, + class T10, + class T11, + class T12, + class T13, + class T14, + class T15, + class T16> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - const std::string& n10 = "K", - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - const std::string& n11 = "L", - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - const std::string& n12 = "M", - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - const std::string& n13 = "N", - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - const std::string& n14 = "O", - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - const std::string& n15 = "P", - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), - const std::string& n16 = "Q", - typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + const std::string& n10 = "K", + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + const std::string& n11 = "L", + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + const std::string& n12 = "M", + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + const std::string& n13 = "N", + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + const std::string& n14 = "O", + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + const std::string& n15 = "P", + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), + const std::string& n16 = "Q", + typename TypeWrapper::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); case 10: return TupleType::template get<10>(); case 11: return TupleType::template get<11>(); case 12: return TupleType::template get<12>(); @@ -1072,43 +1072,43 @@ struct NamedTuple(); case 15: return TupleType::template get<15>(); case 16: return TupleType::template get<16>(); - default: throw RangeException(); - } - } - } + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -1124,58 +1124,58 @@ struct NamedTuplepush_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J", + const std::string& n10 = "K", + const std::string& n11 = "L", + const std::string& n12 = "M", + const std::string& n13 = "N", + const std::string& n14 = "O", + const std::string& n15 = "P", + const std::string& n16 = "Q") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); _pNames->push_back(n10); _pNames->push_back(n11); _pNames->push_back(n12); @@ -1183,200 +1183,200 @@ private: _pNames->push_back(n14); _pNames->push_back(n15); _pNames->push_back(n16); - } - } + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8, + class T9, + class T10, + class T11, + class T12, + class T13, + class T14, + class T15> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - const std::string& n10 = "K", - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - const std::string& n11 = "L", - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - const std::string& n12 = "M", - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - const std::string& n13 = "N", - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - const std::string& n14 = "O", - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), - const std::string& n15 = "P", - typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + const std::string& n10 = "K", + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + const std::string& n11 = "L", + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + const std::string& n12 = "M", + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + const std::string& n13 = "N", + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + const std::string& n14 = "O", + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), + const std::string& n15 = "P", + typename TypeWrapper::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); case 10: return TupleType::template get<10>(); case 11: return TupleType::template get<11>(); case 12: return TupleType::template get<12>(); case 13: return TupleType::template get<13>(); case 14: return TupleType::template get<14>(); case 15: return TupleType::template get<15>(); - default: throw RangeException(); - } - } - } + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -1392,251 +1392,251 @@ struct NamedTuplepush_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J", + const std::string& n10 = "K", + const std::string& n11 = "L", + const std::string& n12 = "M", + const std::string& n13 = "N", + const std::string& n14 = "O", + const std::string& n15 = "P") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); _pNames->push_back(n10); _pNames->push_back(n11); _pNames->push_back(n12); _pNames->push_back(n13); _pNames->push_back(n14); _pNames->push_back(n15); - } - } + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8, + class T9, + class T10, + class T11, + class T12, + class T13, + class T14> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - const std::string& n10 = "K", - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - const std::string& n11 = "L", - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - const std::string& n12 = "M", - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - const std::string& n13 = "N", - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), - const std::string& n14 = "O", - typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + const std::string& n10 = "K", + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + const std::string& n11 = "L", + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + const std::string& n12 = "M", + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + const std::string& n13 = "N", + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), + const std::string& n14 = "O", + typename TypeWrapper::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); case 10: return TupleType::template get<10>(); case 11: return TupleType::template get<11>(); case 12: return TupleType::template get<12>(); case 13: return TupleType::template get<13>(); case 14: return TupleType::template get<14>(); - default: throw RangeException(); - } - } - } + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -1652,243 +1652,243 @@ struct NamedTuplepush_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J", + const std::string& n10 = "K", + const std::string& n11 = "L", + const std::string& n12 = "M", + const std::string& n13 = "N", + const std::string& n14 = "O") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); _pNames->push_back(n10); _pNames->push_back(n11); _pNames->push_back(n12); _pNames->push_back(n13); _pNames->push_back(n14); - } - } + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8, + class T9, + class T10, + class T11, + class T12, + class T13> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - const std::string& n10 = "K", - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - const std::string& n11 = "L", - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - const std::string& n12 = "M", - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), - const std::string& n13 = "N", - typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + const std::string& n10 = "K", + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + const std::string& n11 = "L", + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + const std::string& n12 = "M", + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), + const std::string& n13 = "N", + typename TypeWrapper::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); case 10: return TupleType::template get<10>(); case 11: return TupleType::template get<11>(); case 12: return TupleType::template get<12>(); case 13: return TupleType::template get<13>(); - default: throw RangeException(); - } - } - } + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -1904,234 +1904,234 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D", - const std::string& n4 = "E", - const std::string& n5 = "F", - const std::string& n6 = "G", - const std::string& n7 = "H", - const std::string& n8 = "I", - const std::string& n9 = "J", - const std::string& n10 = "K", - const std::string& n11 = "L", - const std::string& n12 = "M", - const std::string& n13 = "N") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J", + const std::string& n10 = "K", + const std::string& n11 = "L", + const std::string& n12 = "M", + const std::string& n13 = "N") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); _pNames->push_back(n10); _pNames->push_back(n11); _pNames->push_back(n12); _pNames->push_back(n13); - } - } + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8, + class T9, + class T10, + class T11, + class T12> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - const std::string& n10 = "K", - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - const std::string& n11 = "L", - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), - const std::string& n12 = "M", - typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): - TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12); - } + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + const std::string& n10 = "K", + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + const std::string& n11 = "L", + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), + const std::string& n12 = "M", + typename TypeWrapper::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): + TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12), _pNames(0) + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); case 10: return TupleType::template get<10>(); case 11: return TupleType::template get<11>(); case 12: return TupleType::template get<12>(); - default: throw RangeException(); - } - } - } + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -2147,227 +2147,227 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D", - const std::string& n4 = "E", - const std::string& n5 = "F", - const std::string& n6 = "G", - const std::string& n7 = "H", - const std::string& n8 = "I", - const std::string& n9 = "J", - const std::string& n10 = "K", - const std::string& n11 = "L", - const std::string& n12 = "M") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J", + const std::string& n10 = "K", + const std::string& n11 = "L", + const std::string& n12 = "M") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); _pNames->push_back(n10); _pNames->push_back(n11); _pNames->push_back(n12); - } - } + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8, + class T9, + class T10, + class T11> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - const std::string& n10 = "K", - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), - const std::string& n11 = "L", - typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + const std::string& n10 = "K", + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), + const std::string& n11 = "L", + typename TypeWrapper::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); case 10: return TupleType::template get<10>(); case 11: return TupleType::template get<11>(); - default: throw RangeException(); - } - } - } + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -2383,218 +2383,218 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D", - const std::string& n4 = "E", - const std::string& n5 = "F", - const std::string& n6 = "G", - const std::string& n7 = "H", - const std::string& n8 = "I", - const std::string& n9 = "J", - const std::string& n10 = "K", - const std::string& n11 = "L") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J", + const std::string& n10 = "K", + const std::string& n11 = "L") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); _pNames->push_back(n10); _pNames->push_back(n11); - } - } + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8, + class T9, + class T10> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), - const std::string& n10 = "K", - typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): - TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10); - } + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), + const std::string& n10 = "K", + typename TypeWrapper::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): + TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10), _pNames(0) + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); case 10: return TupleType::template get<10>(); - default: throw RangeException(); - } - } - } + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -2610,211 +2610,211 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D", - const std::string& n4 = "E", - const std::string& n5 = "F", - const std::string& n6 = "G", - const std::string& n7 = "H", - const std::string& n8 = "I", - const std::string& n9 = "J", - const std::string& n10 = "K") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J", + const std::string& n10 = "K") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); _pNames->push_back(n10); - } - } + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8, + class T9> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), - const std::string& n9 = "J", - typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), + const std::string& n9 = "J", + typename TypeWrapper::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - case 9: return TupleType::template get<9>(); - default: throw RangeException(); - } - } - } + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + case 9: return TupleType::template get<9>(); + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -2830,203 +2830,203 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D", - const std::string& n4 = "E", - const std::string& n5 = "F", - const std::string& n6 = "G", - const std::string& n7 = "H", - const std::string& n8 = "I", - const std::string& n9 = "J") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - _pNames->push_back(n9); - } - } + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I", + const std::string& n9 = "J") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + _pNames->push_back(n9); + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7, + class T8> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), - const std::string& n8 = "I", - typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7), + const std::string& n8 = "I", + typename TypeWrapper::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7,n8); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7,n8); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - case 8: return TupleType::template get<8>(); - default: throw RangeException(); - } - } - } + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + case 8: return TupleType::template get<8>(); + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -3042,195 +3042,195 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D", - const std::string& n4 = "E", - const std::string& n5 = "F", - const std::string& n6 = "G", - const std::string& n7 = "H", - const std::string& n8 = "I") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - _pNames->push_back(n8); - } - } + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H", + const std::string& n8 = "I") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + _pNames->push_back(n8); + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6, + class T7> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), - const std::string& n7 = "H", - typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), + const std::string& n7 = "H", + typename TypeWrapper::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): TupleType(t0,t1,t2,t3,t4,t5,t6,t7), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6,n7); - } + { + init(n0,n1,n2,n3,n4,n5,n6,n7); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - case 7: return TupleType::template get<7>(); - default: throw RangeException(); - } - } - } + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + case 7: return TupleType::template get<7>(); + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -3246,185 +3246,185 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D", - const std::string& n4 = "E", - const std::string& n5 = "F", - const std::string& n6 = "G", - const std::string& n7 = "H") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - _pNames->push_back(n7); - } - } + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G", + const std::string& n7 = "H") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + _pNames->push_back(n7); + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5, + class T6> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); - - _pNames = rNames; - } - - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): - TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0) - { - init(); - } - - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): - TupleType(t0,t1,t2,t3,t4,t5,t6) - { + NamedTuple(const NameVecPtr& rNames) + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), - const std::string& n6 = "G", - typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): - TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5,n6); - } + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): + TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0) + { + init(); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): + TupleType(t0,t1,t2,t3,t4,t5,t6) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - case 6: return TupleType::template get<6>(); - default: throw RangeException(); - } - } - } + _pNames = rNames; + } + + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), + const std::string& n6 = "G", + typename TypeWrapper::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): + TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0) + { + init(n0,n1,n2,n3,n4,n5,n6); + } + + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); + + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + case 6: return TupleType::template get<6>(); + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -3440,177 +3440,177 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D", - const std::string& n4 = "E", - const std::string& n5 = "F", - const std::string& n6 = "G") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - _pNames->push_back(n6); - } - } + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F", + const std::string& n6 = "G") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + _pNames->push_back(n6); + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4, + class T5> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); - - _pNames = rNames; - } - - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): - TupleType(t0,t1,t2,t3,t4,t5), _pNames(0) - { - init(); - } - - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): - TupleType(t0,t1,t2,t3,t4,t5) - { + NamedTuple(const NameVecPtr& rNames) + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), - const std::string& n5 = "F", - typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): - TupleType(t0,t1,t2,t3,t4,t5), _pNames(0) - { - init(n0,n1,n2,n3,n4,n5); - } + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): + TupleType(t0,t1,t2,t3,t4,t5), _pNames(0) + { + init(); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): + TupleType(t0,t1,t2,t3,t4,t5) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - case 5: return TupleType::template get<5>(); - default: throw RangeException(); - } - } - } + _pNames = rNames; + } + + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), + const std::string& n5 = "F", + typename TypeWrapper::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): + TupleType(t0,t1,t2,t3,t4,t5), _pNames(0) + { + init(n0,n1,n2,n3,n4,n5); + } + + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); + + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + case 5: return TupleType::template get<5>(); + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -3626,171 +3626,171 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D", - const std::string& n4 = "E", - const std::string& n5 = "F") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - _pNames->push_back(n5); - } - } + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E", + const std::string& n5 = "F") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + _pNames->push_back(n5); + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3, + class T4> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): TupleType(t0,t1,t2,t3,t4), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): TupleType(t0,t1,t2,t3,t4) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), - const std::string& n4 = "E", - typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3), + const std::string& n4 = "E", + typename TypeWrapper::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): TupleType(t0,t1,t2,t3,t4), _pNames(0) - { - init(n0,n1,n2,n3,n4); - } + { + init(n0,n1,n2,n3,n4); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - case 4: return TupleType::template get<4>(); - default: throw RangeException(); - } - } - } + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + case 4: return TupleType::template get<4>(); + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -3806,162 +3806,162 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D", - const std::string& n4 = "E") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - _pNames->push_back(n4); - } - } + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D", + const std::string& n4 = "E") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + _pNames->push_back(n4); + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2, + class T3> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): TupleType(t0,t1,t2,t3), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): TupleType(t0,t1,t2,t3) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), - const std::string& n3 = "D", - typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): - TupleType(t0,t1,t2,t3), _pNames(0) - { - init(n0,n1,n2,n3); - } + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), + const std::string& n3 = "D", + typename TypeWrapper::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): + TupleType(t0,t1,t2,t3), _pNames(0) + { + init(n0,n1,n2,n3); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - case 3: return TupleType::template get<3>(); - default: throw RangeException(); - } - } - } + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + case 3: return TupleType::template get<3>(); + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -3977,155 +3977,155 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C", - const std::string& n3 = "D") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - _pNames->push_back(n3); - } - } + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C", + const std::string& n3 = "D") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + _pNames->push_back(n3); + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1, + class T2> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): TupleType(t0,t1,t2), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): TupleType(t0,t1,t2) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), - const std::string& n2 = "C", - typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), + const std::string& n2 = "C", + typename TypeWrapper::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): TupleType(t0,t1,t2), _pNames(0) - { - init(n0,n1,n2); - } + { + init(n0,n1,n2); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - case 2: return TupleType::template get<2>(); - default: throw RangeException(); - } - } - } + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + case 2: return TupleType::template get<2>(); + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -4141,147 +4141,147 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B", - const std::string& n2 = "C") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - _pNames->push_back(n2); - } - } + void init(const std::string& n0 = "A", + const std::string& n1 = "B", + const std::string& n2 = "C") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + _pNames->push_back(n2); + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; template + class T1> struct NamedTuple: public Tuple { typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): TupleType(t0,t1), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0, - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0, + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): TupleType(t0,t1) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, - typename TypeWrapper::CONSTTYPE& t0, - const std::string& n1 = "B", - typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): + NamedTuple(const std::string& n0, + typename TypeWrapper::CONSTTYPE& t0, + const std::string& n1 = "B", + typename TypeWrapper::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): TupleType(t0,t1), _pNames(0) - { - init(n0,n1); - } + { + init(n0,n1); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - case 1: return TupleType::template get<1>(); - default: throw RangeException(); - } - } - } + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + case 1: return TupleType::template get<1>(); + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -4297,39 +4297,39 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A", - const std::string& n1 = "B") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - _pNames->push_back(n1); - } - } + void init(const std::string& n0 = "A", + const std::string& n1 = "B") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + _pNames->push_back(n1); + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; @@ -4340,95 +4340,95 @@ struct NamedTuple: typedef Tuple TupleType; typedef typename Tuple::Type Type; - typedef std::vector NameVec; - typedef SharedPtr NameVecPtr; + typedef std::vector NameVec; + typedef SharedPtr NameVecPtr; - NamedTuple(): _pNames(0) - { - init(); - } + NamedTuple(): _pNames(0) + { + init(); + } - NamedTuple(const NameVecPtr& rNames) - { - if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + NamedTuple(const NameVecPtr& rNames) + { + if (rNames->size() != TupleType::length) + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(typename TypeWrapper::CONSTTYPE& t0): + NamedTuple(typename TypeWrapper::CONSTTYPE& t0): TupleType(t0), _pNames(0) - { - init(); - } + { + init(); + } - NamedTuple(const NameVecPtr& rNames, - typename TypeWrapper::CONSTTYPE& t0): + NamedTuple(const NameVecPtr& rNames, + typename TypeWrapper::CONSTTYPE& t0): TupleType(t0) - { + { if (rNames->size() != TupleType::length) - throw InvalidArgumentException("Wrong names vector length."); + throw InvalidArgumentException("Wrong names vector length."); - _pNames = rNames; - } + _pNames = rNames; + } - NamedTuple(const std::string& n0, typename TypeWrapper::CONSTTYPE& t0): + NamedTuple(const std::string& n0, typename TypeWrapper::CONSTTYPE& t0): TupleType(t0), _pNames(0) - { - init(n0); - } + { + init(n0); + } - const DynamicAny get(const std::string& name) const - { - NameVec::const_iterator it = _pNames->begin(); - NameVec::const_iterator itEnd = _pNames->end(); + const DynamicAny get(const std::string& name) const + { + NameVec::const_iterator it = _pNames->begin(); + NameVec::const_iterator itEnd = _pNames->end(); - for(std::size_t counter = 0; it != itEnd; ++it, ++counter) - { - if (name == *it) - { - switch (counter) - { - case 0: return TupleType::template get<0>(); - default: throw RangeException(); - } - } - } + for(std::size_t counter = 0; it != itEnd; ++it, ++counter) + { + if (name == *it) + { + switch (counter) + { + case 0: return TupleType::template get<0>(); + default: throw RangeException(); + } + } + } throw NotFoundException("Name not found: " + name); - } + } - const DynamicAny operator [] (const std::string& name) const - { - return get(name); - } + const DynamicAny operator [] (const std::string& name) const + { + return get(name); + } - template - typename TypeGetter::ConstHeadType& get() const - { - return TupleType::template get(); - } + template + typename TypeGetter::ConstHeadType& get() const + { + return TupleType::template get(); + } - template - typename TypeGetter::HeadType& get() - { - return TupleType::template get(); - } + template + typename TypeGetter::HeadType& get() + { + return TupleType::template get(); + } - template - void set(typename TypeGetter::ConstHeadType& val) - { - return TupleType::template set(val); - } + template + void set(typename TypeGetter::ConstHeadType& val) + { + return TupleType::template set(val); + } - const NameVecPtr& names() - { - return _pNames; - } + const NameVecPtr& names() + { + return _pNames; + } - void setName(std::size_t index, const std::string& name) + void setName(std::size_t index, const std::string& name) { if (index >= _pNames->size()) throw InvalidArgumentException(format("Invalid index: %z", index)); @@ -4444,37 +4444,37 @@ struct NamedTuple: return (*_pNames)[index]; } - bool operator == (const NamedTuple& other) const - { - return TupleType(*this) == TupleType(other) && _pNames == other._pNames; - } + bool operator == (const NamedTuple& other) const + { + return TupleType(*this) == TupleType(other) && _pNames == other._pNames; + } - bool operator != (const NamedTuple& other) const - { - return !(*this == other); - } + bool operator != (const NamedTuple& other) const + { + return !(*this == other); + } - bool operator < (const NamedTuple& other) const - { - TupleType th(*this); - TupleType oth(other); + bool operator < (const NamedTuple& other) const + { + TupleType th(*this); + TupleType oth(other); - return (th < oth && _pNames == other._pNames) || - (th == oth && _pNames < other._pNames) || - (th < oth && _pNames < other._pNames); - } + return (th < oth && _pNames == other._pNames) || + (th == oth && _pNames < other._pNames) || + (th < oth && _pNames < other._pNames); + } private: - void init(const std::string& n0 = "A") - { - if (!_pNames) - { - _pNames = new NameVec; - _pNames->push_back(n0); - } - } + void init(const std::string& n0 = "A") + { + if (!_pNames) + { + _pNames = new NameVec; + _pNames->push_back(n0); + } + } - NameVecPtr _pNames; + NameVecPtr _pNames; }; diff --git a/Foundation/include/Poco/StreamCopier.h b/Foundation/include/Poco/StreamCopier.h index 9067f76a9..4924b5c18 100644 --- a/Foundation/include/Poco/StreamCopier.h +++ b/Foundation/include/Poco/StreamCopier.h @@ -54,13 +54,13 @@ class Foundation_API StreamCopier /// into another. { public: - static std::streamsize copyStream(std::istream& istr, std::ostream& ostr, std::size_t bufferSize = 8192); + static std::streamsize copyStream(std::istream& istr, std::ostream& ostr, std::size_t bufferSize = 8192); /// Writes all bytes readable from istr to ostr, using an internal buffer. /// /// Returns the number of bytes copied. #if defined(POCO_HAVE_INT64) - static Poco::UInt64 copyStream64(std::istream& istr, std::ostream& ostr, std::size_t bufferSize = 8192); + static Poco::UInt64 copyStream64(std::istream& istr, std::ostream& ostr, std::size_t bufferSize = 8192); /// Writes all bytes readable from istr to ostr, using an internal buffer. /// /// Returns the number of bytes copied as a 64-bit unsigned integer. @@ -69,13 +69,13 @@ public: /// integer is used to count the number of bytes copied. #endif - static std::streamsize copyStreamUnbuffered(std::istream& istr, std::ostream& ostr); + static std::streamsize copyStreamUnbuffered(std::istream& istr, std::ostream& ostr); /// Writes all bytes readable from istr to ostr. /// /// Returns the number of bytes copied. #if defined(POCO_HAVE_INT64) - static Poco::UInt64 copyStreamUnbuffered64(std::istream& istr, std::ostream& ostr); + static Poco::UInt64 copyStreamUnbuffered64(std::istream& istr, std::ostream& ostr); /// Writes all bytes readable from istr to ostr. /// /// Returns the number of bytes copied as a 64-bit unsigned integer. @@ -84,13 +84,13 @@ public: /// integer is used to count the number of bytes copied. #endif - static std::streamsize copyToString(std::istream& istr, std::string& str, std::size_t bufferSize = 8192); + static std::streamsize copyToString(std::istream& istr, std::string& str, std::size_t bufferSize = 8192); /// Appends all bytes readable from istr to the given string, using an internal buffer. /// /// Returns the number of bytes copied. #if defined(POCO_HAVE_INT64) - static Poco::UInt64 copyToString64(std::istream& istr, std::string& str, std::size_t bufferSize = 8192); + static Poco::UInt64 copyToString64(std::istream& istr, std::string& str, std::size_t bufferSize = 8192); /// Appends all bytes readable from istr to the given string, using an internal buffer. /// /// Returns the number of bytes copied as a 64-bit unsigned integer. diff --git a/Foundation/include/Poco/Thread_POSIX.h b/Foundation/include/Poco/Thread_POSIX.h index e9da535b1..d24b5808a 100644 --- a/Foundation/include/Poco/Thread_POSIX.h +++ b/Foundation/include/Poco/Thread_POSIX.h @@ -64,7 +64,7 @@ namespace Poco { class Foundation_API ThreadImpl { public: - typedef pthread_t TIDImpl; + typedef pthread_t TIDImpl; typedef void (*Callable)(void*); enum Priority @@ -91,9 +91,9 @@ public: void* pData; }; - ThreadImpl(); + ThreadImpl(); ~ThreadImpl(); - + TIDImpl tidImpl() const; void setPriorityImpl(int prio); int getPriorityImpl() const; diff --git a/Foundation/include/Poco/Thread_WIN32.h b/Foundation/include/Poco/Thread_WIN32.h index 3c863c9bb..9f58e4f3a 100644 --- a/Foundation/include/Poco/Thread_WIN32.h +++ b/Foundation/include/Poco/Thread_WIN32.h @@ -51,7 +51,7 @@ namespace Poco { class Foundation_API ThreadImpl { public: - typedef DWORD TIDImpl; + typedef DWORD TIDImpl; typedef void (*Callable)(void*); #if defined(_DLL) diff --git a/Foundation/include/Poco/TypeList.h b/Foundation/include/Poco/TypeList.h index 12383eebf..645883549 100644 --- a/Foundation/include/Poco/TypeList.h +++ b/Foundation/include/Poco/TypeList.h @@ -173,10 +173,10 @@ struct TypeListType /// typeList is a TypeList of T0, T1, ... , Tn { private: - typedef typename TypeListType::HeadType TailType; + typedef typename TypeListType::HeadType TailType; public: - typedef TypeList HeadType; + typedef TypeList HeadType; }; diff --git a/Foundation/src/Debugger.cpp b/Foundation/src/Debugger.cpp index fb1582c94..28d84629c 100644 --- a/Foundation/src/Debugger.cpp +++ b/Foundation/src/Debugger.cpp @@ -66,9 +66,9 @@ bool Debugger::isAvailable() #if defined(POCO_OS_FAMILY_WINDOWS) #if defined(_WIN32_WCE) #if (_WIN32_WCE >= 0x600) - BOOL isDebuggerPresent; - if (CheckRemoteDebuggerPresent(GetCurrentProcess(), &isDebuggerPresent)) - { + BOOL isDebuggerPresent; + if (CheckRemoteDebuggerPresent(GetCurrentProcess(), &isDebuggerPresent)) + { return isDebuggerPresent ? true : false; } return false; diff --git a/Foundation/src/File.cpp b/Foundation/src/File.cpp index 8e7dc77a1..5c17858b5 100644 --- a/Foundation/src/File.cpp +++ b/Foundation/src/File.cpp @@ -193,7 +193,7 @@ Timestamp File::getLastModified() const File& File::setLastModified(const Timestamp& ts) { setLastModifiedImpl(ts); - return *this; + return *this; } @@ -206,28 +206,28 @@ File::FileSize File::getSize() const File& File::setSize(FileSizeImpl size) { setSizeImpl(size); - return *this; + return *this; } File& File::setWriteable(bool flag) { setWriteableImpl(flag); - return *this; + return *this; } File& File::setReadOnly(bool flag) { setWriteableImpl(!flag); - return *this; + return *this; } File& File::setExecutable(bool flag) { setExecutableImpl(flag); - return *this; + return *this; } diff --git a/Foundation/src/Thread_WIN32.cpp b/Foundation/src/Thread_WIN32.cpp index cdb071b50..cd402fe0e 100644 --- a/Foundation/src/Thread_WIN32.cpp +++ b/Foundation/src/Thread_WIN32.cpp @@ -226,7 +226,7 @@ ThreadImpl* ThreadImpl::currentImpl() ThreadImpl::TIDImpl ThreadImpl::currentTidImpl() { - return GetCurrentThreadId(); + return GetCurrentThreadId(); } diff --git a/Foundation/src/Timestamp.cpp b/Foundation/src/Timestamp.cpp index 1d72726de..8fb50dc32 100644 --- a/Foundation/src/Timestamp.cpp +++ b/Foundation/src/Timestamp.cpp @@ -78,47 +78,47 @@ public: std::memset(&st1, 0, sizeof(SYSTEMTIME)); std::memset(&st2, 0, sizeof(SYSTEMTIME)); GetSystemTime(&st1); - while (true) - { - GetSystemTime(&st2); + while (true) + { + GetSystemTime(&st2); - // wait for a rollover + // wait for a rollover if (st1.wSecond != st2.wSecond) - { - _offset = GetTickCount() % 1000; - break; - } - } + { + _offset = GetTickCount() % 1000; + break; + } + } } void calibrate(int seconds) - { - SYSTEMTIME st1, st2; + { + SYSTEMTIME st1, st2; systemTime(&st1); WORD s = st1.wSecond; - int sum = 0; - int remaining = seconds; - while (remaining > 0) - { - systemTime(&st2); - WORD s2 = st2.wSecond; + int sum = 0; + int remaining = seconds; + while (remaining > 0) + { + systemTime(&st2); + WORD s2 = st2.wSecond; if (s != s2) - { - remaining--; - // store the offset from zero + { + remaining--; + // store the offset from zero sum += (st2.wMilliseconds > 500) ? (st2.wMilliseconds - 1000) : st2.wMilliseconds; - s = st2.wSecond; - } - } + s = st2.wSecond; + } + } - // adjust the offset by the average deviation from zero (round to the integer farthest from zero) - if (sum < 0) + // adjust the offset by the average deviation from zero (round to the integer farthest from zero) + if (sum < 0) _offset += (int) std::floor(sum / (float)seconds); - else + else _offset += (int) std::ceil(sum / (float)seconds); - } + } void systemTime(SYSTEMTIME* pST) { diff --git a/Foundation/src/UTF8String.cpp b/Foundation/src/UTF8String.cpp index d5c8eb95c..2e22db394 100644 --- a/Foundation/src/UTF8String.cpp +++ b/Foundation/src/UTF8String.cpp @@ -62,19 +62,19 @@ int UTF8::icompare(const std::string& str, std::string::size_type pos, std::stri TextIterator uend2(end2); while (uit1 != uend1 && uit2 != uend2) { - int c1 = Unicode::toLower(*uit1); - int c2 = Unicode::toLower(*uit2); - if (c1 < c2) - return -1; - else if (c1 > c2) - return 1; - ++uit1; ++uit2; + int c1 = Unicode::toLower(*uit1); + int c2 = Unicode::toLower(*uit2); + if (c1 < c2) + return -1; + else if (c1 > c2) + return 1; + ++uit1; ++uit2; } - - if (uit1 == uend1) + + if (uit1 == uend1) return uit2 == uend2 ? 0 : -1; - else - return 1; + else + return 1; } @@ -132,19 +132,19 @@ int UTF8::icompare(const std::string& str, std::string::size_type pos, std::stri TextIterator uend(str.begin() + pos + n); while (uit != uend && *ptr) { - int c1 = Unicode::toLower(*uit); - int c2 = Unicode::toLower(*ptr); - if (c1 < c2) - return -1; - else if (c1 > c2) - return 1; - ++uit; ++ptr; + int c1 = Unicode::toLower(*uit); + int c2 = Unicode::toLower(*ptr); + if (c1 < c2) + return -1; + else if (c1 > c2) + return 1; + ++uit; ++ptr; } - - if (uit == uend) + + if (uit == uend) return *ptr == 0 ? 0 : -1; - else - return 1; + else + return 1; } diff --git a/Foundation/testsuite/src/DateTimeTest.cpp b/Foundation/testsuite/src/DateTimeTest.cpp index 8c1798bee..cce388224 100644 --- a/Foundation/testsuite/src/DateTimeTest.cpp +++ b/Foundation/testsuite/src/DateTimeTest.cpp @@ -121,17 +121,17 @@ void DateTimeTest::testJulian() assert (dt.dayOfWeek() == 1); assert (dt.julianDay() == 0); - // Test that we can represent down to the microsecond. - dt = DateTime(2010, 1, 31, 17, 30, 15, 800, 3); + // Test that we can represent down to the microsecond. + dt = DateTime(2010, 1, 31, 17, 30, 15, 800, 3); - assert (dt.year() == 2010); - assert (dt.month() == 1); - assert (dt.day() == 31); - assert (dt.hour() == 17); - assert (dt.minute() == 30); - assert (dt.second() == 15); - assert (dt.millisecond() == 800); - assert (dt.microsecond() == 3); + assert (dt.year() == 2010); + assert (dt.month() == 1); + assert (dt.day() == 31); + assert (dt.hour() == 17); + assert (dt.minute() == 30); + assert (dt.second() == 15); + assert (dt.millisecond() == 800); + assert (dt.microsecond() == 3); } @@ -341,245 +341,245 @@ void DateTimeTest::testAMPM() void DateTimeTest::testRelational() { - DateTime dt1(2005, 1, 1, 0, 15, 30); - DateTime dt2(2005, 1, 2, 0, 15, 30); - DateTime dt3(dt1); + DateTime dt1(2005, 1, 1, 0, 15, 30); + DateTime dt2(2005, 1, 2, 0, 15, 30); + DateTime dt3(dt1); - assert (dt1 < dt2); - assert (dt1 <= dt2); - assert (dt2 > dt1); - assert (dt2 >= dt1); - assert (dt1 != dt2); - assert (!(dt1 == dt2)); + assert (dt1 < dt2); + assert (dt1 <= dt2); + assert (dt2 > dt1); + assert (dt2 >= dt1); + assert (dt1 != dt2); + assert (!(dt1 == dt2)); - assert (dt1 == dt3); - assert (!(dt1 != dt3)); - assert (dt1 >= dt3); - assert (dt1 <= dt3); - assert (!(dt1 > dt3)); - assert (!(dt1 < dt3)); + assert (dt1 == dt3); + assert (!(dt1 != dt3)); + assert (dt1 >= dt3); + assert (dt1 <= dt3); + assert (!(dt1 > dt3)); + assert (!(dt1 < dt3)); - static const struct - { - int year; - int month; - int day; - } values[] = - { - { 1, 1, 1 }, - { 10, 4, 5 }, - { 100, 6, 7 }, - { 1000, 8, 9 }, - { 2000, 1, 31 }, - { 2002, 7, 4 }, - { 2002, 12, 31 }, - { 2003, 1, 1 }, - { 2003, 1, 2 }, - { 2003, 8, 5 }, - { 2003, 8, 6 }, - { 2003, 8, 7 }, - { 2004, 9, 3 }, - { 2004, 9, 4 }, - }; + static const struct + { + int year; + int month; + int day; + } values[] = + { + { 1, 1, 1 }, + { 10, 4, 5 }, + { 100, 6, 7 }, + { 1000, 8, 9 }, + { 2000, 1, 31 }, + { 2002, 7, 4 }, + { 2002, 12, 31 }, + { 2003, 1, 1 }, + { 2003, 1, 2 }, + { 2003, 8, 5 }, + { 2003, 8, 6 }, + { 2003, 8, 7 }, + { 2004, 9, 3 }, + { 2004, 9, 4 }, + }; - const int num_values = sizeof values / sizeof *values; - for (int i = 0; i < num_values; ++i) - { - DateTime v; - const DateTime& V = v; - v.assign(values[i].year, values[i].month, values[i].day); - for (int j = 0; j < num_values; ++j) - { - DateTime u; - const DateTime& U = u; - u.assign(values[j].year, values[j].month, values[j].day); + const int num_values = sizeof values / sizeof *values; + for (int i = 0; i < num_values; ++i) + { + DateTime v; + const DateTime& V = v; + v.assign(values[i].year, values[i].month, values[i].day); + for (int j = 0; j < num_values; ++j) + { + DateTime u; + const DateTime& U = u; + u.assign(values[j].year, values[j].month, values[j].day); - loop_2_assert(i, j, (j < i) == (U < V)); - loop_2_assert(i, j, (j <= i) == (U <= V)); - loop_2_assert(i, j, (j >= i) == (U >= V)); - loop_2_assert(i, j, (j > i) == (U > V)); - } - } + loop_2_assert(i, j, (j < i) == (U < V)); + loop_2_assert(i, j, (j <= i) == (U <= V)); + loop_2_assert(i, j, (j >= i) == (U >= V)); + loop_2_assert(i, j, (j > i) == (U > V)); + } + } } void DateTimeTest::testArithmetics() { - DateTime dt1(2005, 1, 1, 0, 15, 30); - DateTime dt2(2005, 1, 2, 0, 15, 30); + DateTime dt1(2005, 1, 1, 0, 15, 30); + DateTime dt2(2005, 1, 2, 0, 15, 30); - Timespan s = dt2 - dt1; - assert (s.days() == 1); + Timespan s = dt2 - dt1; + assert (s.days() == 1); - DateTime dt3 = dt1 + s; - assert (dt3 == dt2); + DateTime dt3 = dt1 + s; + assert (dt3 == dt2); - dt3 -= s; - assert (dt3 == dt1); - dt1 += s; - assert (dt1 == dt2); + dt3 -= s; + assert (dt3 == dt1); + dt1 += s; + assert (dt1 == dt2); - static const struct - { - int lineNum; // source line number - int year1; // operand/result date1 year - int month1; // operand/result date1 month - unsigned int day1; // operand/result date1 day - int numDays; // operand/result 'int' number of days - int year2; // operand/result date2 year - int month2; // operand/result date2 month - unsigned int day2; // operand/result date2 day - } data[] = - { - // - - - -first- - - - - - - second - - - - //line no. year month day numDays year month day - //------- ----- ----- ----- ------- ----- ----- ----- - { __LINE__, 1, 1, 1, 1, 1, 1, 2 }, - { __LINE__, 10, 2, 28, 1, 10, 3, 1 }, - { __LINE__, 100, 3, 31, 2, 100, 4, 2 }, - { __LINE__, 1000, 4, 30, 4, 1000, 5, 4 }, - { __LINE__, 1000, 6, 1, -31, 1000, 5, 1 }, - { __LINE__, 1001, 1, 1, -365, 1000, 1, 1 }, - { __LINE__, 1100, 5, 31, 30, 1100, 6, 30 }, - { __LINE__, 1200, 6, 30, 32, 1200, 8, 1 }, - { __LINE__, 1996, 2, 28, 367, 1997, 3, 1 }, - { __LINE__, 1997, 2, 28, 366, 1998, 3, 1 }, - { __LINE__, 1998, 2, 28, 365, 1999, 2, 28 }, - { __LINE__, 1999, 2, 28, 364, 2000, 2, 27 }, - { __LINE__, 1999, 2, 28, 1096, 2002, 2, 28 }, - { __LINE__, 2002, 2, 28, -1096, 1999, 2, 28 }, - }; + static const struct + { + int lineNum; // source line number + int year1; // operand/result date1 year + int month1; // operand/result date1 month + unsigned int day1; // operand/result date1 day + int numDays; // operand/result 'int' number of days + int year2; // operand/result date2 year + int month2; // operand/result date2 month + unsigned int day2; // operand/result date2 day + } data[] = + { + // - - - -first- - - - - - - second - - - + //line no. year month day numDays year month day + //------- ----- ----- ----- ------- ----- ----- ----- + { __LINE__, 1, 1, 1, 1, 1, 1, 2 }, + { __LINE__, 10, 2, 28, 1, 10, 3, 1 }, + { __LINE__, 100, 3, 31, 2, 100, 4, 2 }, + { __LINE__, 1000, 4, 30, 4, 1000, 5, 4 }, + { __LINE__, 1000, 6, 1, -31, 1000, 5, 1 }, + { __LINE__, 1001, 1, 1, -365, 1000, 1, 1 }, + { __LINE__, 1100, 5, 31, 30, 1100, 6, 30 }, + { __LINE__, 1200, 6, 30, 32, 1200, 8, 1 }, + { __LINE__, 1996, 2, 28, 367, 1997, 3, 1 }, + { __LINE__, 1997, 2, 28, 366, 1998, 3, 1 }, + { __LINE__, 1998, 2, 28, 365, 1999, 2, 28 }, + { __LINE__, 1999, 2, 28, 364, 2000, 2, 27 }, + { __LINE__, 1999, 2, 28, 1096, 2002, 2, 28 }, + { __LINE__, 2002, 2, 28, -1096, 1999, 2, 28 }, + }; - const int num_data = sizeof data / sizeof *data; - for (int di = 0; di < num_data; ++di) - { - const int line = data[di].lineNum; - const int num_days = data[di].numDays; - DateTime x = DateTime(data[di].year1, data[di].month1, data[di].day1); - const DateTime& X = x; - x += Timespan(num_days, 0, 0, 0, 0); - loop_1_assert(line, data[di].year2 == X.year()); - loop_1_assert(line, data[di].month2 == X.month()); - loop_1_assert(line, data[di].day2 == X.day()); - } + const int num_data = sizeof data / sizeof *data; + for (int di = 0; di < num_data; ++di) + { + const int line = data[di].lineNum; + const int num_days = data[di].numDays; + DateTime x = DateTime(data[di].year1, data[di].month1, data[di].day1); + const DateTime& X = x; + x += Timespan(num_days, 0, 0, 0, 0); + loop_1_assert(line, data[di].year2 == X.year()); + loop_1_assert(line, data[di].month2 == X.month()); + loop_1_assert(line, data[di].day2 == X.day()); + } } void DateTimeTest::testIncrementDecrement() { - static const struct - { - int lineNum; // source line number - int year1; // (first) date year - int month1; // (first) date month - unsigned int day1; // (first) date day - int year2; // (second) date year - int month2; // (second) date month - unsigned int day2; // (second) date day - } data[] = - { - // - - - -first- - - - - - - second - - - - //line no. year month day year month day - //------- ----- ----- ----- ----- ----- ----- - { __LINE__, 1, 1, 1, 1, 1, 2 }, - { __LINE__, 10, 2, 28, 10, 3, 1 }, - { __LINE__, 100, 3, 31, 100, 4, 1 }, - { __LINE__, 1000, 4, 30, 1000, 5, 1 }, - { __LINE__, 1100, 5, 31, 1100, 6, 1 }, - { __LINE__, 1200, 6, 30, 1200, 7, 1 }, - { __LINE__, 1300, 7, 31, 1300, 8, 1 }, - { __LINE__, 1400, 8, 31, 1400, 9, 1 }, - { __LINE__, 1500, 9, 30, 1500, 10, 1 }, - { __LINE__, 1600, 10, 31, 1600, 11, 1 }, - { __LINE__, 1700, 11, 30, 1700, 12, 1 }, - { __LINE__, 1800, 12, 31, 1801, 1, 1 }, - { __LINE__, 1996, 2, 28, 1996, 2, 29 }, - { __LINE__, 1997, 2, 28, 1997, 3, 1 }, - { __LINE__, 1998, 2, 28, 1998, 3, 1 }, - { __LINE__, 1999, 2, 28, 1999, 3, 1 }, - { __LINE__, 2000, 2, 28, 2000, 2, 29 }, - { __LINE__, 2001, 2, 28, 2001, 3, 1 }, - { __LINE__, 2004, 2, 28, 2004, 2, 29 }, - { __LINE__, 2100, 2, 28, 2100, 3, 1 }, - { __LINE__, 2400, 2, 28, 2400, 2, 29 }, - }; + static const struct + { + int lineNum; // source line number + int year1; // (first) date year + int month1; // (first) date month + unsigned int day1; // (first) date day + int year2; // (second) date year + int month2; // (second) date month + unsigned int day2; // (second) date day + } data[] = + { + // - - - -first- - - - - - - second - - - + //line no. year month day year month day + //------- ----- ----- ----- ----- ----- ----- + { __LINE__, 1, 1, 1, 1, 1, 2 }, + { __LINE__, 10, 2, 28, 10, 3, 1 }, + { __LINE__, 100, 3, 31, 100, 4, 1 }, + { __LINE__, 1000, 4, 30, 1000, 5, 1 }, + { __LINE__, 1100, 5, 31, 1100, 6, 1 }, + { __LINE__, 1200, 6, 30, 1200, 7, 1 }, + { __LINE__, 1300, 7, 31, 1300, 8, 1 }, + { __LINE__, 1400, 8, 31, 1400, 9, 1 }, + { __LINE__, 1500, 9, 30, 1500, 10, 1 }, + { __LINE__, 1600, 10, 31, 1600, 11, 1 }, + { __LINE__, 1700, 11, 30, 1700, 12, 1 }, + { __LINE__, 1800, 12, 31, 1801, 1, 1 }, + { __LINE__, 1996, 2, 28, 1996, 2, 29 }, + { __LINE__, 1997, 2, 28, 1997, 3, 1 }, + { __LINE__, 1998, 2, 28, 1998, 3, 1 }, + { __LINE__, 1999, 2, 28, 1999, 3, 1 }, + { __LINE__, 2000, 2, 28, 2000, 2, 29 }, + { __LINE__, 2001, 2, 28, 2001, 3, 1 }, + { __LINE__, 2004, 2, 28, 2004, 2, 29 }, + { __LINE__, 2100, 2, 28, 2100, 3, 1 }, + { __LINE__, 2400, 2, 28, 2400, 2, 29 }, + }; - const int num_data = sizeof data / sizeof *data; - int di; + const int num_data = sizeof data / sizeof *data; + int di; - for (di = 0; di < num_data; ++di) - { - const int line = data[di].lineNum; - DateTime x = DateTime(data[di].year1, data[di].month1, - data[di].day1); - // Would do pre-increment of x here. - const DateTime& X = x; - x = x + Timespan(1,0,0,0,0); - DateTime y = x; const DateTime& Y = y; + for (di = 0; di < num_data; ++di) + { + const int line = data[di].lineNum; + DateTime x = DateTime(data[di].year1, data[di].month1, + data[di].day1); + // Would do pre-increment of x here. + const DateTime& X = x; + x = x + Timespan(1,0,0,0,0); + DateTime y = x; const DateTime& Y = y; - loop_1_assert(line, data[di].year2 == X.year()); - loop_1_assert(line, data[di].month2 == X.month()); - loop_1_assert(line, data[di].day2 == X.day()); + loop_1_assert(line, data[di].year2 == X.year()); + loop_1_assert(line, data[di].month2 == X.month()); + loop_1_assert(line, data[di].day2 == X.day()); - loop_1_assert(line, data[di].year2 == Y.year()); - loop_1_assert(line, data[di].month2 == Y.month()); - loop_1_assert(line, data[di].day2 == Y.day()); - } + loop_1_assert(line, data[di].year2 == Y.year()); + loop_1_assert(line, data[di].month2 == Y.month()); + loop_1_assert(line, data[di].day2 == Y.day()); + } - for (di = 0; di < num_data; ++di) - { - const int line = data[di].lineNum; - DateTime x = DateTime(data[di].year1, data[di].month1, data[di].day1); - DateTime x1 = DateTime(data[di].year1, data[di].month1, data[di].day1); - DateTime x2 = DateTime(data[di].year2, data[di].month2, data[di].day2); - DateTime y = x; const DateTime& Y = y; + for (di = 0; di < num_data; ++di) + { + const int line = data[di].lineNum; + DateTime x = DateTime(data[di].year1, data[di].month1, data[di].day1); + DateTime x1 = DateTime(data[di].year1, data[di].month1, data[di].day1); + DateTime x2 = DateTime(data[di].year2, data[di].month2, data[di].day2); + DateTime y = x; const DateTime& Y = y; - // Would do post increment of x here. - const DateTime& X = x; - x = x + Timespan(1,0,0,0,0); + // Would do post increment of x here. + const DateTime& X = x; + x = x + Timespan(1,0,0,0,0); - loop_1_assert(line, data[di].year2 == X.year()); - loop_1_assert(line, data[di].month2 == X.month()); - loop_1_assert(line, data[di].day2 == X.day()); - loop_1_assert(line, data[di].year1 == Y.year()); - loop_1_assert(line, data[di].month1 == Y.month()); - loop_1_assert(line, data[di].day1 == Y.day()); - } - - for (di = 0; di < num_data; ++di) - { - const int line = data[di].lineNum; - DateTime x = DateTime(data[di].year2, data[di].month2, data[di].day2); - const DateTime& X = x; - x = x - Timespan(1,0,0,0,0); - DateTime y = x; DateTime Y = y; + loop_1_assert(line, data[di].year2 == X.year()); + loop_1_assert(line, data[di].month2 == X.month()); + loop_1_assert(line, data[di].day2 == X.day()); + loop_1_assert(line, data[di].year1 == Y.year()); + loop_1_assert(line, data[di].month1 == Y.month()); + loop_1_assert(line, data[di].day1 == Y.day()); + } + + for (di = 0; di < num_data; ++di) + { + const int line = data[di].lineNum; + DateTime x = DateTime(data[di].year2, data[di].month2, data[di].day2); + const DateTime& X = x; + x = x - Timespan(1,0,0,0,0); + DateTime y = x; DateTime Y = y; - loop_1_assert(line, data[di].year1 == X.year()); - loop_1_assert(line, data[di].month1 == X.month()); - loop_1_assert(line, data[di].day1 == X.day()); + loop_1_assert(line, data[di].year1 == X.year()); + loop_1_assert(line, data[di].month1 == X.month()); + loop_1_assert(line, data[di].day1 == X.day()); - loop_1_assert(line, data[di].year1 == Y.year()); - loop_1_assert(line, data[di].month1 == Y.month()); - loop_1_assert(line, data[di].day1 == Y.day()); - } + loop_1_assert(line, data[di].year1 == Y.year()); + loop_1_assert(line, data[di].month1 == Y.month()); + loop_1_assert(line, data[di].day1 == Y.day()); + } - for (di = 0; di < num_data; ++di) - { - const int line = data[di].lineNum; - DateTime x1 = DateTime(data[di].year1, data[di].month1, data[di].day1); - DateTime x = DateTime(data[di].year2, data[di].month2, data[di].day2); - DateTime y = x; DateTime Y = y; - const DateTime& X = x; - // would post-decrement x here. - x = x - Timespan(1,0,0,0,0); + for (di = 0; di < num_data; ++di) + { + const int line = data[di].lineNum; + DateTime x1 = DateTime(data[di].year1, data[di].month1, data[di].day1); + DateTime x = DateTime(data[di].year2, data[di].month2, data[di].day2); + DateTime y = x; DateTime Y = y; + const DateTime& X = x; + // would post-decrement x here. + x = x - Timespan(1,0,0,0,0); - loop_1_assert(line, data[di].year1 == X.year()); - loop_1_assert(line, data[di].month1 == X.month()); - loop_1_assert(line, data[di].day1 == X.day()); + loop_1_assert(line, data[di].year1 == X.year()); + loop_1_assert(line, data[di].month1 == X.month()); + loop_1_assert(line, data[di].day1 == X.day()); - loop_1_assert(line, data[di].year2 == Y.year()); - loop_1_assert(line, data[di].month2 == Y.month()); - loop_1_assert(line, data[di].day2 == Y.day()); - } + loop_1_assert(line, data[di].year2 == Y.year()); + loop_1_assert(line, data[di].month2 == Y.month()); + loop_1_assert(line, data[di].day2 == Y.day()); + } } @@ -598,37 +598,37 @@ void DateTimeTest::testSwap() void DateTimeTest::testUsage() { - DateTime dt1(1776, 7, 4); - assert (dt1.year() == 1776); - assert (dt1.month() == 7); - assert (dt1.day() == 4); + DateTime dt1(1776, 7, 4); + assert (dt1.year() == 1776); + assert (dt1.month() == 7); + assert (dt1.day() == 4); - DateTime dt2(dt1); - dt2 += Timespan(6, 0, 0, 0, 0); - assert (dt2.year() == 1776); - assert (dt2.month() == 7); - assert (dt2.day() == 10); + DateTime dt2(dt1); + dt2 += Timespan(6, 0, 0, 0, 0); + assert (dt2.year() == 1776); + assert (dt2.month() == 7); + assert (dt2.day() == 10); - Timespan span = dt2 - dt1; - assert (span.days() == 6); + Timespan span = dt2 - dt1; + assert (span.days() == 6); - // TODO - When adding months and years we need to be - // able to specify the end-end convention. - // We cannot do this in POCO at the moment. + // TODO - When adding months and years we need to be + // able to specify the end-end convention. + // We cannot do this in POCO at the moment. } void DateTimeTest::testSetYearDay() { - static const struct - { - int d_lineNum; // source line number - int d_year; // year under test - unsigned int d_day; // day-of-year under test - int d_expMonth; // expected month - unsigned int d_expDay; // expected day - } data[] = - { + static const struct + { + int d_lineNum; // source line number + int d_year; // year under test + unsigned int d_day; // day-of-year under test + int d_expMonth; // expected month + unsigned int d_expDay; // expected day + } data[] = + { //line no. year dayOfYr exp. month exp. day //------- ----- ------- ---------- -------- { __LINE__, 1, 1, 1, 1 }, @@ -638,93 +638,93 @@ void DateTimeTest::testSetYearDay() { __LINE__, 1996, 2, 1, 2 }, { __LINE__, 1996, 365, 12, 30 }, { __LINE__, 1996, 366, 12, 31 } - }; - - const int num_data = sizeof data / sizeof *data; - for (int di = 0; di < num_data; ++di) - { - const int line = data[di].d_lineNum; - const int year = data[di].d_year; - const unsigned int day = data[di].d_day; - - const int exp_month = data[di].d_expMonth; - const unsigned int exp_day = data[di].d_expDay; - const DateTime r(year, exp_month, exp_day); - DateTime x; - const DateTime& X = x; - -#if 0 - // TODO - need to be able to assign a day number in the year - // but POCO is not able to do this. - - x.assign(year, day); - - // TODO - need to be able to assert with the loop counter - // but cppUnit is not able to do this. - - assert (r == x); - assert (day == X.dayOfYear()); -#endif - } - - static const struct - { - int d_lineNum; // source line number - int d_year; // year under test - int d_day; // day-of-year under test - int d_exp; // expected status - } data2[] = - { - //line no. year dayOfYr expected value - //------- ----- ------- -------------- - { __LINE__, 1, 1, 1 }, - { __LINE__, 1, -1, 0 }, - { __LINE__, 1, 0, 0 }, - { __LINE__, 1, 365, 1 }, - { __LINE__, 1, 366, 0 }, - { __LINE__, 1, 367, 0 }, - { __LINE__, 0, 0, 0 }, - { __LINE__, -1, -1, 0 }, - { __LINE__, 1996, 1, 1 }, - { __LINE__, 1996, 2, 1 }, - { __LINE__, 1996, 32, 1 }, - { __LINE__, 1996, 365, 1 }, - { __LINE__, 1996, 366, 1 }, - { __LINE__, 1996, 367, 0 }, }; - const int num_data2 = sizeof data2 / sizeof *data2; - for (int di = 0; di < num_data2; ++di) - { - const int line = data2[di].d_lineNum; - const int year = data2[di].d_year; - const int day = data2[di].d_day; - const int exp = data2[di].d_exp; - DateTime x; - const DateTime& X = x; - if (1 == exp) - { - DateTime r; - const DateTime& r2 = r; + const int num_data = sizeof data / sizeof *data; + for (int di = 0; di < num_data; ++di) + { + const int line = data[di].d_lineNum; + const int year = data[di].d_year; + const unsigned int day = data[di].d_day; + + const int exp_month = data[di].d_expMonth; + const unsigned int exp_day = data[di].d_expDay; + const DateTime r(year, exp_month, exp_day); + DateTime x; + const DateTime& X = x; + #if 0 - r.set(year, day); + // TODO - need to be able to assign a day number in the year + // but POCO is not able to do this. + + x.assign(year, day); + + // TODO - need to be able to assert with the loop counter + // but cppUnit is not able to do this. + + assert (r == x); + assert (day == X.dayOfYear()); #endif - } - } + } + + static const struct + { + int d_lineNum; // source line number + int d_year; // year under test + int d_day; // day-of-year under test + int d_exp; // expected status + } data2[] = + { + //line no. year dayOfYr expected value + //------- ----- ------- -------------- + { __LINE__, 1, 1, 1 }, + { __LINE__, 1, -1, 0 }, + { __LINE__, 1, 0, 0 }, + { __LINE__, 1, 365, 1 }, + { __LINE__, 1, 366, 0 }, + { __LINE__, 1, 367, 0 }, + { __LINE__, 0, 0, 0 }, + { __LINE__, -1, -1, 0 }, + { __LINE__, 1996, 1, 1 }, + { __LINE__, 1996, 2, 1 }, + { __LINE__, 1996, 32, 1 }, + { __LINE__, 1996, 365, 1 }, + { __LINE__, 1996, 366, 1 }, + { __LINE__, 1996, 367, 0 }, + }; + + const int num_data2 = sizeof data2 / sizeof *data2; + for (int di = 0; di < num_data2; ++di) + { + const int line = data2[di].d_lineNum; + const int year = data2[di].d_year; + const int day = data2[di].d_day; + const int exp = data2[di].d_exp; + DateTime x; + const DateTime& X = x; + if (1 == exp) + { + DateTime r; + const DateTime& r2 = r; +#if 0 + r.set(year, day); +#endif + } + } } void DateTimeTest::testIsValid() { - static const struct - { - int d_lineNum; // source line number - int d_year; // year under test - int d_month; // month under test - int d_day; // day under test - bool d_exp; // expected value - } data[] = - { + static const struct + { + int d_lineNum; // source line number + int d_year; // year under test + int d_month; // month under test + int d_day; // day under test + bool d_exp; // expected value + } data[] = + { //line no. year month day expected value //------- ----- ----- ----- -------------- { __LINE__, 0, 0, 0, false }, @@ -761,34 +761,34 @@ void DateTimeTest::testIsValid() { __LINE__, 2100, 2, 29, false }, }; - const int num_data = sizeof data / sizeof *data; - for (int di = 0; di < num_data; ++di) - { - const int line = data[di].d_lineNum; - const int year = data[di].d_year; - const int month = data[di].d_month; - const int day = data[di].d_day; - const bool exp = data[di].d_exp; + const int num_data = sizeof data / sizeof *data; + for (int di = 0; di < num_data; ++di) + { + const int line = data[di].d_lineNum; + const int year = data[di].d_year; + const int month = data[di].d_month; + const int day = data[di].d_day; + const bool exp = data[di].d_exp; bool isValid = DateTime::isValid(year, month, day); - loop_1_assert(line, exp == isValid); - } + loop_1_assert(line, exp == isValid); + } } void DateTimeTest::testDayOfWeek() { - typedef DateTime::DaysOfWeek DOW; + typedef DateTime::DaysOfWeek DOW; - static const struct - { - int d_lineNum; // source line number - int d_year; // year under test - int d_month; // month under test - int d_day; // day under test - DOW d_expDay; // number of days to be added - } data[] = - { + static const struct + { + int d_lineNum; // source line number + int d_year; // year under test + int d_month; // month under test + int d_day; // day under test + DOW d_expDay; // number of days to be added + } data[] = + { //Line no. year month day expDay //------- ----- ----- ----- ------- { __LINE__, 1600, 1, 1, DateTime::SATURDAY }, @@ -820,16 +820,16 @@ void DateTimeTest::testDayOfWeek() { __LINE__, 2000, 1, 2, DateTime::SUNDAY }, { __LINE__, 2000, 1, 3, DateTime::MONDAY }, { __LINE__, 2000, 1, 4, DateTime::TUESDAY }, - }; - - const int num_data = sizeof data / sizeof *data; - for (int di = 0; di < num_data ; ++di) - { - const int line = data[di].d_lineNum; - DateTime x = DateTime(data[di].d_year, data[di].d_month, data[di].d_day); - const DateTime& X = x; - loop_1_assert(line, data[di].d_expDay == X.dayOfWeek()); - } + }; + + const int num_data = sizeof data / sizeof *data; + for (int di = 0; di < num_data ; ++di) + { + const int line = data[di].d_lineNum; + DateTime x = DateTime(data[di].d_year, data[di].d_month, data[di].d_day); + const DateTime& X = x; + loop_1_assert(line, data[di].d_expDay == X.dayOfWeek()); + } } diff --git a/Foundation/testsuite/src/FileChannelTest.cpp b/Foundation/testsuite/src/FileChannelTest.cpp index c5605de26..3db000dd5 100644 --- a/Foundation/testsuite/src/FileChannelTest.cpp +++ b/Foundation/testsuite/src/FileChannelTest.cpp @@ -446,17 +446,17 @@ void FileChannelTest::noPurgeAge(const std::string& npa) void FileChannelTest::testPurgeAge() { - purgeAge("5 seconds"); - try - { - noPurgeAge("0 seconds"); - fail ("must fail"); - } catch (InvalidArgumentException&) - { - } + purgeAge("5 seconds"); + try + { + noPurgeAge("0 seconds"); + fail ("must fail"); + } catch (InvalidArgumentException&) + { + } - noPurgeAge(""); - noPurgeAge("none"); + noPurgeAge(""); + noPurgeAge("none"); } diff --git a/Foundation/testsuite/src/FileChannelTest.h b/Foundation/testsuite/src/FileChannelTest.h index bb6ea7dad..25dc67928 100644 --- a/Foundation/testsuite/src/FileChannelTest.h +++ b/Foundation/testsuite/src/FileChannelTest.h @@ -72,14 +72,14 @@ public: static CppUnit::Test* suite(); private: - template std::string rotation(TimeRotation rtype) const; - void remove(const std::string& baseName); - std::string filename() const; + template std::string rotation(TimeRotation rtype) const; + void remove(const std::string& baseName); + std::string filename() const; - void purgeAge(const std::string& purgeAge); - void noPurgeAge(const std::string& purgeAge); - void purgeCount(const std::string& pc); - void noPurgeCount(const std::string& pc); + void purgeAge(const std::string& purgeAge); + void noPurgeAge(const std::string& purgeAge); + void purgeCount(const std::string& pc); + void noPurgeCount(const std::string& pc); }; diff --git a/Foundation/testsuite/src/NamedTuplesTest.cpp b/Foundation/testsuite/src/NamedTuplesTest.cpp index 5c6e590e0..b79036413 100644 --- a/Foundation/testsuite/src/NamedTuplesTest.cpp +++ b/Foundation/testsuite/src/NamedTuplesTest.cpp @@ -73,17 +73,17 @@ void NamedTuplesTest::testNamedTuple1() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 1); - - TupleType aTuple2("string1", "1"); + + TupleType aTuple2("string1", "1"); assert (aTuple2["string1"] == "1"); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.set<0>("2"); + aTuple2.set<0>("2"); assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3.length == 1); @@ -109,19 +109,19 @@ void NamedTuplesTest::testNamedTuple2() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 2); - - TupleType aTuple2("string1", "1", - "int1", 1); + + TupleType aTuple2("string1", "1", + "int1", 1); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -151,21 +151,21 @@ void NamedTuplesTest::testNamedTuple3() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 3); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true); + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -197,23 +197,23 @@ void NamedTuplesTest::testNamedTuple4() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 4); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f); + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); assert (aTuple2["float1"] == 1.5); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -247,12 +247,12 @@ void NamedTuplesTest::testNamedTuple5() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 5); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c'); + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c'); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -260,12 +260,12 @@ void NamedTuplesTest::testNamedTuple5() assert (aTuple2["char1"] == 'c'); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -302,13 +302,13 @@ void NamedTuplesTest::testNamedTuple6() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 6); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999); + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -317,12 +317,12 @@ void NamedTuplesTest::testNamedTuple6() assert (aTuple2["long1"] == 999); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -361,14 +361,14 @@ void NamedTuplesTest::testNamedTuple7() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 7); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5); + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -378,12 +378,12 @@ void NamedTuplesTest::testNamedTuple7() assert (aTuple2["double1"] == 1.5); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -424,15 +424,15 @@ void NamedTuplesTest::testNamedTuple8() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 8); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700); + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -443,12 +443,12 @@ void NamedTuplesTest::testNamedTuple8() assert (aTuple2["short1"] == 32700); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -493,16 +493,16 @@ void NamedTuplesTest::testNamedTuple9() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 9); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2"); + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2"); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -514,12 +514,12 @@ void NamedTuplesTest::testNamedTuple9() assert (aTuple2["string2"] == "2"); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -566,17 +566,17 @@ void NamedTuplesTest::testNamedTuple10() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 10); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2 ); + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2 ); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -589,12 +589,12 @@ void NamedTuplesTest::testNamedTuple10() assert (aTuple2["int2"] == 2); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -644,17 +644,17 @@ void NamedTuplesTest::testNamedTuple11() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 11); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2, + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2, "string3", "3"); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); @@ -669,12 +669,12 @@ void NamedTuplesTest::testNamedTuple11() assert (aTuple2["string3"] == "3"); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -727,19 +727,19 @@ void NamedTuplesTest::testNamedTuple12() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 12); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2, + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2, "string3", "3", - "int3", 3); + "int3", 3); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -754,12 +754,12 @@ void NamedTuplesTest::testNamedTuple12() assert (aTuple2["int3"] == 3); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -814,20 +814,20 @@ void NamedTuplesTest::testNamedTuple13() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 13); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2, + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2, "string3", "3", - "int3", 3, - "bool2", true); + "int3", 3, + "bool2", true); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -843,12 +843,12 @@ void NamedTuplesTest::testNamedTuple13() assert (aTuple2["bool2"] == true); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -904,21 +904,21 @@ void NamedTuplesTest::testNamedTuple14() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 14); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2, + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2, "string3", "3", - "int3", 3, - "bool2", true, - "float2", 2.5); + "int3", 3, + "bool2", true, + "float2", 2.5); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -935,12 +935,12 @@ void NamedTuplesTest::testNamedTuple14() assert (aTuple2["float2"] == 2.5); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -998,22 +998,22 @@ void NamedTuplesTest::testNamedTuple15() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 15); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2, + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2, "string3", "3", - "int3", 3, - "bool2", true, - "float2", 2.5, - "char2", 'c'); + "int3", 3, + "bool2", true, + "float2", 2.5, + "char2", 'c'); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -1031,12 +1031,12 @@ void NamedTuplesTest::testNamedTuple15() assert (aTuple2["char2"] == 'c'); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -1097,23 +1097,23 @@ void NamedTuplesTest::testNamedTuple16() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 16); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2, + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2, "string3", "3", - "int3", 3, - "bool2", true, - "float2", 2.5, - "char2", 'c', - "long2", 999); + "int3", 3, + "bool2", true, + "float2", 2.5, + "char2", 'c', + "long2", 999); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -1133,12 +1133,12 @@ void NamedTuplesTest::testNamedTuple16() assert (aTuple2.length == 16); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -1202,24 +1202,24 @@ void NamedTuplesTest::testNamedTuple17() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 17); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2, + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2, "string3", "3", - "int3", 3, - "bool2", true, - "float2", 2.5, - "char2", 'c', - "long2", 999, - "double2", 2.5); + "int3", 3, + "bool2", true, + "float2", 2.5, + "char2", 'c', + "long2", 999, + "double2", 2.5); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -1240,12 +1240,12 @@ void NamedTuplesTest::testNamedTuple17() assert (aTuple2.length == 17); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -1312,25 +1312,25 @@ void NamedTuplesTest::testNamedTuple18() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 18); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2, + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2, "string3", "3", - "int3", 3, - "bool2", true, - "float2", 2.5, - "char2", 'c', - "long2", 999, - "double2", 2.5, - "short2", 32700); + "int3", 3, + "bool2", true, + "float2", 2.5, + "char2", 'c', + "long2", 999, + "double2", 2.5, + "short2", 32700); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -1352,12 +1352,12 @@ void NamedTuplesTest::testNamedTuple18() assert (aTuple2.length == 18); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -1427,26 +1427,26 @@ void NamedTuplesTest::testNamedTuple19() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 19); - - TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2, + + TupleType aTuple2("string1", "1", + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2, "string3", "3", - "int3", 3, - "bool2", true, - "float2", 2.5, - "char2", 'c', - "long2", 999, - "double2", 2.5, - "short2", 32700, - "string4", "4"); + "int3", 3, + "bool2", true, + "float2", 2.5, + "char2", 'c', + "long2", 999, + "double2", 2.5, + "short2", 32700, + "string4", "4"); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -1469,12 +1469,12 @@ void NamedTuplesTest::testNamedTuple19() assert (aTuple2.length == 19); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); @@ -1546,27 +1546,27 @@ void NamedTuplesTest::testNamedTuple20() try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); } catch (NotFoundException&) { } assert (aTuple.length == 20); - + TupleType aTuple2("string1", "1", - "int1", 1, - "bool1", true, - "float1", 1.5f, - "char1", 'c', - "long1", 999, - "double1", 1.5, - "short1", 32700, - "string2", "2", - "int2", 2, + "int1", 1, + "bool1", true, + "float1", 1.5f, + "char1", 'c', + "long1", 999, + "double1", 1.5, + "short1", 32700, + "string2", "2", + "int2", 2, "string3", "3", - "int3", 3, - "bool2", true, - "float2", 2.5, - "char2", 'c', - "long2", 999, - "double2", 2.5, - "short2", 32700, - "string4", "4", - "int4", 4); + "int3", 3, + "bool2", true, + "float2", 2.5, + "char2", 'c', + "long2", 999, + "double2", 2.5, + "short2", 32700, + "string4", "4", + "int4", 4); assert (aTuple2["string1"] == "1"); assert (aTuple2["int1"] == 1); assert (aTuple2["bool1"] == true); @@ -1590,12 +1590,12 @@ void NamedTuplesTest::testNamedTuple20() assert (aTuple2.length == 20); assert (aTuple != aTuple2); - aTuple = aTuple2; + aTuple = aTuple2; assert (aTuple == aTuple2); - aTuple2.get<1>()++; + aTuple2.get<1>()++; assert (aTuple < aTuple2); - TupleType aTuple3(aTuple2.names()); + TupleType aTuple3(aTuple2.names()); assert (aTuple3.names() == aTuple2.names()); assert (aTuple3["string1"] == ""); assert (aTuple3["int1"] == 0); diff --git a/Foundation/testsuite/src/URITest.cpp b/Foundation/testsuite/src/URITest.cpp index 5f8c6fa76..bcbfeff51 100644 --- a/Foundation/testsuite/src/URITest.cpp +++ b/Foundation/testsuite/src/URITest.cpp @@ -740,30 +740,30 @@ void URITest::testSwap() void URITest::testOther() { - // The search string is "hello%world"; google happens to ignore the '%' - // character, so it finds lots of hits for "hello world" programs. This is - // a convenient reproduction case, and a URL that actually works. - Poco::URI uri("http://google.com/search?q=hello%25world#frag%20ment"); + // The search string is "hello%world"; google happens to ignore the '%' + // character, so it finds lots of hits for "hello world" programs. This is + // a convenient reproduction case, and a URL that actually works. + Poco::URI uri("http://google.com/search?q=hello%25world#frag%20ment"); - assert(uri.getHost() == "google.com"); - assert(uri.getPath() == "/search"); - assert(uri.getQuery() == "q=hello%world"); - assert(uri.getRawQuery() == "q=hello%25world"); - assert(uri.getFragment() == "frag ment"); - assert(uri.toString() == "http://google.com/search?q=hello%25world#frag%20ment"); - assert(uri.getPathEtc() == "/search?q=hello%25world#frag%20ment"); + assert(uri.getHost() == "google.com"); + assert(uri.getPath() == "/search"); + assert(uri.getQuery() == "q=hello%world"); + assert(uri.getRawQuery() == "q=hello%25world"); + assert(uri.getFragment() == "frag ment"); + assert(uri.toString() == "http://google.com/search?q=hello%25world#frag%20ment"); + assert(uri.getPathEtc() == "/search?q=hello%25world#frag%20ment"); - uri.setQuery("q=goodbye cruel world"); - assert(uri.getQuery() == "q=goodbye cruel world"); - assert(uri.getRawQuery() == "q=goodbye%20cruel%20world"); - assert(uri.toString() == "http://google.com/search?q=goodbye%20cruel%20world#frag%20ment"); - assert(uri.getPathEtc() == "/search?q=goodbye%20cruel%20world#frag%20ment"); + uri.setQuery("q=goodbye cruel world"); + assert(uri.getQuery() == "q=goodbye cruel world"); + assert(uri.getRawQuery() == "q=goodbye%20cruel%20world"); + assert(uri.toString() == "http://google.com/search?q=goodbye%20cruel%20world#frag%20ment"); + assert(uri.getPathEtc() == "/search?q=goodbye%20cruel%20world#frag%20ment"); - uri.setRawQuery("q=pony%7eride"); - assert(uri.getQuery() == "q=pony~ride"); - assert(uri.getRawQuery() == "q=pony%7eride"); - assert(uri.toString() == "http://google.com/search?q=pony%7eride#frag%20ment"); - assert(uri.getPathEtc() == "/search?q=pony%7eride#frag%20ment"); + uri.setRawQuery("q=pony%7eride"); + assert(uri.getQuery() == "q=pony~ride"); + assert(uri.getRawQuery() == "q=pony%7eride"); + assert(uri.toString() == "http://google.com/search?q=pony%7eride#frag%20ment"); + assert(uri.getPathEtc() == "/search?q=pony%7eride#frag%20ment"); } diff --git a/Foundation/testsuite/test.txt b/Foundation/testsuite/test.txt deleted file mode 100644 index 42a9539e2..000000000 --- a/Foundation/testsuite/test.txt +++ /dev/null @@ -1,3 +0,0 @@ -0123456789 -abcdefghij -klmnopqrst From 97e9b9f5d98829eafb0844fb448cf5d95cc8e04e Mon Sep 17 00:00:00 2001 From: aleks-f Date: Mon, 12 Nov 2012 20:47:40 -0600 Subject: [PATCH 039/165] added test*.txt to ignore list added test generated files (test*.txt) to ignore list --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 06f4869c1..066a68d18 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ *.log *.sqlite *.db +test*.txt # OS generated files # ###################### From 4bf477946e770d77315f8c7b2e004a9e4ef0afda Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Tue, 13 Nov 2012 11:17:58 +0100 Subject: [PATCH 040/165] added POCO_LOCAL_STATIC_INIT_IS_THREADSAFE macro to check whether the compiler initializes static locals in a threadsafe way --- Foundation/include/Poco/Platform.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h index 55e515ce7..ce36ad099 100644 --- a/Foundation/include/Poco/Platform.h +++ b/Foundation/include/Poco/Platform.h @@ -216,4 +216,14 @@ #endif +// +// Thread-safety of local static initialization +// +#if __cplusplus >= 201103L || __GNUC__ >= 4 || defined(__clang__) +#ifndef POCO_LOCAL_STATIC_INIT_IS_THREADSAFE +#define POCO_LOCAL_STATIC_INIT_IS_THREADSAFE 1 +#endif +#endif + + #endif // Foundation_Platform_INCLUDED From 0472e955bad3539d2c1abf49b420f2d48857c3a6 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Tue, 13 Nov 2012 20:29:53 +0100 Subject: [PATCH 041/165] POCO_SERVER_MAIN now catches Poco::Exception and writes the displayText to stderr. --- Util/include/Poco/Util/ServerApplication.h | 62 +++++++++++++++------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/Util/include/Poco/Util/ServerApplication.h b/Util/include/Poco/Util/ServerApplication.h index 23aa77532..78441ae91 100644 --- a/Util/include/Poco/Util/ServerApplication.h +++ b/Util/include/Poco/Util/ServerApplication.h @@ -247,33 +247,57 @@ private: #define POCO_SERVER_MAIN(App) \ int wmain(int argc, wchar_t** argv) \ { \ - App app; \ - return app.run(argc, argv); \ + try \ + { \ + App app; \ + return app.run(argc, argv); \ + } \ + catch (Poco::Exception& exc) \ + { \ + std::cerr << exc.displayText() << std::endl; \ + return Poco::Util::Application::EXIT_SOFTWARE; \ + } \ } #elif defined(POCO_VXWORKS) #define POCO_SERVER_MAIN(App) \ - int pocoSrvMain(const char* appName, ...) \ - { \ - std::vector args; \ - args.push_back(std::string(appName)); \ - va_list vargs; \ - va_start(vargs, appName); \ - const char* arg = va_arg(vargs, const char*); \ - while (arg) \ - { \ - args.push_back(std::string(arg)); \ - arg = va_arg(vargs, const char*); \ - } \ - va_end(vargs); \ - App app; \ - return app.run(args); \ + int pocoSrvMain(const char* appName, ...) \ + { \ + std::vector args; \ + args.push_back(std::string(appName)); \ + va_list vargs; \ + va_start(vargs, appName); \ + const char* arg = va_arg(vargs, const char*); \ + while (arg) \ + { \ + args.push_back(std::string(arg)); \ + arg = va_arg(vargs, const char*); \ + } \ + va_end(vargs); \ + try \ + { \ + App app; \ + return app.run(args); \ + } \ + catch (Poco::Exception& exc) \ + { \ + std::cerr << exc.displayText() << std::endl; \ + return Poco::Util::Application::EXIT_SOFTWARE; \ + } \ } #else #define POCO_SERVER_MAIN(App) \ int main(int argc, char** argv) \ { \ - App app; \ - return app.run(argc, argv); \ + try \ + { \ + App app; \ + return app.run(argc, argv); \ + } \ + catch (Poco::Exception& exc) \ + { \ + std::cerr << exc.displayText() << std::endl; \ + return Poco::Util::Application::EXIT_SOFTWARE; \ + } \ } #endif From e92baf7258f83f0c94ecd6e345655495c49b96d8 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Tue, 13 Nov 2012 16:01:35 -0700 Subject: [PATCH 042/165] Correct alphabet; fix compilation issues on linux; add padding and make it on by default. --- Foundation/include/Poco/Base32Encoder.h | 7 ++-- Foundation/src/Base32Decoder.cpp | 3 +- Foundation/src/Base32Encoder.cpp | 55 +++++++++++++------------ Foundation/testsuite/src/Base32Test.cpp | 19 ++++++--- 4 files changed, 47 insertions(+), 37 deletions(-) diff --git a/Foundation/include/Poco/Base32Encoder.h b/Foundation/include/Poco/Base32Encoder.h index cf3dd916e..dcde55a37 100644 --- a/Foundation/include/Poco/Base32Encoder.h +++ b/Foundation/include/Poco/Base32Encoder.h @@ -59,7 +59,7 @@ class Foundation_API Base32EncoderBuf: public UnbufferedStreamBuf /// not updated to match the buffer's state. { public: - Base32EncoderBuf(std::ostream& ostr); + Base32EncoderBuf(std::ostream& ostr, bool padding = true); ~Base32EncoderBuf(); int close(); @@ -71,6 +71,7 @@ private: unsigned char _group[5]; int _groupLength; std::streambuf& _buf; + bool _doPadding; static const unsigned char OUT_ENCODING[32]; @@ -88,7 +89,7 @@ class Foundation_API Base32EncoderIOS: public virtual std::ios /// order of the stream buffer and base classes. { public: - Base32EncoderIOS(std::ostream& ostr); + Base32EncoderIOS(std::ostream& ostr, bool padding = true); ~Base32EncoderIOS(); int close(); Base32EncoderBuf* rdbuf(); @@ -116,7 +117,7 @@ class Foundation_API Base32Encoder: public Base32EncoderIOS, public std::ostream /// not updated to match the buffer's state. { public: - Base32Encoder(std::ostream& ostr); + Base32Encoder(std::ostream& ostr, bool padding = true); ~Base32Encoder(); private: diff --git a/Foundation/src/Base32Decoder.cpp b/Foundation/src/Base32Decoder.cpp index 71156ac62..4e49effe4 100644 --- a/Foundation/src/Base32Decoder.cpp +++ b/Foundation/src/Base32Decoder.cpp @@ -38,6 +38,7 @@ #include "Poco/Base32Encoder.h" #include "Poco/Exception.h" #include "Poco/Mutex.h" +#include namespace Poco { @@ -89,7 +90,7 @@ int Base32DecoderBuf::readFromDevice() else { unsigned char buffer[8]; - memset(buffer, '=', sizeof(buffer)); + std::memset(buffer, '=', sizeof(buffer)); int c; // per RFC-4648, Section 6, permissible block lengths are: diff --git a/Foundation/src/Base32Encoder.cpp b/Foundation/src/Base32Encoder.cpp index 1a742d8bf..7e4664dbb 100644 --- a/Foundation/src/Base32Encoder.cpp +++ b/Foundation/src/Base32Encoder.cpp @@ -45,13 +45,14 @@ const unsigned char Base32EncoderBuf::OUT_ENCODING[32] = 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', - 'Y', 'Z', '2', '3', '4', '5', '6', '8', + 'Y', 'Z', '2', '3', '4', '5', '6', '7', }; -Base32EncoderBuf::Base32EncoderBuf(std::ostream& ostr): +Base32EncoderBuf::Base32EncoderBuf(std::ostream& ostr, bool padding): _groupLength(0), - _buf(*ostr.rdbuf()) + _buf(*ostr.rdbuf()), + _doPadding(padding) { } @@ -112,14 +113,14 @@ int Base32EncoderBuf::close() if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; idx = ((_group[0] & 0x07) << 2); if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; -#if 0 - if (_buf.sputc('=') == eof) return eof; - if (_buf.sputc('=') == eof) return eof; - if (_buf.sputc('=') == eof) return eof; - if (_buf.sputc('=') == eof) return eof; - if (_buf.sputc('=') == eof) return eof; - if (_buf.sputc('=') == eof) return eof; -#endif + if (_doPadding) { + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + } } else if (_groupLength == 2) { @@ -133,12 +134,12 @@ int Base32EncoderBuf::close() if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; idx = ((_group[1] & 0x01) << 4); if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; -#if 0 - if (_buf.sputc('=') == eof) return eof; - if (_buf.sputc('=') == eof) return eof; - if (_buf.sputc('=') == eof) return eof; - if (_buf.sputc('=') == eof) return eof; -#endif + if (_doPadding) { + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + } } else if (_groupLength == 3) { @@ -154,11 +155,11 @@ int Base32EncoderBuf::close() if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; idx = ((_group[2] & 0x0F) << 1); if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; -#if 0 - if (_buf.sputc('=') == eof) return eof; - if (_buf.sputc('=') == eof) return eof; - if (_buf.sputc('=') == eof) return eof; -#endif + if (_doPadding) { + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + if (_buf.sputc('=') == eof) return eof; + } } else if (_groupLength == 4) { @@ -178,16 +179,15 @@ int Base32EncoderBuf::close() if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; idx = ((_group[3] & 0x03) << 3); if (_buf.sputc(OUT_ENCODING[idx]) == eof) return eof; -#if 0 - if (_buf.sputc('=') == eof) return eof; -#endif + if (_doPadding && _buf.sputc('=') == eof) return eof; } _groupLength = 0; return _buf.pubsync(); } -Base32EncoderIOS::Base32EncoderIOS(std::ostream& ostr): _buf(ostr) +Base32EncoderIOS::Base32EncoderIOS(std::ostream& ostr, bool padding): + _buf(ostr, padding) { poco_ios_init(&_buf); } @@ -210,7 +210,8 @@ Base32EncoderBuf* Base32EncoderIOS::rdbuf() } -Base32Encoder::Base32Encoder(std::ostream& ostr): Base32EncoderIOS(ostr), std::ostream(&_buf) +Base32Encoder::Base32Encoder(std::ostream& ostr, bool padding): + Base32EncoderIOS(ostr, padding), std::ostream(&_buf) { } diff --git a/Foundation/testsuite/src/Base32Test.cpp b/Foundation/testsuite/src/Base32Test.cpp index f2d537d94..37a6fab7e 100644 --- a/Foundation/testsuite/src/Base32Test.cpp +++ b/Foundation/testsuite/src/Base32Test.cpp @@ -61,21 +61,28 @@ void Base32Test::testEncoder() Base32Encoder encoder(str); encoder << std::string("\00\01\02\03\04\05", 6); encoder.close(); - assert (str.str() == "AAAQEAYEAU"); + assert (str.str() == "AAAQEAYEAU======"); } { std::ostringstream str; Base32Encoder encoder(str); encoder << std::string("\00\01\02\03", 4); encoder.close(); - assert (str.str() == "AAAQEAY"); + assert (str.str() == "AAAQEAY="); + } + { + std::ostringstream str; + Base32Encoder encoder(str, false); + encoder << "ABCDEF"; + encoder.close(); + assert (str.str() == "IFBEGRCFIY"); } { std::ostringstream str; Base32Encoder encoder(str); encoder << "ABCDEF"; encoder.close(); - assert (str.str() == "IFBEGRCFIY"); + assert (str.str() == "IFBEGRCFIY======"); } { std::ostringstream str; @@ -90,7 +97,7 @@ void Base32Test::testEncoder() void Base32Test::testDecoder() { { - std::istringstream istr("AAAQEAYEAU"); + std::istringstream istr("AAAQEAYEAU======"); Base32Decoder decoder(istr); assert (decoder.good() && decoder.get() == 0); assert (decoder.good() && decoder.get() == 1); @@ -111,7 +118,7 @@ void Base32Test::testDecoder() assert (decoder.good() && decoder.get() == -1); } { - std::istringstream istr("AAAQEAY"); + std::istringstream istr("AAAQEAY="); Base32Decoder decoder(istr); assert (decoder.good() && decoder.get() == 0); assert (decoder.good() && decoder.get() == 1); @@ -120,7 +127,7 @@ void Base32Test::testDecoder() assert (decoder.good() && decoder.get() == -1); } { - std::istringstream istr("IFBEGRCFIY"); + std::istringstream istr("IFBEGRCFIY======"); Base32Decoder decoder(istr); std::string s; decoder >> s; From 5f1d1b02e253ca8fcc73bf9c544cc0069df73af0 Mon Sep 17 00:00:00 2001 From: Mike Naquin Date: Wed, 14 Nov 2012 10:31:52 -0600 Subject: [PATCH 043/165] Add JSONConfiguration to Poco::Util::Application::loadConfiguration. --- Foundation/include/Poco/Config.h | 6 ++++++ Util/src/Application.cpp | 12 ++++++++++++ configure | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h index 978efafb2..1973ca20e 100644 --- a/Foundation/include/Poco/Config.h +++ b/Foundation/include/Poco/Config.h @@ -120,6 +120,12 @@ // #define POCO_UTIL_NO_INIFILECONFIGURATION +// No support for JSON configuration in +// Poco::Util::Application. Avoids linking of JSON +// library and saves a few 100 Kbytes. +// #define POCO_UTIL_NO_JSONCONFIGURATION + + // No support for XML configuration in // Poco::Util::Application. Avoids linking of XML // library and saves a few 100 Kbytes. diff --git a/Util/src/Application.cpp b/Util/src/Application.cpp index c73056f97..71580b749 100644 --- a/Util/src/Application.cpp +++ b/Util/src/Application.cpp @@ -40,6 +40,7 @@ #include "Poco/Util/PropertyFileConfiguration.h" #include "Poco/Util/IniFileConfiguration.h" #include "Poco/Util/XMLConfiguration.h" +#include "Poco/Util/JSONConfiguration.h" #include "Poco/Util/LoggingSubsystem.h" #include "Poco/Util/Option.h" #include "Poco/Util/OptionProcessor.h" @@ -251,6 +252,13 @@ int Application::loadConfiguration(int priority) ++n; } #endif +#ifndef POCO_UTIL_NO_JSONCONFIGURATION + if (findAppConfigFile(appPath.getBaseName(), "json", cfgPath)) + { + _pConfig->add(new JSONConfiguration(cfgPath.toString()), priority, false, false); + ++n; + } +#endif #ifndef POCO_UTIL_NO_XMLCONFIGURATION if (findAppConfigFile(appPath.getBaseName(), "xml", cfgPath)) { @@ -276,6 +284,10 @@ void Application::loadConfiguration(const std::string& path, int priority) else if (icompare(ext, "ini") == 0) _pConfig->add(new IniFileConfiguration(confPath.toString()), priority, false, false); #endif +#ifndef POCO_UTIL_NO_JSONONFIGURATION + else if (icompare(ext, "json") == 0) + _pConfig->add(new JSONConfiguration(confPath.toString()), priority, false, false); +#endif #ifndef POCO_UTIL_NO_XMLCONFIGURATION else if (icompare(ext, "xml") == 0) _pConfig->add(new XMLConfiguration(confPath.toString()), priority, false, false); diff --git a/configure b/configure index ba671ad1a..8951f982b 100755 --- a/configure +++ b/configure @@ -174,7 +174,7 @@ while [ $# -ge 1 ]; do flags="$flags -DPOCO_NET_NO_IPv6" ;; --poquito) - flags="$flags -DPOCO_NO_FILECHANNEL -DPOCO_NO_SPLITTERCHANNEL -DPOCO_NO_SYSLOGCHANNEL -DPOCO_UTIL_NO_INIFILECONFIGURATION -DPOCO_UTIL_NO_XMLCONFIGURATION" ;; + flags="$flags -DPOCO_NO_FILECHANNEL -DPOCO_NO_SPLITTERCHANNEL -DPOCO_NO_SYSLOGCHANNEL -DPOCO_UTIL_NO_INIFILECONFIGURATION -DPOCO_UTIL_NO_JSONCONFIGURATION -DPOCO_UTIL_NO_XMLCONFIGURATION" ;; --unbundled) flags="$flags -DPOCO_UNBUNDLED" From 6d586537bb7ff5e5376067f90f86f8257cff8619 Mon Sep 17 00:00:00 2001 From: Mike Naquin Date: Wed, 14 Nov 2012 10:34:27 -0600 Subject: [PATCH 044/165] Add include guards for XMLConfiguration and JSONConfiguration in Poco::Util. This will prevent accidental linking of the XML and JSON libraries when enabled. --- Util/include/Poco/Util/JSONConfiguration.h | 7 +++++++ Util/include/Poco/Util/XMLConfiguration.h | 7 +++++++ Util/src/JSONConfiguration.cpp | 7 +++++++ Util/src/XMLConfiguration.cpp | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/Util/include/Poco/Util/JSONConfiguration.h b/Util/include/Poco/Util/JSONConfiguration.h index cdf83272c..e5ed1435a 100644 --- a/Util/include/Poco/Util/JSONConfiguration.h +++ b/Util/include/Poco/Util/JSONConfiguration.h @@ -36,6 +36,11 @@ // +// Avoid accidental linking of JSON library when JSONConfiguration +// is not desired. +#ifndef POCO_UTIL_NO_JSONCONFIGURATION + + #ifndef Util_JSONConfiguration_INCLUDED #define Util_JSONConfiguration_INCLUDED @@ -160,3 +165,5 @@ private: #endif // Util_JSONConfiguration_INCLUDED + +#endif // POCO_UTIL_NO_JSONCONFIGURATION diff --git a/Util/include/Poco/Util/XMLConfiguration.h b/Util/include/Poco/Util/XMLConfiguration.h index 2e07ac624..2413ff972 100644 --- a/Util/include/Poco/Util/XMLConfiguration.h +++ b/Util/include/Poco/Util/XMLConfiguration.h @@ -36,6 +36,11 @@ // +// Avoid accidental linking of XML library when XMLConfiguration +// is not desired. +#ifndef POCO_UTIL_NO_XMLCONFIGURATION + + #ifndef Util_XMLConfiguration_INCLUDED #define Util_XMLConfiguration_INCLUDED @@ -215,3 +220,5 @@ private: #endif // Util_XMLConfiguration_INCLUDED + +#endif // POCO_UTIL_NO_XMLCONFIGURATION diff --git a/Util/src/JSONConfiguration.cpp b/Util/src/JSONConfiguration.cpp index 28c378af3..07ad67344 100644 --- a/Util/src/JSONConfiguration.cpp +++ b/Util/src/JSONConfiguration.cpp @@ -34,6 +34,11 @@ // +// Avoid accidental linking of JSON library when JSONConfiguration +// is not desired. +#ifndef POCO_UTIL_NO_JSONCONFIGURATION + + #include "Poco/FileStream.h" #include "Poco/StringTokenizer.h" #include "Poco/Util/JSONConfiguration.h" @@ -404,3 +409,5 @@ void JSONConfiguration::removeRaw(const std::string& key) } } // namespace Poco::Util + +#endif // POCO_UTIL_NO_JSONCONFIGURATION diff --git a/Util/src/XMLConfiguration.cpp b/Util/src/XMLConfiguration.cpp index f0044fb5c..a86e27312 100644 --- a/Util/src/XMLConfiguration.cpp +++ b/Util/src/XMLConfiguration.cpp @@ -34,6 +34,11 @@ // +// Avoid accidental linking of XML library when XMLConfiguration +// is not desired. +#ifndef POCO_UTIL_NO_XMLCONFIGURATION + + #include "Poco/Util/XMLConfiguration.h" #include "Poco/SAX/InputSource.h" #include "Poco/DOM/DOMParser.h" @@ -484,3 +489,5 @@ Poco::XML::Node* XMLConfiguration::findAttribute(const std::string& name, Poco:: } } // namespace Poco::Util + +#endif // POCO_UTIL_NO_XMLCONFIGURATION From a44435e9c2c4acd3490ae77cbd1c2dc4ee9502de Mon Sep 17 00:00:00 2001 From: Mike Naquin Date: Thu, 15 Nov 2012 10:27:26 -0600 Subject: [PATCH 045/165] Add config.build and config.make to .gitignore. --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 066a68d18..06934adf1 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,11 @@ *.a *.d +# Make # +######## +config.build +config.make + # Packages # ############ # it's better to unpack these files and commit the raw source From a6dd7894da69049ba55609a10b15dc65d93b13ca Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 17 Nov 2012 10:06:20 +0100 Subject: [PATCH 046/165] added support for new C++11 keywords and features to CppParser and PocoDoc --- CppParser/include/Poco/CppParser/CppToken.h | 14 ++++- CppParser/include/Poco/CppParser/Function.h | 34 +++++++++--- CppParser/include/Poco/CppParser/Struct.h | 23 ++++++++- CppParser/src/CppToken.cpp | 12 ++++- CppParser/src/Function.cpp | 32 +++++++++++- CppParser/src/Parser.cpp | 57 ++++++++++++++++----- 6 files changed, 146 insertions(+), 26 deletions(-) diff --git a/CppParser/include/Poco/CppParser/CppToken.h b/CppParser/include/Poco/CppParser/CppToken.h index c4e7e4566..ed57c5f2e 100644 --- a/CppParser/include/Poco/CppParser/CppToken.h +++ b/CppParser/include/Poco/CppParser/CppToken.h @@ -1,7 +1,7 @@ // // CppToken.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/CppToken.h#1 $ +// $Id: //poco/1.4/CppParser/include/Poco/CppParser/CppToken.h#2 $ // // Library: CppParser // Package: CppParser @@ -134,7 +134,9 @@ class CppParser_API IdentifierToken: public CppToken public: enum Keywords { - KW_AND = 1, + KW_ALIGNAS = 1, + KW_ALIGNOF, + KW_AND, KW_AND_EQ, KW_ASM, KW_AUTO, @@ -145,11 +147,15 @@ public: KW_CASE, KW_CATCH, KW_CHAR, + KW_CHAR_16T, + KW_CHAR_32T, KW_CLASS, KW_COMPL, KW_CONST, + KW_CONSTEXPR, KW_CONST_CAST, KW_CONTINUE, + KW_DECLTYPE, KW_DEFAULT, KW_DELETE, KW_DO, @@ -172,8 +178,10 @@ public: KW_MUTABLE, KW_NAMESPACE, KW_NEW, + KW_NOEXCEPT, KW_NOT, KW_NOT_EQ, + KW_NULLPTR, KW_OPERATOR, KW_OR, KW_OR_EQ, @@ -187,11 +195,13 @@ public: KW_SIGNED, KW_SIZEOF, KW_STATIC, + KW_STATIC_ASSERT, KW_STATIC_CAST, KW_STRUCT, KW_SWITCH, KW_TEMPLATE, KW_THIS, + KW_THREAD_LOCAL, KW_THROW, KW_TRUE, KW_TRY, diff --git a/CppParser/include/Poco/CppParser/Function.h b/CppParser/include/Poco/CppParser/Function.h index 2f95015ac..b390086d2 100644 --- a/CppParser/include/Poco/CppParser/Function.h +++ b/CppParser/include/Poco/CppParser/Function.h @@ -1,7 +1,7 @@ // // Function.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Function.h#1 $ +// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Function.h#2 $ // // Library: CppParser // Package: SymbolTable @@ -58,12 +58,17 @@ class CppParser_API Function: public Decl public: enum Flags { - FN_STATIC = 1, /// The function is static. - FN_VIRTUAL = 2, /// The function is virtual. - FN_INLINE = 4, /// The function is inline. - FN_CONST = 8, /// The function is const. - FN_TEMPLATE = 16, /// The function is a template. - FN_PURE_VIRTUAL = 32 /// The function is pure virtual. + FN_STATIC = 1, /// The function is static. + FN_VIRTUAL = 2, /// The function is virtual. + FN_INLINE = 4, /// The function is inline. + FN_CONST = 8, /// The function is const. + FN_TEMPLATE = 16, /// The function is a template. + FN_PURE_VIRTUAL = 32, /// The function is pure virtual. + FN_FINAL = 64, /// The function is final. + FN_OVERRIDE = 128, /// The function is override. + FN_NOEXCEPT = 256, /// The function is noexcept. + FN_DEFAULT = 512, /// The function is default. + FN_DELETE = 1024 /// The function has been deleted. }; typedef std::vector Parameters; @@ -94,6 +99,21 @@ public: void makePureVirtual(); /// Sets the FN_PURE_VIRTUAL flag. + + void makeFinal(); + /// Sets the FN_FINAL flag. + + void makeOverride(); + /// Sets the FN_OVERRIDE flag. + + void makeNoexcept(); + /// Sets the FN_NOEXCEPT flag. + + void makeDefault(); + /// Sets the FN_DEFAULT flag. + + void makeDelete(); + /// Sets the FN_DELETE flag. int flags() const; /// Returns the function's flags. diff --git a/CppParser/include/Poco/CppParser/Struct.h b/CppParser/include/Poco/CppParser/Struct.h index 34ea06adb..bda5c6498 100644 --- a/CppParser/include/Poco/CppParser/Struct.h +++ b/CppParser/include/Poco/CppParser/Struct.h @@ -1,7 +1,7 @@ // // Struct.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Struct.h#1 $ +// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Struct.h#2 $ // // Library: CppParser // Package: SymbolTable @@ -61,7 +61,8 @@ public: { FN_TEMPLATE = 1, FN_INLINE = 2, // when the whole class is inlined in a c++ file - FN_TEMPLATE_SPECIALIZATION = 4 + FN_TEMPLATE_SPECIALIZATION = 4, + FN_FINAL = 8 }; struct Base @@ -115,10 +116,16 @@ public: void makeInline(); /// Changes the class to a inline class, i.e. definition and implementation are hidden in a cpp file. + + void makeFinal(); + /// Makes the class final. bool isInline() const; /// Returns true if the complete class is inlined in a cpp file. + bool isFinal() const; + /// Returns true if the class is final. + void constructors(Functions& functions) const; /// Returns all constructors, sorted by their parameter count. @@ -190,12 +197,24 @@ inline void Struct::makeInline() } +inline void Struct::makeFinal() +{ + _flags |= FN_FINAL; +} + + inline bool Struct::isInline() const { return (_flags & FN_INLINE) != 0; } +inline bool Struct::isFinal() const +{ + return (_flags & FN_FINAL) != 0; +} + + inline bool Struct::isDerived() const { return !_bases.empty(); diff --git a/CppParser/src/CppToken.cpp b/CppParser/src/CppToken.cpp index 4ba0b053b..ee82e7ffe 100644 --- a/CppParser/src/CppToken.cpp +++ b/CppParser/src/CppToken.cpp @@ -1,7 +1,7 @@ // // CppToken.cpp // -// $Id: //poco/1.4/CppParser/src/CppToken.cpp#2 $ +// $Id: //poco/1.4/CppParser/src/CppToken.cpp#3 $ // // Library: CppParser // Package: CppParser @@ -254,6 +254,8 @@ int OperatorToken::asInteger() const IdentifierToken::IdentifierToken() { int i = 1; + _kwMap["alignas"] = i++; + _kwMap["alignof"] = i++; _kwMap["and"] = i++; _kwMap["and_eq"] = i++; _kwMap["asm"] = i++; @@ -265,11 +267,15 @@ IdentifierToken::IdentifierToken() _kwMap["case"] = i++; _kwMap["catch"] = i++; _kwMap["char"] = i++; + _kwMap["char16_t"] = i++; + _kwMap["char32_t"] = i++; _kwMap["class"] = i++; _kwMap["compl"] = i++; _kwMap["const"] = i++; + _kwMap["constexpr"] = i++; _kwMap["const_cast"] = i++; _kwMap["continue"] = i++; + _kwMap["decltype"] = i++; _kwMap["default"] = i++; _kwMap["delete"] = i++; _kwMap["do"] = i++; @@ -292,8 +298,10 @@ IdentifierToken::IdentifierToken() _kwMap["mutable"] = i++; _kwMap["namespace"] = i++; _kwMap["new"] = i++; + _kwMap["noexcept"] = i++; _kwMap["not"] = i++; _kwMap["not_eq"] = i++; + _kwMap["nullptr"] = i++; _kwMap["operator"] = i++; _kwMap["or"] = i++; _kwMap["or_eq"] = i++; @@ -307,11 +315,13 @@ IdentifierToken::IdentifierToken() _kwMap["signed"] = i++; _kwMap["sizeof"] = i++; _kwMap["static"] = i++; + _kwMap["static_assert"] = i++; _kwMap["static_cast"] = i++; _kwMap["struct"] = i++; _kwMap["switch"] = i++; _kwMap["template"] = i++; _kwMap["this"] = i++; + _kwMap["thread_local"] = i++; _kwMap["throw"] = i++; _kwMap["true"] = i++; _kwMap["try"] = i++; diff --git a/CppParser/src/Function.cpp b/CppParser/src/Function.cpp index be1976ef7..406863989 100644 --- a/CppParser/src/Function.cpp +++ b/CppParser/src/Function.cpp @@ -1,7 +1,7 @@ // // Function.cpp // -// $Id: //poco/1.4/CppParser/src/Function.cpp#1 $ +// $Id: //poco/1.4/CppParser/src/Function.cpp#2 $ // // Library: CppParser // Package: SymbolTable @@ -128,6 +128,36 @@ void Function::makePureVirtual() } +void Function::makeFinal() +{ + _flags |= FN_FINAL; +} + + +void Function::makeOverride() +{ + _flags |= FN_OVERRIDE; +} + + +void Function::makeNoexcept() +{ + _flags |= FN_NOEXCEPT; +} + + +void Function::makeDefault() +{ + _flags |= FN_DEFAULT; +} + + +void Function::makeDelete() +{ + _flags |= FN_DELETE; +} + + bool Function::isConstructor() const { return name() == nameSpace()->name(); diff --git a/CppParser/src/Parser.cpp b/CppParser/src/Parser.cpp index e4737b540..019a9ce16 100644 --- a/CppParser/src/Parser.cpp +++ b/CppParser/src/Parser.cpp @@ -1,7 +1,7 @@ // // Parser.cpp // -// $Id: //poco/1.4/CppParser/src/Parser.cpp#1 $ +// $Id: //poco/1.4/CppParser/src/Parser.cpp#2 $ // // Library: CppParser // Package: CppParser @@ -151,11 +151,13 @@ inline void Parser::append(std::string& decl, const std::string& token) } decl.append(token); if (token == "const" + || token == "constexpr" || token == "static" || token == "mutable" || token == "inline" || token == "volatile" - || token == "register") + || token == "register" + || token == "thread_local") decl.append(" "); } @@ -300,6 +302,12 @@ const Token* Parser::parseClass(const Token* pNext, std::string& decl) else syntaxError("class/struct name"); pNext = next(); + bool isFinal = false; + if (isIdentifier(pNext) && pNext->asString() == "final") + { + pNext = next(); + isFinal = true; + } if (!isOperator(pNext, OperatorToken::OP_SEMICOLON)) { // if we have a template specialization the next token will be a < @@ -320,6 +328,7 @@ const Token* Parser::parseClass(const Token* pNext, std::string& decl) if (isOperator(pNext, OperatorToken::OP_COLON) || isOperator(pNext, OperatorToken::OP_OPENBRACE)) { Struct* pClass = new Struct(decl, isClass, currentNameSpace()); + if (isFinal) pClass->makeFinal(); pushNameSpace(pClass, line); _access = access; if (isOperator(pNext, OperatorToken::OP_COLON)) @@ -632,22 +641,44 @@ const Token* Parser::parseFunc(const Token* pNext, std::string& decl) pNext = parseParameters(pNext, pFunc); expectOperator(pNext, OperatorToken::OP_CLOSPARENT, ")"); pNext = next(); - if (isKeyword(pNext, IdentifierToken::KW_CONST)) - { - if (pFunc) pFunc->makeConst(); - pNext = next(); - } - if (isKeyword(pNext, IdentifierToken::KW_THROW)) - { - while (!isOperator(pNext, OperatorToken::OP_ASSIGN) && !isOperator(pNext, OperatorToken::OP_SEMICOLON) && - !isOperator(pNext, OperatorToken::OP_OPENBRACE) && !isEOF(pNext)) + while (pNext->is(Poco::Token::IDENTIFIER_TOKEN) || pNext->is(Poco::Token::KEYWORD_TOKEN)) + { + if (isKeyword(pNext, IdentifierToken::KW_CONST)) + { + if (pFunc) pFunc->makeConst(); pNext = next(); + } + if (isKeyword(pNext, IdentifierToken::KW_THROW)) + { + while (!isOperator(pNext, OperatorToken::OP_ASSIGN) && !isOperator(pNext, OperatorToken::OP_SEMICOLON) && + !isOperator(pNext, OperatorToken::OP_OPENBRACE) && !isEOF(pNext)) + pNext = next(); + } + else if (isKeyword(pNext, IdentifierToken::KW_NOEXCEPT)) + { + if (pFunc) pFunc->makeNoexcept(); + pNext = next(); + } + else if (isIdentifier(pNext) && pNext->asString() == "override") + { + if (pFunc) pFunc->makeOverride(); + pNext = next(); + } + else if (isIdentifier(pNext) && pNext->asString() == "final") + { + if (pFunc) pFunc->makeFinal(); + pNext = next(); + } } if (isOperator(pNext, OperatorToken::OP_ASSIGN)) { pNext = next(); - if (!pNext->is(Token::INTEGER_LITERAL_TOKEN)) - syntaxError("0"); + if (!pNext->is(Token::INTEGER_LITERAL_TOKEN) && !isKeyword(pNext, IdentifierToken::KW_DEFAULT) && !isKeyword(pNext, IdentifierToken::KW_DELETE)) + syntaxError("0, default or delete"); + if (isKeyword(pNext, IdentifierToken::KW_DEFAULT)) + pFunc->makeDefault(); + else if (isKeyword(pNext, IdentifierToken::KW_DELETE)) + pFunc->makeDelete(); pNext = next(); if (pFunc) pFunc->makePureVirtual(); expectOperator(pNext, OperatorToken::OP_SEMICOLON, ";"); From 78c69b91443363103f153e5eb0b7c59e05c330b1 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 17 Nov 2012 10:06:20 +0100 Subject: [PATCH 047/165] added support for new C++11 keywords and features to CppParser and PocoDoc --- CppParser/include/Poco/CppParser/CppToken.h | 14 ++++- CppParser/include/Poco/CppParser/Function.h | 34 +++++++++--- CppParser/include/Poco/CppParser/Struct.h | 23 ++++++++- CppParser/src/CppToken.cpp | 12 ++++- CppParser/src/Function.cpp | 32 +++++++++++- CppParser/src/Parser.cpp | 57 ++++++++++++++++----- PocoDoc/src/DocWriter.cpp | 14 +++-- 7 files changed, 157 insertions(+), 29 deletions(-) diff --git a/CppParser/include/Poco/CppParser/CppToken.h b/CppParser/include/Poco/CppParser/CppToken.h index c4e7e4566..ed57c5f2e 100644 --- a/CppParser/include/Poco/CppParser/CppToken.h +++ b/CppParser/include/Poco/CppParser/CppToken.h @@ -1,7 +1,7 @@ // // CppToken.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/CppToken.h#1 $ +// $Id: //poco/1.4/CppParser/include/Poco/CppParser/CppToken.h#2 $ // // Library: CppParser // Package: CppParser @@ -134,7 +134,9 @@ class CppParser_API IdentifierToken: public CppToken public: enum Keywords { - KW_AND = 1, + KW_ALIGNAS = 1, + KW_ALIGNOF, + KW_AND, KW_AND_EQ, KW_ASM, KW_AUTO, @@ -145,11 +147,15 @@ public: KW_CASE, KW_CATCH, KW_CHAR, + KW_CHAR_16T, + KW_CHAR_32T, KW_CLASS, KW_COMPL, KW_CONST, + KW_CONSTEXPR, KW_CONST_CAST, KW_CONTINUE, + KW_DECLTYPE, KW_DEFAULT, KW_DELETE, KW_DO, @@ -172,8 +178,10 @@ public: KW_MUTABLE, KW_NAMESPACE, KW_NEW, + KW_NOEXCEPT, KW_NOT, KW_NOT_EQ, + KW_NULLPTR, KW_OPERATOR, KW_OR, KW_OR_EQ, @@ -187,11 +195,13 @@ public: KW_SIGNED, KW_SIZEOF, KW_STATIC, + KW_STATIC_ASSERT, KW_STATIC_CAST, KW_STRUCT, KW_SWITCH, KW_TEMPLATE, KW_THIS, + KW_THREAD_LOCAL, KW_THROW, KW_TRUE, KW_TRY, diff --git a/CppParser/include/Poco/CppParser/Function.h b/CppParser/include/Poco/CppParser/Function.h index 2f95015ac..b390086d2 100644 --- a/CppParser/include/Poco/CppParser/Function.h +++ b/CppParser/include/Poco/CppParser/Function.h @@ -1,7 +1,7 @@ // // Function.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Function.h#1 $ +// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Function.h#2 $ // // Library: CppParser // Package: SymbolTable @@ -58,12 +58,17 @@ class CppParser_API Function: public Decl public: enum Flags { - FN_STATIC = 1, /// The function is static. - FN_VIRTUAL = 2, /// The function is virtual. - FN_INLINE = 4, /// The function is inline. - FN_CONST = 8, /// The function is const. - FN_TEMPLATE = 16, /// The function is a template. - FN_PURE_VIRTUAL = 32 /// The function is pure virtual. + FN_STATIC = 1, /// The function is static. + FN_VIRTUAL = 2, /// The function is virtual. + FN_INLINE = 4, /// The function is inline. + FN_CONST = 8, /// The function is const. + FN_TEMPLATE = 16, /// The function is a template. + FN_PURE_VIRTUAL = 32, /// The function is pure virtual. + FN_FINAL = 64, /// The function is final. + FN_OVERRIDE = 128, /// The function is override. + FN_NOEXCEPT = 256, /// The function is noexcept. + FN_DEFAULT = 512, /// The function is default. + FN_DELETE = 1024 /// The function has been deleted. }; typedef std::vector Parameters; @@ -94,6 +99,21 @@ public: void makePureVirtual(); /// Sets the FN_PURE_VIRTUAL flag. + + void makeFinal(); + /// Sets the FN_FINAL flag. + + void makeOverride(); + /// Sets the FN_OVERRIDE flag. + + void makeNoexcept(); + /// Sets the FN_NOEXCEPT flag. + + void makeDefault(); + /// Sets the FN_DEFAULT flag. + + void makeDelete(); + /// Sets the FN_DELETE flag. int flags() const; /// Returns the function's flags. diff --git a/CppParser/include/Poco/CppParser/Struct.h b/CppParser/include/Poco/CppParser/Struct.h index 34ea06adb..bda5c6498 100644 --- a/CppParser/include/Poco/CppParser/Struct.h +++ b/CppParser/include/Poco/CppParser/Struct.h @@ -1,7 +1,7 @@ // // Struct.h // -// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Struct.h#1 $ +// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Struct.h#2 $ // // Library: CppParser // Package: SymbolTable @@ -61,7 +61,8 @@ public: { FN_TEMPLATE = 1, FN_INLINE = 2, // when the whole class is inlined in a c++ file - FN_TEMPLATE_SPECIALIZATION = 4 + FN_TEMPLATE_SPECIALIZATION = 4, + FN_FINAL = 8 }; struct Base @@ -115,10 +116,16 @@ public: void makeInline(); /// Changes the class to a inline class, i.e. definition and implementation are hidden in a cpp file. + + void makeFinal(); + /// Makes the class final. bool isInline() const; /// Returns true if the complete class is inlined in a cpp file. + bool isFinal() const; + /// Returns true if the class is final. + void constructors(Functions& functions) const; /// Returns all constructors, sorted by their parameter count. @@ -190,12 +197,24 @@ inline void Struct::makeInline() } +inline void Struct::makeFinal() +{ + _flags |= FN_FINAL; +} + + inline bool Struct::isInline() const { return (_flags & FN_INLINE) != 0; } +inline bool Struct::isFinal() const +{ + return (_flags & FN_FINAL) != 0; +} + + inline bool Struct::isDerived() const { return !_bases.empty(); diff --git a/CppParser/src/CppToken.cpp b/CppParser/src/CppToken.cpp index 4ba0b053b..ee82e7ffe 100644 --- a/CppParser/src/CppToken.cpp +++ b/CppParser/src/CppToken.cpp @@ -1,7 +1,7 @@ // // CppToken.cpp // -// $Id: //poco/1.4/CppParser/src/CppToken.cpp#2 $ +// $Id: //poco/1.4/CppParser/src/CppToken.cpp#3 $ // // Library: CppParser // Package: CppParser @@ -254,6 +254,8 @@ int OperatorToken::asInteger() const IdentifierToken::IdentifierToken() { int i = 1; + _kwMap["alignas"] = i++; + _kwMap["alignof"] = i++; _kwMap["and"] = i++; _kwMap["and_eq"] = i++; _kwMap["asm"] = i++; @@ -265,11 +267,15 @@ IdentifierToken::IdentifierToken() _kwMap["case"] = i++; _kwMap["catch"] = i++; _kwMap["char"] = i++; + _kwMap["char16_t"] = i++; + _kwMap["char32_t"] = i++; _kwMap["class"] = i++; _kwMap["compl"] = i++; _kwMap["const"] = i++; + _kwMap["constexpr"] = i++; _kwMap["const_cast"] = i++; _kwMap["continue"] = i++; + _kwMap["decltype"] = i++; _kwMap["default"] = i++; _kwMap["delete"] = i++; _kwMap["do"] = i++; @@ -292,8 +298,10 @@ IdentifierToken::IdentifierToken() _kwMap["mutable"] = i++; _kwMap["namespace"] = i++; _kwMap["new"] = i++; + _kwMap["noexcept"] = i++; _kwMap["not"] = i++; _kwMap["not_eq"] = i++; + _kwMap["nullptr"] = i++; _kwMap["operator"] = i++; _kwMap["or"] = i++; _kwMap["or_eq"] = i++; @@ -307,11 +315,13 @@ IdentifierToken::IdentifierToken() _kwMap["signed"] = i++; _kwMap["sizeof"] = i++; _kwMap["static"] = i++; + _kwMap["static_assert"] = i++; _kwMap["static_cast"] = i++; _kwMap["struct"] = i++; _kwMap["switch"] = i++; _kwMap["template"] = i++; _kwMap["this"] = i++; + _kwMap["thread_local"] = i++; _kwMap["throw"] = i++; _kwMap["true"] = i++; _kwMap["try"] = i++; diff --git a/CppParser/src/Function.cpp b/CppParser/src/Function.cpp index be1976ef7..406863989 100644 --- a/CppParser/src/Function.cpp +++ b/CppParser/src/Function.cpp @@ -1,7 +1,7 @@ // // Function.cpp // -// $Id: //poco/1.4/CppParser/src/Function.cpp#1 $ +// $Id: //poco/1.4/CppParser/src/Function.cpp#2 $ // // Library: CppParser // Package: SymbolTable @@ -128,6 +128,36 @@ void Function::makePureVirtual() } +void Function::makeFinal() +{ + _flags |= FN_FINAL; +} + + +void Function::makeOverride() +{ + _flags |= FN_OVERRIDE; +} + + +void Function::makeNoexcept() +{ + _flags |= FN_NOEXCEPT; +} + + +void Function::makeDefault() +{ + _flags |= FN_DEFAULT; +} + + +void Function::makeDelete() +{ + _flags |= FN_DELETE; +} + + bool Function::isConstructor() const { return name() == nameSpace()->name(); diff --git a/CppParser/src/Parser.cpp b/CppParser/src/Parser.cpp index e4737b540..019a9ce16 100644 --- a/CppParser/src/Parser.cpp +++ b/CppParser/src/Parser.cpp @@ -1,7 +1,7 @@ // // Parser.cpp // -// $Id: //poco/1.4/CppParser/src/Parser.cpp#1 $ +// $Id: //poco/1.4/CppParser/src/Parser.cpp#2 $ // // Library: CppParser // Package: CppParser @@ -151,11 +151,13 @@ inline void Parser::append(std::string& decl, const std::string& token) } decl.append(token); if (token == "const" + || token == "constexpr" || token == "static" || token == "mutable" || token == "inline" || token == "volatile" - || token == "register") + || token == "register" + || token == "thread_local") decl.append(" "); } @@ -300,6 +302,12 @@ const Token* Parser::parseClass(const Token* pNext, std::string& decl) else syntaxError("class/struct name"); pNext = next(); + bool isFinal = false; + if (isIdentifier(pNext) && pNext->asString() == "final") + { + pNext = next(); + isFinal = true; + } if (!isOperator(pNext, OperatorToken::OP_SEMICOLON)) { // if we have a template specialization the next token will be a < @@ -320,6 +328,7 @@ const Token* Parser::parseClass(const Token* pNext, std::string& decl) if (isOperator(pNext, OperatorToken::OP_COLON) || isOperator(pNext, OperatorToken::OP_OPENBRACE)) { Struct* pClass = new Struct(decl, isClass, currentNameSpace()); + if (isFinal) pClass->makeFinal(); pushNameSpace(pClass, line); _access = access; if (isOperator(pNext, OperatorToken::OP_COLON)) @@ -632,22 +641,44 @@ const Token* Parser::parseFunc(const Token* pNext, std::string& decl) pNext = parseParameters(pNext, pFunc); expectOperator(pNext, OperatorToken::OP_CLOSPARENT, ")"); pNext = next(); - if (isKeyword(pNext, IdentifierToken::KW_CONST)) - { - if (pFunc) pFunc->makeConst(); - pNext = next(); - } - if (isKeyword(pNext, IdentifierToken::KW_THROW)) - { - while (!isOperator(pNext, OperatorToken::OP_ASSIGN) && !isOperator(pNext, OperatorToken::OP_SEMICOLON) && - !isOperator(pNext, OperatorToken::OP_OPENBRACE) && !isEOF(pNext)) + while (pNext->is(Poco::Token::IDENTIFIER_TOKEN) || pNext->is(Poco::Token::KEYWORD_TOKEN)) + { + if (isKeyword(pNext, IdentifierToken::KW_CONST)) + { + if (pFunc) pFunc->makeConst(); pNext = next(); + } + if (isKeyword(pNext, IdentifierToken::KW_THROW)) + { + while (!isOperator(pNext, OperatorToken::OP_ASSIGN) && !isOperator(pNext, OperatorToken::OP_SEMICOLON) && + !isOperator(pNext, OperatorToken::OP_OPENBRACE) && !isEOF(pNext)) + pNext = next(); + } + else if (isKeyword(pNext, IdentifierToken::KW_NOEXCEPT)) + { + if (pFunc) pFunc->makeNoexcept(); + pNext = next(); + } + else if (isIdentifier(pNext) && pNext->asString() == "override") + { + if (pFunc) pFunc->makeOverride(); + pNext = next(); + } + else if (isIdentifier(pNext) && pNext->asString() == "final") + { + if (pFunc) pFunc->makeFinal(); + pNext = next(); + } } if (isOperator(pNext, OperatorToken::OP_ASSIGN)) { pNext = next(); - if (!pNext->is(Token::INTEGER_LITERAL_TOKEN)) - syntaxError("0"); + if (!pNext->is(Token::INTEGER_LITERAL_TOKEN) && !isKeyword(pNext, IdentifierToken::KW_DEFAULT) && !isKeyword(pNext, IdentifierToken::KW_DELETE)) + syntaxError("0, default or delete"); + if (isKeyword(pNext, IdentifierToken::KW_DEFAULT)) + pFunc->makeDefault(); + else if (isKeyword(pNext, IdentifierToken::KW_DELETE)) + pFunc->makeDelete(); pNext = next(); if (pFunc) pFunc->makePureVirtual(); expectOperator(pNext, OperatorToken::OP_SEMICOLON, ";"); diff --git a/PocoDoc/src/DocWriter.cpp b/PocoDoc/src/DocWriter.cpp index beda4f55b..ad2f6c32d 100644 --- a/PocoDoc/src/DocWriter.cpp +++ b/PocoDoc/src/DocWriter.cpp @@ -1,7 +1,7 @@ // // DocWriter.cpp // -// $Id: //poco/1.4/PocoDoc/src/DocWriter.cpp#1 $ +// $Id: //poco/1.4/PocoDoc/src/DocWriter.cpp#3 $ // // Copyright (c) 2005-2009, Applied Informatics Software Engineering GmbH. // and Contributors. @@ -512,7 +512,7 @@ void DocWriter::writeClass(const Struct* pStruct) header += tr("Struct") + " "; header += pStruct->fullName(); writeHeader(ostr, header); - writeTitle(ostr, pStruct->nameSpace(), pStruct->declaration()); + writeTitle(ostr, pStruct->nameSpace(), pStruct->declaration() + (pStruct->isFinal() ? " final" : "")); beginBody(ostr); writeFileInfo(ostr, pStruct); const std::string& doc = pStruct->getDocumentation(); @@ -1852,7 +1852,15 @@ void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc) ostr << ")"; if (pFunc->flags() & Function::FN_CONST) ostr << " const"; - if (pFunc->flags() & Function::FN_PURE_VIRTUAL) + if (pFunc->flags() & Function::FN_OVERRIDE) + ostr << " override"; + else if (pFunc->flags() & Function::FN_FINAL) + ostr << " final"; + if (pFunc->flags() & Function::FN_DELETE) + ostr << " = delete"; + else if (pFunc->flags() & Function::FN_DEFAULT) + ostr << " = default"; + else if (pFunc->flags() & Function::FN_PURE_VIRTUAL) ostr << " = 0"; ostr << ";

\n"; From 2cc47b5c02608265032f9db91a220422d31e5946 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 18 Nov 2012 23:00:55 +0100 Subject: [PATCH 048/165] on Windows, quote the path passed to the compiler --- CppParser/src/Utility.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CppParser/src/Utility.cpp b/CppParser/src/Utility.cpp index 68c22a839..8158bfbf7 100644 --- a/CppParser/src/Utility.cpp +++ b/CppParser/src/Utility.cpp @@ -1,7 +1,7 @@ // // Utility.cpp // -// $Id: //poco/1.4/CppParser/src/Utility.cpp#2 $ +// $Id: //poco/1.4/CppParser/src/Utility.cpp#3 $ // // Library: CppParser // Package: CppParser @@ -202,8 +202,14 @@ std::string Utility::preprocessFile(const std::string& file, const std::string& } StringTokenizer tokenizer(popts, ",;\n", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM); std::vector args(tokenizer.begin(), tokenizer.end()); +#ifdef _WIN32 + std::string quotedFile("\""); + quotedFile += file; + quotedFile += "\""; + args.push_back(quotedFile); +#else args.push_back(file); - +#endif if (!path.empty()) { std::string newPath(Environment::get("PATH")); From 6092a233d374b89375fa5cd7a5011a201a44962b Mon Sep 17 00:00:00 2001 From: Patrick White Date: Wed, 28 Nov 2012 14:48:50 -0500 Subject: [PATCH 049/165] Add cmakefiles to gitignore, and remove Route.cpp from cmake file. --- .gitignore | 9 +++++++++ Net/CMakeLists.txt | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 06934adf1..6f906e7ff 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,15 @@ config.build config.make +# CMake # +######## +cmake_install.cmake +cmake_uninstall.cmake +CMakeFiles +CMakeCache.txt +CPackConfig.cmake +CPackSourceConfig.cmake + # Packages # ############ # it's better to unpack these files and commit the raw source diff --git a/Net/CMakeLists.txt b/Net/CMakeLists.txt index a65082a41..4926ef54a 100644 --- a/Net/CMakeLists.txt +++ b/Net/CMakeLists.txt @@ -71,7 +71,6 @@ set( BASE_SRCS src/RawSocketImpl.cpp src/RemoteSyslogChannel.cpp src/RemoteSyslogListener.cpp - src/Route.cpp src/ServerSocket.cpp src/ServerSocketImpl.cpp src/SMTPChannel.cpp From 180ad81cb39a3fcff563a11f5f6fda553ab6094e Mon Sep 17 00:00:00 2001 From: Patrick White Date: Wed, 28 Nov 2012 15:03:56 -0500 Subject: [PATCH 050/165] Comment out unused function parameters to prevent compiler warnings in client code. --- Foundation/include/Poco/Dynamic/VarHolder.h | 38 ++++++++++----------- JSON/include/Poco/JSON/Array.h | 6 ++-- JSON/include/Poco/JSON/Object.h | 6 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Foundation/include/Poco/Dynamic/VarHolder.h b/Foundation/include/Poco/Dynamic/VarHolder.h index a5634eddb..52a96b193 100644 --- a/Foundation/include/Poco/Dynamic/VarHolder.h +++ b/Foundation/include/Poco/Dynamic/VarHolder.h @@ -349,67 +349,67 @@ inline const std::type_info& VarHolder::type() const throw NotImplementedException("Not implemented: VarHolder::type()"); } -inline void VarHolder::convert(Int8& val) const +inline void VarHolder::convert(Int8& /*val*/) const { throw BadCastException("Can not convert to Int8"); } -inline void VarHolder::convert(Int16& val) const +inline void VarHolder::convert(Int16& /*val*/) const { throw BadCastException("Can not convert to Int16"); } -inline void VarHolder::convert(Int32& val) const +inline void VarHolder::convert(Int32& /*val*/) const { throw BadCastException("Can not convert to Int32"); } -inline void VarHolder::convert(Int64& val) const +inline void VarHolder::convert(Int64& /*val*/) const { throw BadCastException("Can not convert to Int64"); } -inline void VarHolder::convert(UInt8& val) const +inline void VarHolder::convert(UInt8& /*val*/) const { throw BadCastException("Can not convert to UInt8"); } -inline void VarHolder::convert(UInt16& val) const +inline void VarHolder::convert(UInt16& /*val*/) const { throw BadCastException("Can not convert to UInt16"); } -inline void VarHolder::convert(UInt32& val) const +inline void VarHolder::convert(UInt32& /*val*/) const { throw BadCastException("Can not convert to UInt32"); } -inline void VarHolder::convert(UInt64& val) const +inline void VarHolder::convert(UInt64& /*val*/) const { throw BadCastException("Can not convert to UInt64"); } -inline void VarHolder::convert(DateTime& val) const +inline void VarHolder::convert(DateTime& /*val*/) const { throw BadCastException("Can not convert to DateTime"); } -inline void VarHolder::convert(LocalDateTime& val) const +inline void VarHolder::convert(LocalDateTime& /*val*/) const { throw BadCastException("Can not convert to LocalDateTime"); } -inline void VarHolder::convert(Timestamp& val) const +inline void VarHolder::convert(Timestamp& /*val*/) const { throw BadCastException("Can not convert to Timestamp"); } @@ -433,31 +433,31 @@ inline void VarHolder::convert(unsigned long& val) const #endif -inline void VarHolder::convert(bool& val) const +inline void VarHolder::convert(bool& /*val*/) const { throw BadCastException("Can not convert to bool"); } -inline void VarHolder::convert(float& val) const +inline void VarHolder::convert(float& /*val*/) const { throw BadCastException("Can not convert to float"); } -inline void VarHolder::convert(double& val) const +inline void VarHolder::convert(double& /*val*/) const { throw BadCastException("Can not convert to double"); } -inline void VarHolder::convert(char& val) const +inline void VarHolder::convert(char& /*val*/) const { throw BadCastException("Can not convert to char"); } -inline void VarHolder::convert(std::string& val) const +inline void VarHolder::convert(std::string& /*val*/) const { throw BadCastException("Can not convert to std::string"); } @@ -2754,17 +2754,17 @@ public: return typeid(DateTime); } - void convert(Int8& val) const + void convert(Int8& /*val*/) const { throw BadCastException(); } - void convert(Int16& val) const + void convert(Int16& /*val*/) const { throw BadCastException(); } - void convert(Int32& val) const + void convert(Int32& /*val*/) const { throw BadCastException(); } diff --git a/JSON/include/Poco/JSON/Array.h b/JSON/include/Poco/JSON/Array.h index a68e27ead..d1836c52d 100644 --- a/JSON/include/Poco/JSON/Array.h +++ b/JSON/include/Poco/JSON/Array.h @@ -285,17 +285,17 @@ public: s = oss.str(); } - void convert(DateTime& val) const + void convert(DateTime& /*val*/) const { throw BadCastException(); } - void convert(LocalDateTime& ldt) const + void convert(LocalDateTime& /*ldt*/) const { throw BadCastException(); } - void convert(Timestamp& ts) const + void convert(Timestamp& /*ts*/) const { throw BadCastException(); } diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h index 0b243aa0f..37288e1cf 100644 --- a/JSON/include/Poco/JSON/Object.h +++ b/JSON/include/Poco/JSON/Object.h @@ -289,17 +289,17 @@ public: s = oss.str(); } - void convert(DateTime& val) const + void convert(DateTime& /*val*/) const { //TODO: val = _val; } - void convert(LocalDateTime& ldt) const + void convert(LocalDateTime& /*ldt*/) const { //TODO: ldt = _val.timestamp(); } - void convert(Timestamp& ts) const + void convert(Timestamp& /*ts*/) const { //TODO: ts = _val.timestamp(); } From b4aa3cedfaefd86358cc08c7952ffaf2574dd989 Mon Sep 17 00:00:00 2001 From: Patrick White Date: Wed, 28 Nov 2012 15:09:10 -0500 Subject: [PATCH 051/165] PatternFormatter specific-length source and optimizations. Optimize the pattern formatter by doing time-zone calculations once and using it's offset. Parse the format string once and setup a vector of the fields wanted so parsing the %[name] is much faster. Add ability to easily enforce a specific length for the source fields which is nicer for reading log files. --- Foundation/include/Poco/PatternFormatter.h | 25 +++- Foundation/src/PatternFormatter.cpp | 159 ++++++++++++++------- 2 files changed, 131 insertions(+), 53 deletions(-) diff --git a/Foundation/include/Poco/PatternFormatter.h b/Foundation/include/Poco/PatternFormatter.h index 9f19ff294..6f7e75c11 100644 --- a/Foundation/include/Poco/PatternFormatter.h +++ b/Foundation/include/Poco/PatternFormatter.h @@ -44,6 +44,7 @@ #include "Poco/Formatter.h" #include "Poco/Message.h" +#include namespace Poco { @@ -91,6 +92,7 @@ class Foundation_API PatternFormatter: public Formatter /// * %z - time zone differential in ISO 8601 format (Z or +NN.NN) /// * %Z - time zone differential in RFC format (GMT or +NNNN) /// * %E - epoch time (UTC, seconds since midnight, January 1, 1970) + /// * %v[width] - the message source (%s) but text length is padded/cropped to 'width' /// * %[name] - the value of the message parameter with the given name /// * %% - percent sign @@ -138,8 +140,27 @@ protected: /// Returns a string for the given priority value. private: - bool _localTime; - std::string _pattern; + + struct PatternAction + { + PatternAction(): key(0), length(0) {} + + char key; + int length; + std::string property; + std::string prepend; + }; + + std::vector _patternActions; + bool _localTime; + Timestamp::TimeDiff _localTimeOffset; + std::string _pattern; + + + void ParsePattern(); + /// Will parse the _pattern string into the vector of PatternActions, + /// which contains the message key, any text that needs to be written first + /// a proprety in case of %[] and required length. }; diff --git a/Foundation/src/PatternFormatter.cpp b/Foundation/src/PatternFormatter.cpp index d8b9d66bf..71748f413 100644 --- a/Foundation/src/PatternFormatter.cpp +++ b/Foundation/src/PatternFormatter.cpp @@ -43,6 +43,7 @@ #include "Poco/Timestamp.h" #include "Poco/Timezone.h" #include "Poco/Environment.h" +#include "Poco/NumberParser.h" namespace Poco { @@ -53,15 +54,18 @@ const std::string PatternFormatter::PROP_TIMES = "times"; PatternFormatter::PatternFormatter(): - _localTime(false) + _localTime(false), + _localTimeOffset(0) { } PatternFormatter::PatternFormatter(const std::string& format): _localTime(false), + _localTimeOffset(0), _pattern(format) { + ParsePattern(); } @@ -75,86 +79,139 @@ void PatternFormatter::format(const Message& msg, std::string& text) Timestamp timestamp = msg.getTime(); if (_localTime) { - timestamp += Timezone::utcOffset()*Timestamp::resolution(); - timestamp += Timezone::dst()*Timestamp::resolution(); + timestamp += _localTimeOffset; } DateTime dateTime = timestamp; + for (std::vector::iterator ip = _patternActions.begin(); ip != _patternActions.end(); ++ip) + { + text.append(ip->prepend); + switch (ip->key) + { + case 's': text.append(msg.getSource()); break; + case 't': text.append(msg.getText()); break; + case 'l': NumberFormatter::append(text, (int) msg.getPriority()); break; + case 'p': text.append(getPriorityName((int) msg.getPriority())); break; + case 'q': text += getPriorityName((int) msg.getPriority()).at(0); break; + case 'P': NumberFormatter::append(text, msg.getPid()); break; + case 'T': text.append(msg.getThread()); break; + case 'I': NumberFormatter::append(text, msg.getTid()); break; + case 'N': text.append(Environment::nodeName()); break; + case 'U': text.append(msg.getSourceFile() ? msg.getSourceFile() : ""); break; + case 'u': NumberFormatter::append(text, msg.getSourceLine()); break; + case 'w': text.append(DateTimeFormat::WEEKDAY_NAMES[dateTime.dayOfWeek()], 0, 3); break; + case 'W': text.append(DateTimeFormat::WEEKDAY_NAMES[dateTime.dayOfWeek()]); break; + case 'b': text.append(DateTimeFormat::MONTH_NAMES[dateTime.month() - 1], 0, 3); break; + case 'B': text.append(DateTimeFormat::MONTH_NAMES[dateTime.month() - 1]); break; + case 'd': NumberFormatter::append0(text, dateTime.day(), 2); break; + case 'e': NumberFormatter::append(text, dateTime.day()); break; + case 'f': NumberFormatter::append(text, dateTime.day(), 2); break; + case 'm': NumberFormatter::append0(text, dateTime.month(), 2); break; + case 'n': NumberFormatter::append(text, dateTime.month()); break; + case 'o': NumberFormatter::append(text, dateTime.month(), 2); break; + case 'y': NumberFormatter::append0(text, dateTime.year() % 100, 2); break; + case 'Y': NumberFormatter::append0(text, dateTime.year(), 4); break; + case 'H': NumberFormatter::append0(text, dateTime.hour(), 2); break; + case 'h': NumberFormatter::append0(text, dateTime.hourAMPM(), 2); break; + case 'a': text.append(dateTime.isAM() ? "am" : "pm"); break; + case 'A': text.append(dateTime.isAM() ? "AM" : "PM"); break; + case 'M': NumberFormatter::append0(text, dateTime.minute(), 2); break; + case 'S': NumberFormatter::append0(text, dateTime.second(), 2); break; + case 'i': NumberFormatter::append0(text, dateTime.millisecond(), 3); break; + case 'c': NumberFormatter::append(text, dateTime.millisecond()/100); break; + case 'F': NumberFormatter::append0(text, dateTime.millisecond()*1000 + dateTime.microsecond(), 6); break; + case 'z': text.append(DateTimeFormatter::tzdISO(_localTime ? Timezone::tzd() : DateTimeFormatter::UTC)); break; + case 'Z': text.append(DateTimeFormatter::tzdRFC(_localTime ? Timezone::tzd() : DateTimeFormatter::UTC)); break; + case 'E': NumberFormatter::append(text, msg.getTime().epochTime()); break; + case 'v': + if (ip->length > msg.getSource().length()) //append spaces + text.append(msg.getSource()).append(ip->length - msg.getSource().length(), ' '); + else if (ip->length && ip->length < msg.getSource().length()) // crop + text.append(msg.getSource(), msg.getSource().length()-ip->length, ip->length); + else + text.append(msg.getSource()); + break; + case 'x': + try + { + text.append(msg[ip->property]); + } + catch (...) + { + } + break; + } + } +} + +void PatternFormatter::ParsePattern() +{ + _patternActions.clear(); std::string::const_iterator it = _pattern.begin(); std::string::const_iterator end = _pattern.end(); + PatternAction end_act; while (it != end) { if (*it == '%') { if (++it != end) { - switch (*it) - { - case 's': text.append(msg.getSource()); break; - case 't': text.append(msg.getText()); break; - case 'l': NumberFormatter::append(text, (int) msg.getPriority()); break; - case 'p': text.append(getPriorityName((int) msg.getPriority())); break; - case 'q': text += getPriorityName((int) msg.getPriority()).at(0); break; - case 'P': NumberFormatter::append(text, msg.getPid()); break; - case 'T': text.append(msg.getThread()); break; - case 'I': NumberFormatter::append(text, msg.getTid()); break; - case 'N': text.append(Environment::nodeName()); break; - case 'U': text.append(msg.getSourceFile() ? msg.getSourceFile() : ""); break; - case 'u': NumberFormatter::append(text, msg.getSourceLine()); break; - case 'w': text.append(DateTimeFormat::WEEKDAY_NAMES[dateTime.dayOfWeek()], 0, 3); break; - case 'W': text.append(DateTimeFormat::WEEKDAY_NAMES[dateTime.dayOfWeek()]); break; - case 'b': text.append(DateTimeFormat::MONTH_NAMES[dateTime.month() - 1], 0, 3); break; - case 'B': text.append(DateTimeFormat::MONTH_NAMES[dateTime.month() - 1]); break; - case 'd': NumberFormatter::append0(text, dateTime.day(), 2); break; - case 'e': NumberFormatter::append(text, dateTime.day()); break; - case 'f': NumberFormatter::append(text, dateTime.day(), 2); break; - case 'm': NumberFormatter::append0(text, dateTime.month(), 2); break; - case 'n': NumberFormatter::append(text, dateTime.month()); break; - case 'o': NumberFormatter::append(text, dateTime.month(), 2); break; - case 'y': NumberFormatter::append0(text, dateTime.year() % 100, 2); break; - case 'Y': NumberFormatter::append0(text, dateTime.year(), 4); break; - case 'H': NumberFormatter::append0(text, dateTime.hour(), 2); break; - case 'h': NumberFormatter::append0(text, dateTime.hourAMPM(), 2); break; - case 'a': text.append(dateTime.isAM() ? "am" : "pm"); break; - case 'A': text.append(dateTime.isAM() ? "AM" : "PM"); break; - case 'M': NumberFormatter::append0(text, dateTime.minute(), 2); break; - case 'S': NumberFormatter::append0(text, dateTime.second(), 2); break; - case 'i': NumberFormatter::append0(text, dateTime.millisecond(), 3); break; - case 'c': NumberFormatter::append(text, dateTime.millisecond()/100); break; - case 'F': NumberFormatter::append0(text, dateTime.millisecond()*1000 + dateTime.microsecond(), 6); break; - case 'z': text.append(DateTimeFormatter::tzdISO(_localTime ? Timezone::tzd() : DateTimeFormatter::UTC)); break; - case 'Z': text.append(DateTimeFormatter::tzdRFC(_localTime ? Timezone::tzd() : DateTimeFormatter::UTC)); break; - case 'E': NumberFormatter::append(text, msg.getTime().epochTime()); break; - case '[': + PatternAction act; + act.prepend = end_act.prepend; + end_act.prepend.clear(); + + if(*it == '[') { + act.key='x'; ++it; std::string prop; while (it != end && *it != ']') prop += *it++; if (it == end) --it; - try - { - text.append(msg[prop]); - } - catch (...) - { - } - break; + act.property = prop; } - default: text += *it; + else + { + act.key=*it; + if ((it+1) != end && *(it+1) == '[') + { + it+=2; + std::string number; + while (it != end && *it != ']') number += *it++; + if (it == end) --it; + try + { + act.length = NumberParser::parse(number); + } + catch(...) + { + } + } } + _patternActions.push_back(act); ++it; } } - else text += *it++; + else + { + end_act.prepend += *it++; + } } + if( end_act.prepend.size()) + _patternActions.push_back(end_act); } void PatternFormatter::setProperty(const std::string& name, const std::string& value) { if (name == PROP_PATTERN) + { _pattern = value; + ParsePattern(); + } else if (name == PROP_TIMES) + { _localTime = (value == "local"); + _localTimeOffset = Timestamp::resolution()*( Timezone::utcOffset() + Timezone::dst() ); + } else Formatter::setProperty(name, value); } From 9cd0f0b4f76947ce60aa0b9bc6217481868fad6f Mon Sep 17 00:00:00 2001 From: aleks-f Date: Thu, 22 Nov 2012 10:08:46 -0600 Subject: [PATCH 052/165] integer to string conversion replaced sprintf-based int-to-string functionality with built-in intToString --- Foundation/include/Poco/NumberFormatter.h | 139 +++++----- Foundation/include/Poco/NumericString.h | 177 ++++++++++++- Foundation/src/NumberFormatter.cpp | 246 +++++++++--------- .../testsuite/src/NumberFormatterTest.cpp | 48 ++++ Foundation/testsuite/src/NumberParserTest.cpp | 1 + Foundation/testsuite/src/StringTest.cpp | 104 ++++++++ Foundation/testsuite/src/StringTest.h | 2 + 7 files changed, 532 insertions(+), 185 deletions(-) diff --git a/Foundation/include/Poco/NumberFormatter.h b/Foundation/include/Poco/NumberFormatter.h index b3367a0a0..fd8cc8084 100644 --- a/Foundation/include/Poco/NumberFormatter.h +++ b/Foundation/include/Poco/NumberFormatter.h @@ -41,6 +41,7 @@ #include "Poco/Foundation.h" +#include "Poco/NumericString.h" namespace Poco { @@ -55,9 +56,6 @@ class Foundation_API NumberFormatter /// the formatted value. /// * append* functions append the formatted value to /// an existing string. - /// - /// Internally, std::sprintf() is used to do the actual - /// formatting. { public: enum BoolFormat @@ -67,6 +65,8 @@ public: FMT_ON_OFF }; + static const unsigned NF_MAX_NUM_STRING_SIZE = 32; + static std::string format(int value); /// Formats an integer value in decimal notation. @@ -80,14 +80,18 @@ public: /// right justified and zero-padded in a field /// having at least the specified width. - static std::string formatHex(int value); + static std::string formatHex(int value, bool prefix = false); /// Formats an int value in hexadecimal notation. + /// If prefix is true, "0x" prefix is prepended to the + /// resulting string. /// The value is treated as unsigned. - static std::string formatHex(int value, int width); + static std::string formatHex(int value, int width, bool prefix = false); /// Formats a int value in hexadecimal notation, /// right justified and zero-padded in /// a field having at least the specified width. + /// If prefix is true, "0x" prefix is prepended to the + /// resulting string. /// The value is treated as unsigned. static std::string format(unsigned value); @@ -103,13 +107,17 @@ public: /// right justified and zero-padded in a field having at /// least the specified width. - static std::string formatHex(unsigned value); + static std::string formatHex(unsigned value, bool prefix = false); /// Formats an unsigned int value in hexadecimal notation. + /// If prefix is true, "0x" prefix is prepended to the + /// resulting string. - static std::string formatHex(unsigned value, int width); + static std::string formatHex(unsigned value, int width, bool prefix = false); /// Formats a int value in hexadecimal notation, /// right justified and zero-padded in /// a field having at least the specified width. + /// If prefix is true, "0x" prefix is prepended to the + /// resulting string. static std::string format(long value); /// Formats a long value in decimal notation. @@ -124,14 +132,18 @@ public: /// right justified and zero-padded in a field /// having at least the specified width. - static std::string formatHex(long value); + static std::string formatHex(long value, bool prefix = false); /// Formats an unsigned long value in hexadecimal notation. + /// If prefix is true, "0x" prefix is prepended to the + /// resulting string. /// The value is treated as unsigned. - static std::string formatHex(long value, int width); + static std::string formatHex(long value, int width, bool prefix = false); /// Formats an unsigned long value in hexadecimal notation, /// right justified and zero-padded in a field having at least the /// specified width. + /// If prefix is true, "0x" prefix is prepended to the + /// resulting string. /// The value is treated as unsigned. static std::string format(unsigned long value); @@ -147,13 +159,17 @@ public: /// right justified and zero-padded /// in a field having at least the specified width. - static std::string formatHex(unsigned long value); + static std::string formatHex(unsigned long value, bool prefix = false); /// Formats an unsigned long value in hexadecimal notation. + /// If prefix is true, "0x" prefix is prepended to the + /// resulting string. - static std::string formatHex(unsigned long value, int width); + static std::string formatHex(unsigned long value, int width, bool prefix = false); /// Formats an unsigned long value in hexadecimal notation, /// right justified and zero-padded in a field having at least the /// specified width. + /// If prefix is true, "0x" prefix is prepended to the + /// resulting string. #if defined(POCO_HAVE_INT64) && !defined(POCO_LONG_IS_64_BIT) @@ -169,15 +185,18 @@ public: /// right justified and zero-padded in a field having at least /// the specified width. - static std::string formatHex(Int64 value); + static std::string formatHex(Int64 value, bool prefix = false); /// Formats a 64-bit integer value in hexadecimal notation. + /// If prefix is true, "0x" prefix is prepended to the + /// resulting string. /// The value is treated as unsigned. - static std::string formatHex(Int64 value, int width); + static std::string formatHex(Int64 value, int width, bool prefix = false); /// Formats a 64-bit integer value in hexadecimal notation, /// right justified and zero-padded in a field having at least /// the specified width. /// The value is treated as unsigned. + /// If prefix is true, "0x" prefix is prepended to the resulting string. static std::string format(UInt64 value); /// Formats an unsigned 64-bit integer value in decimal notation. @@ -191,13 +210,16 @@ public: /// right justified and zero-padded in a field having at least the /// specified width. - static std::string formatHex(UInt64 value); + static std::string formatHex(UInt64 value, bool prefix = false); /// Formats a 64-bit integer value in hexadecimal notation. + /// If prefix is true, "0x" prefix is prepended to the + /// resulting string. - static std::string formatHex(UInt64 value, int width); + static std::string formatHex(UInt64 value, int width, bool prefix = false); /// Formats a 64-bit integer value in hexadecimal notation, /// right justified and zero-padded in a field having at least - /// the specified width. + /// the specified width. If prefix is true, "0x" prefix is + /// prepended to the resulting string. #endif // defined(POCO_HAVE_INT64) && !defined(POCO_LONG_IS_64_BIT) @@ -388,10 +410,11 @@ public: // // inlines // + inline std::string NumberFormatter::format(int value) { std::string result; - append(result, value); + intToStr(value, 10, result); return result; } @@ -399,7 +422,7 @@ inline std::string NumberFormatter::format(int value) inline std::string NumberFormatter::format(int value, int width) { std::string result; - append(result, value, width); + intToStr(value, 10, result, false, width, ' '); return result; } @@ -407,23 +430,23 @@ inline std::string NumberFormatter::format(int value, int width) inline std::string NumberFormatter::format0(int value, int width) { std::string result; - append0(result, value, width); + intToStr(value, 10, result, false, width, '0'); return result; } -inline std::string NumberFormatter::formatHex(int value) +inline std::string NumberFormatter::formatHex(int value, bool prefix) { std::string result; - appendHex(result, value); + intToStr(value, 0x10, result, prefix); return result; } -inline std::string NumberFormatter::formatHex(int value, int width) +inline std::string NumberFormatter::formatHex(int value, int width, bool prefix) { std::string result; - appendHex(result, value, width); + intToStr(value, 0x10, result, prefix, width, '0'); return result; } @@ -431,7 +454,7 @@ inline std::string NumberFormatter::formatHex(int value, int width) inline std::string NumberFormatter::format(unsigned value) { std::string result; - append(result, value); + intToStr(value, 10, result); return result; } @@ -439,7 +462,7 @@ inline std::string NumberFormatter::format(unsigned value) inline std::string NumberFormatter::format(unsigned value, int width) { std::string result; - append(result, value, width); + intToStr(value, 10, result, false, width, ' '); return result; } @@ -447,23 +470,23 @@ inline std::string NumberFormatter::format(unsigned value, int width) inline std::string NumberFormatter::format0(unsigned int value, int width) { std::string result; - append0(result, value, width); + intToStr(value, 10, result, false, width, '0'); return result; } -inline std::string NumberFormatter::formatHex(unsigned value) +inline std::string NumberFormatter::formatHex(unsigned value, bool prefix) { std::string result; - appendHex(result, value); + intToStr(value, 0x10, result, prefix); return result; } -inline std::string NumberFormatter::formatHex(unsigned value, int width) +inline std::string NumberFormatter::formatHex(unsigned value, int width, bool prefix) { std::string result; - appendHex(result, value, width); + intToStr(value, 0x10, result, prefix, width, '0'); return result; } @@ -471,7 +494,7 @@ inline std::string NumberFormatter::formatHex(unsigned value, int width) inline std::string NumberFormatter::format(long value) { std::string result; - append(result, value); + intToStr(value, 10, result); return result; } @@ -479,7 +502,7 @@ inline std::string NumberFormatter::format(long value) inline std::string NumberFormatter::format(long value, int width) { std::string result; - append(result, value, width); + intToStr(value, 10, result, false, width, ' '); return result; } @@ -487,23 +510,23 @@ inline std::string NumberFormatter::format(long value, int width) inline std::string NumberFormatter::format0(long value, int width) { std::string result; - append0(result, value, width); + intToStr(value, 10, result, false, width, '0'); return result; } -inline std::string NumberFormatter::formatHex(long value) +inline std::string NumberFormatter::formatHex(long value, bool prefix) { std::string result; - appendHex(result, value); + intToStr(value, 0x10, result, prefix); return result; } -inline std::string NumberFormatter::formatHex(long value, int width) +inline std::string NumberFormatter::formatHex(long value, int width, bool prefix) { std::string result; - appendHex(result, value, width); + intToStr(value, 0x10, result, prefix, width, '0'); return result; } @@ -511,7 +534,7 @@ inline std::string NumberFormatter::formatHex(long value, int width) inline std::string NumberFormatter::format(unsigned long value) { std::string result; - append(result, value); + intToStr(value, 10, result); return result; } @@ -519,7 +542,7 @@ inline std::string NumberFormatter::format(unsigned long value) inline std::string NumberFormatter::format(unsigned long value, int width) { std::string result; - append(result, value, width); + intToStr(value, 10, result, false, width, ' '); return result; } @@ -527,23 +550,23 @@ inline std::string NumberFormatter::format(unsigned long value, int width) inline std::string NumberFormatter::format0(unsigned long value, int width) { std::string result; - append0(result, value, width); + intToStr(value, 10, result, false, width, '0'); return result; } -inline std::string NumberFormatter::formatHex(unsigned long value) +inline std::string NumberFormatter::formatHex(unsigned long value, bool prefix) { std::string result; - appendHex(result, value); + intToStr(value, 0x10, result, prefix); return result; } -inline std::string NumberFormatter::formatHex(unsigned long value, int width) +inline std::string NumberFormatter::formatHex(unsigned long value, int width, bool prefix) { std::string result; - appendHex(result, value, width); + intToStr(value, 0x10, result, prefix, width, '0'); return result; } @@ -554,7 +577,7 @@ inline std::string NumberFormatter::formatHex(unsigned long value, int width) inline std::string NumberFormatter::format(Int64 value) { std::string result; - append(result, value); + intToStr(value, 10, result); return result; } @@ -562,7 +585,7 @@ inline std::string NumberFormatter::format(Int64 value) inline std::string NumberFormatter::format(Int64 value, int width) { std::string result; - append(result, value, width); + intToStr(value, 10, result, false, width, ' '); return result; } @@ -570,23 +593,23 @@ inline std::string NumberFormatter::format(Int64 value, int width) inline std::string NumberFormatter::format0(Int64 value, int width) { std::string result; - append0(result, value, width); + intToStr(value, 10, result, false, width, '0'); return result; } -inline std::string NumberFormatter::formatHex(Int64 value) +inline std::string NumberFormatter::formatHex(Int64 value, bool prefix) { std::string result; - appendHex(result, value); + intToStr(value, 0x10, result, prefix); return result; } -inline std::string NumberFormatter::formatHex(Int64 value, int width) +inline std::string NumberFormatter::formatHex(Int64 value, int width, bool prefix) { std::string result; - appendHex(result, value, width); + intToStr(value, 0x10, result, prefix, width, '0'); return result; } @@ -594,7 +617,7 @@ inline std::string NumberFormatter::formatHex(Int64 value, int width) inline std::string NumberFormatter::format(UInt64 value) { std::string result; - append(result, value); + intToStr(value, 10, result); return result; } @@ -602,7 +625,7 @@ inline std::string NumberFormatter::format(UInt64 value) inline std::string NumberFormatter::format(UInt64 value, int width) { std::string result; - append(result, value, width); + intToStr(value, 10, result, false, width, ' '); return result; } @@ -610,23 +633,23 @@ inline std::string NumberFormatter::format(UInt64 value, int width) inline std::string NumberFormatter::format0(UInt64 value, int width) { std::string result; - append0(result, value, width); + intToStr(value, 10, result, false, width, '0'); return result; } -inline std::string NumberFormatter::formatHex(UInt64 value) +inline std::string NumberFormatter::formatHex(UInt64 value, bool prefix) { std::string result; - appendHex(result, value); + intToStr(value, 0x10, result, prefix); return result; } -inline std::string NumberFormatter::formatHex(UInt64 value, int width) +inline std::string NumberFormatter::formatHex(UInt64 value, int width, bool prefix) { std::string result; - appendHex(result, value, width); + intToStr(value, 0x10, result, prefix, width, '0'); return result; } diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h index dac2f87e6..b87609983 100644 --- a/Foundation/include/Poco/NumericString.h +++ b/Foundation/include/Poco/NumericString.h @@ -41,6 +41,7 @@ #include "Poco/Foundation.h" +#include "Poco/Buffer.h" #include "Poco/FPEnvironment.h" #ifdef min #undef min @@ -51,9 +52,11 @@ #include #include #if !defined(POCO_NO_LOCALE) -#include + #include #endif +#define POCO_MAX_NUM_STRING_LEN 65 + namespace Poco { @@ -82,6 +85,10 @@ inline char thousandSeparator() } +// +// String to Number Conversions +// + template bool strToInt(const char* pStr, I& result, short base, char thSep = ',') /// Converts zero-terminated character array to integer number; @@ -357,6 +364,174 @@ bool strToFloat (const std::string& s, F& result, char& eu = Impl::DUMMY_EXP_UND } +// +// Number to String Conversions +// + +namespace Impl { + + class Ptr + /// Utility char pointer wrapper class. + /// Class ensures increment/decrement remain within boundaries. + { + public: + Ptr(char* ptr, unsigned offset): _beg(ptr), _cur(ptr), _end(ptr + offset) + { + } + + char*& operator ++ () // prefix + { + check(_cur + 1); + return ++_cur; + } + + char* operator ++ (int) // postfix + { + check(_cur + 1); + char* tmp = _cur++; + return tmp; + } + + char*& operator -- () // prefix + { + check(_cur - 1); + return --_cur; + } + + char* operator -- (int) // postfix + { + check(_cur - 1); + char* tmp = _cur--; + return tmp; + } + + char*& operator += (int incr) + { + check(_cur + incr); + return _cur += incr; + } + + char*& operator -= (int decr) + { + check(_cur - decr); + return _cur -= decr; + } + + operator char* () const + { + return _cur; + } + + unsigned span() const + { + return _end - _beg; + } + + private: + void check(char* ptr) + { + if (ptr > _end) throw RangeException(); + } + + const char* _beg; + char* _cur; + const char* _end; +}; + +} // namespace Impl + + +template +bool intToStr(T value, + unsigned short base, + char* result, + unsigned& size, + bool prefix = false, + int width = -1, + char fill = ' ', + char thSep = 0) + /// Converts integer to string. Numeric bases from binary to hexadecimal are supported. + /// If width is non-zero, it pads the return value with fill character to the specified width. + /// When padding is zero character ('0'), it is prepended to the number itself; all other + /// paddings are prepended to the formatted result with minus sign or base prefix included + /// If prefix is true and base is octal or hexadecimal, respective prefix ('0' for octal, + /// "0x" for hexadecimal) is prepended. For all other bases, prefix argument is ignored. + /// Formatted string has at least [width] total length. +{ + if (base < 2 || base > 0x10) + { + *result = '\0'; + return false; + } + + Impl::Ptr ptr(result, size); + int thCount = 0; + T tmpVal; + do + { + tmpVal = value; + value /= base; + *ptr++ = "FEDCBA9876543210123456789ABCDEF"[15 + (tmpVal - value * base)]; + if (thSep && (base == 10) && (++thCount == 3)) + { + *ptr++ = thSep; + thCount = 0; + } + } while (value); + + if ('0' == fill) + { + if (tmpVal < 0) --width; + if (prefix && base == 010) --width; + if (prefix && base == 0x10) width -= 2; + while ((ptr - result) < width) *ptr++ = fill; + } + + if (prefix && base == 010) *ptr++ = '0'; + else if (prefix && base == 0x10) + { + *ptr++ = 'x'; + *ptr++ = '0'; + } + + if (tmpVal < 0) *ptr++ = '-'; + + if ('0' != fill) + { + while ((ptr - result) < width) *ptr++ = fill; + } + + size = ptr - result; + poco_assert_dbg (size <= ptr.span()); + poco_assert_dbg ((-1 == width) || (size >= width)); + *ptr-- = '\0'; + + char* ptrr = result; + char tmp; + while(ptrr < ptr) + { + tmp = *ptr; + *ptr-- = *ptrr; + *ptrr++ = tmp; + } + + return true; +} + + +template +bool intToStr (T number, unsigned short base, std::string& result, bool prefix = false, int width = -1, char fill = ' ', char thSep = 0) + /// Converts integer to string; This is a wrapper function, for details see see the + /// bool intToStr(T, unsigned short, char*, int, int, char, char) implementation. +{ + char res[POCO_MAX_NUM_STRING_LEN] = {0}; + unsigned size = POCO_MAX_NUM_STRING_LEN; + bool ret = intToStr(number, base, res, size, prefix, width, fill, thSep); + result.assign(res, size); + return ret; +} + + } // namespace Poco diff --git a/Foundation/src/NumberFormatter.cpp b/Foundation/src/NumberFormatter.cpp index 076e13e61..00d9185cb 100644 --- a/Foundation/src/NumberFormatter.cpp +++ b/Foundation/src/NumberFormatter.cpp @@ -78,185 +78,181 @@ std::string NumberFormatter::format(bool value, BoolFormat format) void NumberFormatter::append(std::string& str, int value) { - char buffer[64]; - std::sprintf(buffer, "%d", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz); + str.append(result, sz); } void NumberFormatter::append(std::string& str, int value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%*d", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width); + str.append(result, sz); } void NumberFormatter::append0(std::string& str, int value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*d", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, int value) { - char buffer[64]; - std::sprintf(buffer, "%X", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, int value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*X", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::append(std::string& str, unsigned value) { - char buffer[64]; - std::sprintf(buffer, "%u", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz); + str.append(result, sz); } void NumberFormatter::append(std::string& str, unsigned value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%*u", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width); + str.append(result, sz); } void NumberFormatter::append0(std::string& str, unsigned int value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*u", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, unsigned value) { - char buffer[64]; - std::sprintf(buffer, "%X", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, unsigned value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*X", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::append(std::string& str, long value) { - char buffer[64]; - std::sprintf(buffer, "%ld", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz); + str.append(result, sz); } void NumberFormatter::append(std::string& str, long value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%*ld", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width); + str.append(result, sz); } void NumberFormatter::append0(std::string& str, long value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*ld", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, long value) { - char buffer[64]; - std::sprintf(buffer, "%lX", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, long value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*lX", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::append(std::string& str, unsigned long value) { - char buffer[64]; - std::sprintf(buffer, "%lu", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz); + str.append(result, sz); } void NumberFormatter::append(std::string& str, unsigned long value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%*lu", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::append0(std::string& str, unsigned long value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*lu", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, unsigned long value) { - char buffer[64]; - std::sprintf(buffer, "%lX", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, unsigned long value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*lX", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz, false, width, '0'); + str.append(result, sz); } @@ -265,93 +261,91 @@ void NumberFormatter::appendHex(std::string& str, unsigned long value, int width void NumberFormatter::append(std::string& str, Int64 value) { - char buffer[64]; - std::sprintf(buffer, "%"I64_FMT"d", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz); + str.append(result, sz); } void NumberFormatter::append(std::string& str, Int64 value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%*"I64_FMT"d", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::append0(std::string& str, Int64 value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*"I64_FMT"d", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, Int64 value) { - char buffer[64]; - std::sprintf(buffer, "%"I64_FMT"X", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, Int64 value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*"I64_FMT"X", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::append(std::string& str, UInt64 value) { - char buffer[64]; - std::sprintf(buffer, "%"I64_FMT"u", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz); + str.append(result, sz); } void NumberFormatter::append(std::string& str, UInt64 value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%*"I64_FMT"u", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::append0(std::string& str, UInt64 value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*"I64_FMT"u", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 10, result, sz, false, width, '0'); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, UInt64 value) { - char buffer[64]; - std::sprintf(buffer, "%"I64_FMT"X", value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz); + str.append(result, sz); } void NumberFormatter::appendHex(std::string& str, UInt64 value, int width) { - poco_assert (width > 0 && width < 64); - - char buffer[64]; - std::sprintf(buffer, "%0*"I64_FMT"X", width, value); - str.append(buffer); + char result[NF_MAX_NUM_STRING_SIZE]; + unsigned sz = NF_MAX_NUM_STRING_SIZE; + intToStr(value, 0x10, result, sz, false, width, '0'); + str.append(result, sz); } diff --git a/Foundation/testsuite/src/NumberFormatterTest.cpp b/Foundation/testsuite/src/NumberFormatterTest.cpp index b7e3054ab..08ef18433 100644 --- a/Foundation/testsuite/src/NumberFormatterTest.cpp +++ b/Foundation/testsuite/src/NumberFormatterTest.cpp @@ -68,6 +68,10 @@ void NumberFormatterTest::testFormat() assert (NumberFormatter::format((unsigned long) 123) == "123"); assert (NumberFormatter::format((unsigned long) 123, 5) == " 123"); + assert (NumberFormatter::format(123) == "123"); + assert (NumberFormatter::format(-123) == "-123"); + assert (NumberFormatter::format(-123, 5) == " -123"); + #if defined(POCO_HAVE_INT64) assert (NumberFormatter::format((Int64) 123) == "123"); assert (NumberFormatter::format((Int64) -123) == "-123"); @@ -148,6 +152,50 @@ void NumberFormatterTest::testFormatHex() assert (NumberFormatter::formatHex((UInt64) 0x12, 4) == "0012"); assert (NumberFormatter::formatHex((UInt64) 0xab, 4) == "00AB"); #endif + + assert (NumberFormatter::formatHex(0x12, true) == "0x12"); + assert (NumberFormatter::formatHex(0xab, true) == "0xAB"); + assert (NumberFormatter::formatHex(0x12, 4, true) == "0x12"); + assert (NumberFormatter::formatHex(0xab, 4, true) == "0xAB"); + assert (NumberFormatter::formatHex(0x12, 6, true) == "0x0012"); + assert (NumberFormatter::formatHex(0xab, 6, true) == "0x00AB"); + + assert (NumberFormatter::formatHex((unsigned) 0x12, true) == "0x12"); + assert (NumberFormatter::formatHex((unsigned) 0xab, true) == "0xAB"); + assert (NumberFormatter::formatHex((unsigned) 0x12, 4, true) == "0x12"); + assert (NumberFormatter::formatHex((unsigned) 0xab, 4, true) == "0xAB"); + assert (NumberFormatter::formatHex((unsigned) 0x12, 6, true) == "0x0012"); + assert (NumberFormatter::formatHex((unsigned) 0xab, 6, true) == "0x00AB"); + + assert (NumberFormatter::formatHex((long) 0x12, true) == "0x12"); + assert (NumberFormatter::formatHex((long) 0xab, true) == "0xAB"); + assert (NumberFormatter::formatHex((long) 0x12, 4, true) == "0x12"); + assert (NumberFormatter::formatHex((long) 0xab, 4, true) == "0xAB"); + assert (NumberFormatter::formatHex((long) 0x12, 6, true) == "0x0012"); + assert (NumberFormatter::formatHex((long) 0xab, 6, true) == "0x00AB"); + + assert (NumberFormatter::formatHex((unsigned long) 0x12, true) == "0x12"); + assert (NumberFormatter::formatHex((unsigned long) 0xab, true) == "0xAB"); + assert (NumberFormatter::formatHex((unsigned long) 0x12, 4, true) == "0x12"); + assert (NumberFormatter::formatHex((unsigned long) 0xab, 4, true) == "0xAB"); + assert (NumberFormatter::formatHex((unsigned long) 0x12, 6, true) == "0x0012"); + assert (NumberFormatter::formatHex((unsigned long) 0xab, 6, true) == "0x00AB"); + +#if defined(POCO_HAVE_INT64) + assert (NumberFormatter::formatHex((Int64) 0x12, true) == "0x12"); + assert (NumberFormatter::formatHex((Int64) 0xab, true) == "0xAB"); + assert (NumberFormatter::formatHex((Int64) 0x12, 4, true) == "0x12"); + assert (NumberFormatter::formatHex((Int64) 0xab, 4, true) == "0xAB"); + assert (NumberFormatter::formatHex((Int64) 0x12, 6, true) == "0x0012"); + assert (NumberFormatter::formatHex((Int64) 0xab, 6, true) == "0x00AB"); + + assert (NumberFormatter::formatHex((UInt64) 0x12, true) == "0x12"); + assert (NumberFormatter::formatHex((UInt64) 0xab, true) == "0xAB"); + assert (NumberFormatter::formatHex((UInt64) 0x12, 4, true) == "0x12"); + assert (NumberFormatter::formatHex((UInt64) 0xab, 4, true) == "0xAB"); + assert (NumberFormatter::formatHex((UInt64) 0x12, 6, true) == "0x0012"); + assert (NumberFormatter::formatHex((UInt64) 0xab, 6, true) == "0x00AB"); +#endif } diff --git a/Foundation/testsuite/src/NumberParserTest.cpp b/Foundation/testsuite/src/NumberParserTest.cpp index ded8c7287..0e46e069f 100644 --- a/Foundation/testsuite/src/NumberParserTest.cpp +++ b/Foundation/testsuite/src/NumberParserTest.cpp @@ -217,6 +217,7 @@ void NumberParserTest::testLimits() assert(testLowerLimit()); assert(testUpperLimit()); assert(testUpperLimit()); + assert(testLowerLimit()); assert(testUpperLimit()); #if defined(POCO_HAVE_INT64) diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index cd49c8fbd..48598df0d 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -37,6 +37,7 @@ #include "Poco/Format.h" #include "Poco/MemoryStream.h" #include "Poco/Stopwatch.h" +#include "Poco/Exception.h" #include #include #include @@ -60,11 +61,13 @@ using Poco::replaceInPlace; using Poco::cat; using Poco::strToInt; using Poco::strToFloat; +using Poco::intToStr; using Poco::thousandSeparator; using Poco::decimalSeparator; using Poco::format; using Poco::MemoryInputStream; using Poco::Stopwatch; +using Poco::RangeException; StringTest::StringTest(const std::string& name): CppUnit::TestCase(name) @@ -690,6 +693,106 @@ void StringTest::benchmarkStrToFloat() } +void StringTest::testIntToString() +{ + //intToStr(T number, unsigned short base, std::string& result, bool prefix = false, int width = -1, char fill = ' ', char thSep = 0) + + // decimal + std::string result; + assert (intToStr(0, 10, result)); + assert (result == "0"); + assert (intToStr(0, 10, result, false, 10, '0')); + assert (result == "0000000000"); + assert (intToStr(1234567890, 10, result)); + assert (result == "1234567890"); + assert (intToStr(-1234567890, 10, result)); + assert (result == "-1234567890"); + assert (intToStr(-1234567890, 10, result, false, 15, '0')); + assert (result == "-00001234567890"); + assert (intToStr(-1234567890, 10, result, false, 15)); + assert (result == " -1234567890"); + assert (intToStr(-1234567890, 10, result, false, 0, 0, ',')); + assert (result == "-1,234,567,890"); + + // binary + assert (intToStr(1234567890, 2, result)); + assert (result == "1001001100101100000001011010010"); + assert (intToStr(1234567890, 2, result, true)); + assert (result == "1001001100101100000001011010010"); + assert (intToStr(1234567890, 2, result, true, 35, '0')); + assert (result == "00001001001100101100000001011010010"); + assert (intToStr(0xFF, 2, result)); + assert (result == "11111111"); + assert (intToStr(0x0F, 2, result, false, 8, '0')); + assert (result == "00001111"); + assert (intToStr(0x0F, 2, result)); + assert (result == "1111"); + assert (intToStr(0xF0, 2, result)); + assert (result == "11110000"); + assert (intToStr(0xFFFF, 2, result)); + assert (result == "1111111111111111"); + assert (intToStr(0xFF00, 2, result)); + assert (result == "1111111100000000"); + assert (intToStr(0xFFFFFFFF, 2, result)); + assert (result == "11111111111111111111111111111111"); + assert (intToStr(0xFF00FF00, 2, result)); + assert (result == "11111111000000001111111100000000"); + assert (intToStr(0xF0F0F0F0, 2, result)); + assert (result == "11110000111100001111000011110000"); +#if defined(POCO_HAVE_INT64) + assert (intToStr(0xFFFFFFFFFFFFFFFF, 2, result)); + std::cout << 0xFFFFFFFFFFFFFFFF << std::endl; + assert (result == "1111111111111111111111111111111111111111111111111111111111111111"); + assert (intToStr(0xFF00000FF00000FF, 2, result)); + assert (result == "1111111100000000000000000000111111110000000000000000000011111111"); +#endif + + // octal + assert (intToStr(1234567890, 010, result)); + assert (result == "11145401322"); + assert (intToStr(1234567890, 010, result, true)); + assert (result == "011145401322"); + assert (intToStr(1234567890, 010, result, true, 15, '0')); + assert (result == "000011145401322"); + assert (intToStr(012345670, 010, result, true)); + assert (result == "012345670"); + assert (intToStr(012345670, 010, result)); + assert (result == "12345670"); + + // hexadecimal + assert (intToStr(0, 0x10, result, true)); + assert (result == "0x0"); + assert (intToStr(0, 0x10, result, true, 4, '0')); + assert (result == "0x00"); + assert (intToStr(0, 0x10, result, false, 4, '0')); + assert (result == "0000"); + assert (intToStr(1234567890, 0x10, result)); + assert (result == "499602D2"); + assert (intToStr(1234567890, 0x10, result, true)); + assert (result == "0x499602D2"); + assert (intToStr(1234567890, 0x10, result, true, 15, '0')); + assert (result == "0x00000499602D2"); + assert (intToStr(0x1234567890ABCDEF, 0x10, result, true)); + assert (result == "0x1234567890ABCDEF"); + assert (intToStr(0xDEADBEEF, 0x10, result)); + assert (result == "DEADBEEF"); +#if defined(POCO_HAVE_INT64) + assert (intToStr(0xFFFFFFFFFFFFFFFF, 0x10, result)); + assert (result == "FFFFFFFFFFFFFFFF"); + assert (intToStr(0xFFFFFFFFFFFFFFFF, 0x10, result, true)); + assert (result == "0xFFFFFFFFFFFFFFFF"); +#endif + + try + { + char pResult[POCO_MAX_NUM_STRING_LEN]; + unsigned sz = POCO_MAX_NUM_STRING_LEN; + intToStr(0, 10, pResult, sz, false, sz + 1, ' '); + fail ("must throw RangeException"); + } catch (RangeException&) { } +} + + void StringTest::setUp() { } @@ -724,6 +827,7 @@ CppUnit::Test* StringTest::suite() CppUnit_addTest(pSuite, StringTest, testNumericLocale); //CppUnit_addTest(pSuite, StringTest, benchmarkStrToFloat); //CppUnit_addTest(pSuite, StringTest, benchmarkStrToInt); + CppUnit_addTest(pSuite, StringTest, testIntToString); return pSuite; } diff --git a/Foundation/testsuite/src/StringTest.h b/Foundation/testsuite/src/StringTest.h index 0e8cf305d..f0c8f3416 100644 --- a/Foundation/testsuite/src/StringTest.h +++ b/Foundation/testsuite/src/StringTest.h @@ -70,6 +70,8 @@ public: void benchmarkStrToFloat(); void benchmarkStrToInt(); + void testIntToString(); + void setUp(); void tearDown(); From 91d5be438b3c03d68096aee5b04bb3566e7e95a7 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 25 Nov 2012 21:36:29 -0600 Subject: [PATCH 053/165] replaced stream-based number formatting embedded a portion of double-conversion library (http://code.google.com/p/double-conversion/)and replaced stream-based number formatting --- Foundation/CMakeLists.txt | 1 + Foundation/Foundation_CE_vs90.vcproj | 4 + Foundation/Foundation_vs100.vcxproj | 1 + Foundation/Foundation_vs100.vcxproj.filters | 3 + Foundation/Foundation_vs110.vcxproj | 1 + Foundation/Foundation_vs110.vcxproj.filters | 3 + Foundation/Foundation_vs71.vcproj | 3 + Foundation/Foundation_vs80.vcproj | 4 + Foundation/Foundation_vs90.vcproj | 4 + Foundation/Foundation_x64_vs100.vcxproj | 1 + .../Foundation_x64_vs100.vcxproj.filters | 3 + Foundation/Foundation_x64_vs110.vcxproj | 1 + .../Foundation_x64_vs110.vcxproj.filters | 3 + Foundation/Foundation_x64_vs90.vcproj | 4 + Foundation/Makefile | 2 +- Foundation/include/Poco/NumberFormatter.h | 13 +- Foundation/include/Poco/NumericString.h | 109 ++- Foundation/include/Poco/String.h | 16 + Foundation/src/NumberFormatter.cpp | 162 ++-- Foundation/src/NumericString.cpp | 197 ++++ Foundation/src/bignum-dtoa.cc | 640 +++++++++++++ Foundation/src/bignum-dtoa.h | 84 ++ Foundation/src/bignum.cc | 764 +++++++++++++++ Foundation/src/bignum.h | 145 +++ Foundation/src/cached-powers.cc | 175 ++++ Foundation/src/cached-powers.h | 64 ++ Foundation/src/diy-fp.cc | 57 ++ Foundation/src/diy-fp.h | 118 +++ Foundation/src/double-conversion.cc | 889 ++++++++++++++++++ Foundation/src/double-conversion.h | 536 +++++++++++ Foundation/src/fast-dtoa.cc | 664 +++++++++++++ Foundation/src/fast-dtoa.h | 88 ++ Foundation/src/fixed-dtoa.cc | 402 ++++++++ Foundation/src/fixed-dtoa.h | 56 ++ Foundation/src/ieee.h | 398 ++++++++ Foundation/src/strtod.cc | 554 +++++++++++ Foundation/src/strtod.h | 45 + Foundation/src/utils.h | 313 ++++++ Foundation/testsuite/TestSuite_vs100.vcxproj | 1 + .../testsuite/src/NumberFormatterTest.cpp | 63 +- .../testsuite/src/NumberFormatterTest.h | 1 + Foundation/testsuite/src/StringTest.cpp | 149 ++- Foundation/testsuite/src/StringTest.h | 3 +- XML/testsuite/rss.xml | 829 ---------------- doc/Acknowledgements.html | 30 + 45 files changed, 6631 insertions(+), 972 deletions(-) create mode 100644 Foundation/src/NumericString.cpp create mode 100644 Foundation/src/bignum-dtoa.cc create mode 100644 Foundation/src/bignum-dtoa.h create mode 100644 Foundation/src/bignum.cc create mode 100644 Foundation/src/bignum.h create mode 100644 Foundation/src/cached-powers.cc create mode 100644 Foundation/src/cached-powers.h create mode 100644 Foundation/src/diy-fp.cc create mode 100644 Foundation/src/diy-fp.h create mode 100644 Foundation/src/double-conversion.cc create mode 100644 Foundation/src/double-conversion.h create mode 100644 Foundation/src/fast-dtoa.cc create mode 100644 Foundation/src/fast-dtoa.h create mode 100644 Foundation/src/fixed-dtoa.cc create mode 100644 Foundation/src/fixed-dtoa.h create mode 100644 Foundation/src/ieee.h create mode 100644 Foundation/src/strtod.cc create mode 100644 Foundation/src/strtod.h create mode 100644 Foundation/src/utils.h delete mode 100644 XML/testsuite/rss.xml diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt index 4910d6dbf..1a69622ff 100644 --- a/Foundation/CMakeLists.txt +++ b/Foundation/CMakeLists.txt @@ -130,6 +130,7 @@ set( BASE_SRCS src/StreamCopier.cpp src/StreamTokenizer.cpp src/String.cpp + src/NumericString.cpp src/StringTokenizer.cpp src/SynchronizedObject.cpp src/Task.cpp diff --git a/Foundation/Foundation_CE_vs90.vcproj b/Foundation/Foundation_CE_vs90.vcproj index a3d1b490f..1410a1cb5 100644 --- a/Foundation/Foundation_CE_vs90.vcproj +++ b/Foundation/Foundation_CE_vs90.vcproj @@ -6513,6 +6513,10 @@ RelativePath=".\src\String.cpp" > + + diff --git a/Foundation/Foundation_vs100.vcxproj b/Foundation/Foundation_vs100.vcxproj index 928dcb278..a30a67b05 100644 --- a/Foundation/Foundation_vs100.vcxproj +++ b/Foundation/Foundation_vs100.vcxproj @@ -380,6 +380,7 @@ + diff --git a/Foundation/Foundation_vs100.vcxproj.filters b/Foundation/Foundation_vs100.vcxproj.filters index 4b81261e7..c6f74b470 100644 --- a/Foundation/Foundation_vs100.vcxproj.filters +++ b/Foundation/Foundation_vs100.vcxproj.filters @@ -894,6 +894,9 @@ Streams\Source Files + + Core\Source Files + diff --git a/Foundation/Foundation_vs110.vcxproj b/Foundation/Foundation_vs110.vcxproj index 07b70d901..1af432b66 100644 --- a/Foundation/Foundation_vs110.vcxproj +++ b/Foundation/Foundation_vs110.vcxproj @@ -385,6 +385,7 @@ + diff --git a/Foundation/Foundation_vs110.vcxproj.filters b/Foundation/Foundation_vs110.vcxproj.filters index c4f7b5adb..512dc207d 100644 --- a/Foundation/Foundation_vs110.vcxproj.filters +++ b/Foundation/Foundation_vs110.vcxproj.filters @@ -264,6 +264,9 @@ Core\Source Files + + Core\Source Files + Core\Source Files diff --git a/Foundation/Foundation_vs71.vcproj b/Foundation/Foundation_vs71.vcproj index fc727e3fb..05e742ca3 100644 --- a/Foundation/Foundation_vs71.vcproj +++ b/Foundation/Foundation_vs71.vcproj @@ -768,6 +768,9 @@ + + diff --git a/Foundation/Foundation_vs80.vcproj b/Foundation/Foundation_vs80.vcproj index 02d04f887..8d16d82ca 100644 --- a/Foundation/Foundation_vs80.vcproj +++ b/Foundation/Foundation_vs80.vcproj @@ -1031,6 +1031,10 @@ RelativePath=".\src\String.cpp" > + + diff --git a/Foundation/Foundation_vs90.vcproj b/Foundation/Foundation_vs90.vcproj index db163bd3e..5be3445e2 100644 --- a/Foundation/Foundation_vs90.vcproj +++ b/Foundation/Foundation_vs90.vcproj @@ -1028,6 +1028,10 @@ RelativePath=".\src\String.cpp" > + + diff --git a/Foundation/Foundation_x64_vs100.vcxproj b/Foundation/Foundation_x64_vs100.vcxproj index c6a19d868..11ab74d76 100644 --- a/Foundation/Foundation_x64_vs100.vcxproj +++ b/Foundation/Foundation_x64_vs100.vcxproj @@ -385,6 +385,7 @@ + diff --git a/Foundation/Foundation_x64_vs100.vcxproj.filters b/Foundation/Foundation_x64_vs100.vcxproj.filters index 52e52d905..84d3fcef9 100644 --- a/Foundation/Foundation_x64_vs100.vcxproj.filters +++ b/Foundation/Foundation_x64_vs100.vcxproj.filters @@ -264,6 +264,9 @@ Core\Source Files + + Core\Source Files + Core\Source Files diff --git a/Foundation/Foundation_x64_vs110.vcxproj b/Foundation/Foundation_x64_vs110.vcxproj index a27509657..befff146f 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj +++ b/Foundation/Foundation_x64_vs110.vcxproj @@ -391,6 +391,7 @@ + diff --git a/Foundation/Foundation_x64_vs110.vcxproj.filters b/Foundation/Foundation_x64_vs110.vcxproj.filters index 52e52d905..84d3fcef9 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj.filters +++ b/Foundation/Foundation_x64_vs110.vcxproj.filters @@ -264,6 +264,9 @@ Core\Source Files + + Core\Source Files + Core\Source Files diff --git a/Foundation/Foundation_x64_vs90.vcproj b/Foundation/Foundation_x64_vs90.vcproj index 282134404..d47d6a431 100644 --- a/Foundation/Foundation_x64_vs90.vcproj +++ b/Foundation/Foundation_x64_vs90.vcproj @@ -1034,6 +1034,10 @@ RelativePath=".\src\String.cpp" > + + diff --git a/Foundation/Makefile b/Foundation/Makefile index f8e150e83..9b3c6728c 100644 --- a/Foundation/Makefile +++ b/Foundation/Makefile @@ -20,7 +20,7 @@ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel \ MemoryPool MD4Engine MD5Engine Manifest Message Mutex \ NestedDiagnosticContext Notification NotificationCenter \ NotificationQueue PriorityNotificationQueue TimedNotificationQueue \ - NullStream NumberFormatter NumberParser AbstractObserver \ + NullStream NumberFormatter NumberParser NumericString AbstractObserver \ Path PatternFormatter Process PurgeStrategy RWLock Random RandomStream \ RegularExpression RefCountedObject Runnable RotateStrategy Condition \ SHA1Engine Semaphore SharedLibrary SimpleFileChannel \ diff --git a/Foundation/include/Poco/NumberFormatter.h b/Foundation/include/Poco/NumberFormatter.h index fd8cc8084..5adfd94fd 100644 --- a/Foundation/include/Poco/NumberFormatter.h +++ b/Foundation/include/Poco/NumberFormatter.h @@ -65,7 +65,8 @@ public: FMT_ON_OFF }; - static const unsigned NF_MAX_NUM_STRING_SIZE = 32; + static const unsigned NF_MAX_INT_STRING_LEN = 32; // increase for 64-bit binary formatting support + static const unsigned NF_MAX_FLT_STRING_LEN = POCO_MAX_FLT_STRING_LEN; static std::string format(int value); /// Formats an integer value in decimal notation. @@ -404,6 +405,8 @@ public: /// Formats a pointer in an eight (32-bit architectures) or /// sixteen (64-bit architectures) characters wide /// field in hexadecimal notation. + +private: }; @@ -660,7 +663,7 @@ inline std::string NumberFormatter::formatHex(UInt64 value, int width, bool pref inline std::string NumberFormatter::format(float value) { std::string result; - append(result, value); + floatToStr(result, value); return result; } @@ -668,7 +671,7 @@ inline std::string NumberFormatter::format(float value) inline std::string NumberFormatter::format(double value) { std::string result; - append(result, value); + doubleToStr(result, value); return result; } @@ -676,7 +679,7 @@ inline std::string NumberFormatter::format(double value) inline std::string NumberFormatter::format(double value, int precision) { std::string result; - append(result, value, precision); + doubleToStr(result, value, precision); return result; } @@ -684,7 +687,7 @@ inline std::string NumberFormatter::format(double value, int precision) inline std::string NumberFormatter::format(double value, int width, int precision) { std::string result; - append(result, value, width, precision); + doubleToStr(result, value, precision, width); return result; } diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h index b87609983..b496a2aa3 100644 --- a/Foundation/include/Poco/NumericString.h +++ b/Foundation/include/Poco/NumericString.h @@ -55,12 +55,26 @@ #include #endif -#define POCO_MAX_NUM_STRING_LEN 65 +// TODO: +// POCO version is fast but simplistic, hence less accurate, undef this for +// double-conversion library use in string => float/double conversions (T.B.D.) +// (double-conversion library is always used for float/double => string) +#define POCO_STR_TO_FLOAT_FAST + +#define POCO_MAX_INT_STRING_LEN 65 +#define POCO_MAX_FLT_STRING_LEN 128 namespace Poco { +namespace Impl { + +static char DUMMY_EXP_UNDERFLOW = 0; // dummy default val + +} + + inline char decimalSeparator() /// Returns decimal separator from global locale or /// default '.' for platforms where locale is unavailable. @@ -205,22 +219,22 @@ bool strToInt(const std::string& str, I& result, short base, char thSep = ',') } -namespace Impl { - -static char DUMMY_EXP_UNDERFLOW = 0; // dummy default val - -} - template bool strToFloat (const char* pStr, F& result, char& eu = Impl::DUMMY_EXP_UNDERFLOW, char decSep = '.', char thSep = ',') /// Converts zero-terminated array to floating-point number; - /// Returns true if succesful. Exponent underflow (i.e. loss of precision) + /// Returns true if succesful. Exponent underflow (i.e. loss of precision due to exponent value) /// is signalled in eu. Thousand separators are recognized for the locale /// and silently skipped but not verified for correct positioning. /// /// If parsing was unsuccesful, the return value is false with /// result and eu values undetermined. + /// This function will perform fast but significant rounding errors may occur after + /// the platform precision is exceeded. + /// For better precision conversion, use double-conversion wrappers (strToFloatDC and strToDoubleDC). { +#ifndef POCO_STR_TO_FLOAT_FAST + // TODO: for high-precision, use double-conversion here +#else poco_assert (decSep != thSep); if (pStr == 0 || *pStr == '\0') return false; @@ -235,8 +249,9 @@ bool strToFloat (const char* pStr, F& result, char& eu = Impl::DUMMY_EXP_UNDERFL char numSign = 1, expSign = 1; char state = STATE_LEADING_SPACES; - F mantissa = 0.0, exponent = 0.0; - F pow10 = 1.; + F mantissa = 0.0, exponent = 0.0, pow10 = 1.0; + int powCnt = 0; + result = 0.0; eu = 0; for (; *pStr != '\0'; ++pStr) @@ -307,12 +322,12 @@ bool strToFloat (const char* pStr, F& result, char& eu = Impl::DUMMY_EXP_UNDERFL } else if (state <= STATE_DIGITS_AFTER_DEC_POINT) // fractional part digits { - mantissa += (*pStr - '0') / (pow10 *= 10.); + mantissa += F(*pStr - '0') / (pow10 *= 10.); state = STATE_DIGITS_AFTER_DEC_POINT; } else if (state <= STATE_EXP_DIGITS) // exponent digits { - exponent = exponent * 10 + (*pStr - '0'); + exponent = exponent * 10. + (*pStr - '0'); state = STATE_EXP_DIGITS; } else return false; @@ -351,6 +366,7 @@ bool strToFloat (const char* pStr, F& result, char& eu = Impl::DUMMY_EXP_UNDERFL return (state != STATE_LEADING_SPACES) && // empty/zero-length string !FPEnvironment::isInfinite(result) && !FPEnvironment::isNaN(result); +#endif // POCO_STR_TO_FLOAT_FAST } @@ -524,14 +540,79 @@ bool intToStr (T number, unsigned short base, std::string& result, bool prefix = /// Converts integer to string; This is a wrapper function, for details see see the /// bool intToStr(T, unsigned short, char*, int, int, char, char) implementation. { - char res[POCO_MAX_NUM_STRING_LEN] = {0}; - unsigned size = POCO_MAX_NUM_STRING_LEN; + char res[POCO_MAX_INT_STRING_LEN] = {0}; + unsigned size = POCO_MAX_INT_STRING_LEN; bool ret = intToStr(number, base, res, size, prefix, width, fill, thSep); result.assign(res, size); return ret; } +// +// Functions using double-conversion library (http://code.google.com/p/double-conversion/). +// Library is the implementation of the Grisu algorithm as described in Florian Loitsch's paper: +// http://florian.loitsch.com/publications/dtoa-pldi2010.pdf +// +// For a complete (and simpler) story on floating-point numbers rendering accuracy and performance, see: +// http://www.serpentine.com/blog/2011/06/29/here-be-dragons-advances-in-problems-you-didnt-even-know-you-had/ +// + +Foundation_API void floatToStr(char* buffer, + int bufferSize, + float value, + int lowDec = -std::numeric_limits::digits10, + int highDec = std::numeric_limits::digits10); + /// Converts a float value to string. Converted string must be shorter than bufferSize. + /// Conversion is done by computing the shortest string of digits that correctly represents + /// the input number. Depending on lowDec and highDec values, the function returns + /// decimal or exponential representation. + + +Foundation_API std::string& floatToStr(std::string& str, + float value, + int precision = 0, + int width = 0, + char thSep = 0, + char decSep = 0); + /// Converts a float value, assigns it to the supplied string and returns the reference. + /// This function calls floatToStr(char*, int, float, int, int) and formats the result according to + /// precision (total number of digits after the decimal point) and width (total length of formatted string). + + +Foundation_API void doubleToStr(char* buffer, + int bufferSize, + double value, + int lowDec = -std::numeric_limits::digits10, + int highDec = std::numeric_limits::digits10); + /// Converts a double value to string. Converted string must be shorter than bufferSize. + /// Conversion is done by computing the shortest string of digits that correctly represents + /// the input number. Depending on lowDec and highDec values, the function returns + /// decimal or exponential representation. + + +Foundation_API std::string& doubleToStr(std::string& str, + double value, + int precision = 0, + int width = 0, + char thSep = 0, + char decSep = 0); + /// Converts a double value, assigns it to the supplied string and returns the reference. + /// This function calls doubleToStr(char*, int, float, int, int) and formats the result according to + /// precision (total number of digits after the decimal point) and width (total length of formatted string). + + +Foundation_API float strToFloatDC(const char* str); + /// For testing and performance comparison purposes only. + + +Foundation_API double strToDoubleDC(const char* str); + /// For testing and performance comparison purposes only. + +// +// end double-conversion functions declarations +// + + } // namespace Poco diff --git a/Foundation/include/Poco/String.h b/Foundation/include/Poco/String.h index 1c971e1a0..f8e2b41ff 100644 --- a/Foundation/include/Poco/String.h +++ b/Foundation/include/Poco/String.h @@ -481,6 +481,22 @@ S& replaceInPlace(S& str, const typename S::value_type* from, const typename S:: } +template +S& replaceInPlace(S& str, const typename S::value_type from, const typename S::value_type to, typename S::size_type start = 0) +{ + if (from == to) return str; + + typename S::size_type pos = 0; + do + { + pos = str.find(from, start); + if (pos != S::npos) str[pos] = to; + } while (pos != S::npos); + + return str; +} + + template S replace(const S& str, const S& from, const S& to, typename S::size_type start = 0) /// Replace all occurences of from (which must not be the empty string) diff --git a/Foundation/src/NumberFormatter.cpp b/Foundation/src/NumberFormatter.cpp index 00d9185cb..ac4556dd1 100644 --- a/Foundation/src/NumberFormatter.cpp +++ b/Foundation/src/NumberFormatter.cpp @@ -78,8 +78,8 @@ std::string NumberFormatter::format(bool value, BoolFormat format) void NumberFormatter::append(std::string& str, int value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz); str.append(result, sz); } @@ -87,8 +87,8 @@ void NumberFormatter::append(std::string& str, int value) void NumberFormatter::append(std::string& str, int value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width); str.append(result, sz); } @@ -96,8 +96,8 @@ void NumberFormatter::append(std::string& str, int value, int width) void NumberFormatter::append0(std::string& str, int value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -105,8 +105,8 @@ void NumberFormatter::append0(std::string& str, int value, int width) void NumberFormatter::appendHex(std::string& str, int value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -114,8 +114,8 @@ void NumberFormatter::appendHex(std::string& str, int value) void NumberFormatter::appendHex(std::string& str, int value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -123,8 +123,8 @@ void NumberFormatter::appendHex(std::string& str, int value, int width) void NumberFormatter::append(std::string& str, unsigned value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz); str.append(result, sz); } @@ -132,8 +132,8 @@ void NumberFormatter::append(std::string& str, unsigned value) void NumberFormatter::append(std::string& str, unsigned value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width); str.append(result, sz); } @@ -141,8 +141,8 @@ void NumberFormatter::append(std::string& str, unsigned value, int width) void NumberFormatter::append0(std::string& str, unsigned int value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -150,8 +150,8 @@ void NumberFormatter::append0(std::string& str, unsigned int value, int width) void NumberFormatter::appendHex(std::string& str, unsigned value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -159,8 +159,8 @@ void NumberFormatter::appendHex(std::string& str, unsigned value) void NumberFormatter::appendHex(std::string& str, unsigned value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -168,8 +168,8 @@ void NumberFormatter::appendHex(std::string& str, unsigned value, int width) void NumberFormatter::append(std::string& str, long value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz); str.append(result, sz); } @@ -177,8 +177,8 @@ void NumberFormatter::append(std::string& str, long value) void NumberFormatter::append(std::string& str, long value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width); str.append(result, sz); } @@ -186,8 +186,8 @@ void NumberFormatter::append(std::string& str, long value, int width) void NumberFormatter::append0(std::string& str, long value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -195,8 +195,8 @@ void NumberFormatter::append0(std::string& str, long value, int width) void NumberFormatter::appendHex(std::string& str, long value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -204,8 +204,8 @@ void NumberFormatter::appendHex(std::string& str, long value) void NumberFormatter::appendHex(std::string& str, long value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -213,8 +213,8 @@ void NumberFormatter::appendHex(std::string& str, long value, int width) void NumberFormatter::append(std::string& str, unsigned long value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz); str.append(result, sz); } @@ -222,8 +222,8 @@ void NumberFormatter::append(std::string& str, unsigned long value) void NumberFormatter::append(std::string& str, unsigned long value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -231,8 +231,8 @@ void NumberFormatter::append(std::string& str, unsigned long value, int width) void NumberFormatter::append0(std::string& str, unsigned long value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -240,8 +240,8 @@ void NumberFormatter::append0(std::string& str, unsigned long value, int width) void NumberFormatter::appendHex(std::string& str, unsigned long value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -249,8 +249,8 @@ void NumberFormatter::appendHex(std::string& str, unsigned long value) void NumberFormatter::appendHex(std::string& str, unsigned long value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -261,8 +261,8 @@ void NumberFormatter::appendHex(std::string& str, unsigned long value, int width void NumberFormatter::append(std::string& str, Int64 value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz); str.append(result, sz); } @@ -270,8 +270,8 @@ void NumberFormatter::append(std::string& str, Int64 value) void NumberFormatter::append(std::string& str, Int64 value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -279,8 +279,8 @@ void NumberFormatter::append(std::string& str, Int64 value, int width) void NumberFormatter::append0(std::string& str, Int64 value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -288,8 +288,8 @@ void NumberFormatter::append0(std::string& str, Int64 value, int width) void NumberFormatter::appendHex(std::string& str, Int64 value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -297,8 +297,8 @@ void NumberFormatter::appendHex(std::string& str, Int64 value) void NumberFormatter::appendHex(std::string& str, Int64 value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -306,8 +306,8 @@ void NumberFormatter::appendHex(std::string& str, Int64 value, int width) void NumberFormatter::append(std::string& str, UInt64 value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz); str.append(result, sz); } @@ -315,8 +315,8 @@ void NumberFormatter::append(std::string& str, UInt64 value) void NumberFormatter::append(std::string& str, UInt64 value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -324,8 +324,8 @@ void NumberFormatter::append(std::string& str, UInt64 value, int width) void NumberFormatter::append0(std::string& str, UInt64 value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -333,8 +333,8 @@ void NumberFormatter::append0(std::string& str, UInt64 value, int width) void NumberFormatter::appendHex(std::string& str, UInt64 value) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -342,8 +342,8 @@ void NumberFormatter::appendHex(std::string& str, UInt64 value) void NumberFormatter::appendHex(std::string& str, UInt64 value, int width) { - char result[NF_MAX_NUM_STRING_SIZE]; - unsigned sz = NF_MAX_NUM_STRING_SIZE; + char result[NF_MAX_INT_STRING_LEN]; + unsigned sz = NF_MAX_INT_STRING_LEN; intToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -354,53 +354,31 @@ void NumberFormatter::appendHex(std::string& str, UInt64 value, int width) void NumberFormatter::append(std::string& str, float value) { - char buffer[64]; - Poco::MemoryOutputStream ostr(buffer, sizeof(buffer)); -#if !defined(POCO_NO_LOCALE) - ostr.imbue(std::locale::classic()); -#endif - ostr << std::setprecision(8) << value; - str.append(buffer, static_cast(ostr.charsWritten())); + char buffer[NF_MAX_FLT_STRING_LEN]; + floatToStr(buffer, POCO_MAX_FLT_STRING_LEN, value); + str.append(buffer); } void NumberFormatter::append(std::string& str, double value) { - char buffer[64]; - Poco::MemoryOutputStream ostr(buffer, sizeof(buffer)); -#if !defined(POCO_NO_LOCALE) - ostr.imbue(std::locale::classic()); -#endif - ostr << std::setprecision(16) << value; - str.append(buffer, static_cast(ostr.charsWritten())); + char buffer[NF_MAX_FLT_STRING_LEN]; + doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, value); + str.append(buffer); } void NumberFormatter::append(std::string& str, double value, int precision) { - poco_assert (precision >= 0 && precision < 32); - - char buffer[64]; - Poco::MemoryOutputStream ostr(buffer, sizeof(buffer)); -#if !defined(POCO_NO_LOCALE) - ostr.imbue(std::locale::classic()); -#endif - ostr << std::fixed << std::showpoint << std::setprecision(precision) << value; - str.append(buffer, static_cast(ostr.charsWritten())); + std::string result; + str.append(doubleToStr(result, value, precision)); } void NumberFormatter::append(std::string& str, double value, int width, int precision) { - poco_assert (width > 0 && width < 64 && precision >= 0 && precision < width); - - char buffer[64]; - Poco::MemoryOutputStream ostr(buffer, sizeof(buffer)); -#if !defined(POCO_NO_LOCALE) - ostr.imbue(std::locale::classic()); -#endif - ostr << std::fixed << std::showpoint << std::setw(width) << std::setprecision(precision) << value; - str.append(buffer, static_cast(ostr.charsWritten())); + std::string result; + str.append(doubleToStr(result, value, precision, width)); } diff --git a/Foundation/src/NumericString.cpp b/Foundation/src/NumericString.cpp new file mode 100644 index 000000000..13e0088cd --- /dev/null +++ b/Foundation/src/NumericString.cpp @@ -0,0 +1,197 @@ +// +// String.h +// +// $Id: //poco/1.4/Foundation/src/NumericString.cpp#1 $ +// +// Library: Foundation +// Package: Core +// Module: NumericString +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "bignum-dtoa.cc" +#include "bignum.cc" +#include "cached-powers.cc" +#include "diy-fp.cc" +#include "double-conversion.cc" +#include "fast-dtoa.cc" +#include "fixed-dtoa.cc" +#include "strtod.cc" + + +#include "Poco/NumericString.h" +#include "Poco/String.h" +#include + +namespace { + + +void pad(std::string& str, int precision, int width, char prefix = ' ', char decSep = '.') + /// Pads the string with prefix space and postfix 0. + /// Alternative prefix (e.g. zero instead of space) can be supplied by caller. + /// Used only internally. +{ + std::string::size_type frac = str.length() - str.find(decSep) - 1; + if (precision && (frac < precision)) str.append(precision - frac, '0'); + if (width && (str.length() < width)) str.insert(str.begin(), width - str.length(), prefix); +} + + +void insertThousandSep(std::string& str, char thSep, char decSep = '.') + /// Inserts thousand separators. + /// Used only internally. +{ + poco_assert (decSep != thSep); + + std::string::size_type exPos = str.find('e'); + std::string::size_type decPos = str.find(decSep); + // there's no rinsert, using forward iterator to go backwards + std::string::iterator it = str.end(); + std::string::iterator begin = str.begin(); + if (exPos != std::string::npos) + { + while (it != begin) + { + --it; + if (*it == 'e') break; + } + } + if (decPos != std::string::npos) + { + while (it != begin) + { + --it; + if (*it == decSep) break; + } + } + int thCount = 0; + for (; it != begin; --it) + { + if (!std::isdigit(*it)) continue; + if (++thCount == 3) + { + it = str.insert(it, thSep); + thCount = 0; + } + } +} + + +} // namespace + + +namespace Poco { + + +void floatToStr(char* buffer, int bufferSize, float value, int lowDec, int highDec) +{ + using namespace double_conversion; + + StringBuilder builder(buffer, bufferSize); + int flags = DoubleToStringConverter::UNIQUE_ZERO | + DoubleToStringConverter::EMIT_POSITIVE_EXPONENT_SIGN; + DoubleToStringConverter dc(flags, "inf", "nan", 'e', lowDec, highDec, 0, 0); + dc.ToShortestSingle(value, &builder); + builder.Finalize(); +} + + +std::string& floatToStr(std::string& str, float value, int precision, int width, char thSep, char decSep) +{ + char buffer[POCO_MAX_FLT_STRING_LEN]; + floatToStr(buffer, POCO_MAX_FLT_STRING_LEN, value); + str = buffer; + + if (decSep && (decSep != '.') && (str.find('.') != std::string::npos)) + replaceInPlace(str, '.', decSep); + + if (thSep) insertThousandSep(str, thSep, decSep); + if (precision || width) pad(str, precision, width, ' ', decSep ? decSep : '.'); + return str; +} + + +void doubleToStr(char* buffer, int bufferSize, double value, int lowDec, int highDec) +{ + using namespace double_conversion; + + StringBuilder builder(buffer, bufferSize); + int flags = DoubleToStringConverter::UNIQUE_ZERO | + DoubleToStringConverter::EMIT_POSITIVE_EXPONENT_SIGN; + DoubleToStringConverter dc(flags, "inf", "nan", 'e', lowDec, highDec, 0, 0); + dc.ToShortest(value, &builder); + builder.Finalize(); +} + + +std::string& doubleToStr(std::string& str, double value, int precision, int width, char thSep, char decSep) +{ + if (!decSep) decSep = '.'; + + char buffer[POCO_MAX_FLT_STRING_LEN]; + doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, value); + str = buffer; + + if (decSep && (decSep != '.') && (str.find('.') != std::string::npos)) + replaceInPlace(str, '.', decSep); + + if (thSep) insertThousandSep(str, thSep, decSep); + if (precision || width) pad(str, precision, width, ' ', decSep ? decSep : '.'); + return str; +} + + +float strToFloatDC(const char* str) +{ + using namespace double_conversion; + + double empty_string_value = 0.0; + int processed; + int flags = StringToDoubleConverter::ALLOW_LEADING_SPACES | + StringToDoubleConverter::ALLOW_TRAILING_SPACES; + StringToDoubleConverter converter(flags, empty_string_value, Single::NaN(), 0, 0); + float result = converter.StringToFloat(str, strlen(str), &processed); + return result; +} + + +double strToDoubleDC(const char* str) +{ + using namespace double_conversion; + + double empty_string_value = 0.0; + int processed; + int flags = StringToDoubleConverter::ALLOW_LEADING_SPACES | + StringToDoubleConverter::ALLOW_TRAILING_SPACES; + StringToDoubleConverter converter(flags, empty_string_value, Double::NaN(), 0, 0); + double result = converter.StringToDouble(str, strlen(str), &processed); + return result; +} + + +} // namespace Poco diff --git a/Foundation/src/bignum-dtoa.cc b/Foundation/src/bignum-dtoa.cc new file mode 100644 index 000000000..b6c2e85d1 --- /dev/null +++ b/Foundation/src/bignum-dtoa.cc @@ -0,0 +1,640 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include + +#include "bignum-dtoa.h" + +#include "bignum.h" +#include "ieee.h" + +namespace double_conversion { + +static int NormalizedExponent(uint64_t significand, int exponent) { + ASSERT(significand != 0); + while ((significand & Double::kHiddenBit) == 0) { + significand = significand << 1; + exponent = exponent - 1; + } + return exponent; +} + + +// Forward declarations: +// Returns an estimation of k such that 10^(k-1) <= v < 10^k. +static int EstimatePower(int exponent); +// Computes v / 10^estimated_power exactly, as a ratio of two bignums, numerator +// and denominator. +static void InitialScaledStartValues(uint64_t significand, + int exponent, + bool lower_boundary_is_closer, + int estimated_power, + bool need_boundary_deltas, + Bignum* numerator, + Bignum* denominator, + Bignum* delta_minus, + Bignum* delta_plus); +// Multiplies numerator/denominator so that its values lies in the range 1-10. +// Returns decimal_point s.t. +// v = numerator'/denominator' * 10^(decimal_point-1) +// where numerator' and denominator' are the values of numerator and +// denominator after the call to this function. +static void FixupMultiply10(int estimated_power, bool is_even, + int* decimal_point, + Bignum* numerator, Bignum* denominator, + Bignum* delta_minus, Bignum* delta_plus); +// Generates digits from the left to the right and stops when the generated +// digits yield the shortest decimal representation of v. +static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator, + Bignum* delta_minus, Bignum* delta_plus, + bool is_even, + Vector buffer, int* length); +// Generates 'requested_digits' after the decimal point. +static void BignumToFixed(int requested_digits, int* decimal_point, + Bignum* numerator, Bignum* denominator, + Vector(buffer), int* length); +// Generates 'count' digits of numerator/denominator. +// Once 'count' digits have been produced rounds the result depending on the +// remainder (remainders of exactly .5 round upwards). Might update the +// decimal_point when rounding up (for example for 0.9999). +static void GenerateCountedDigits(int count, int* decimal_point, + Bignum* numerator, Bignum* denominator, + Vector(buffer), int* length); + + +void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits, + Vector buffer, int* length, int* decimal_point) { + ASSERT(v > 0); + ASSERT(!Double(v).IsSpecial()); + uint64_t significand; + int exponent; + bool lower_boundary_is_closer; + if (mode == BIGNUM_DTOA_SHORTEST_SINGLE) { + float f = static_cast(v); + ASSERT(f == v); + significand = Single(f).Significand(); + exponent = Single(f).Exponent(); + lower_boundary_is_closer = Single(f).LowerBoundaryIsCloser(); + } else { + significand = Double(v).Significand(); + exponent = Double(v).Exponent(); + lower_boundary_is_closer = Double(v).LowerBoundaryIsCloser(); + } + bool need_boundary_deltas = + (mode == BIGNUM_DTOA_SHORTEST || mode == BIGNUM_DTOA_SHORTEST_SINGLE); + + bool is_even = (significand & 1) == 0; + int normalized_exponent = NormalizedExponent(significand, exponent); + // estimated_power might be too low by 1. + int estimated_power = EstimatePower(normalized_exponent); + + // Shortcut for Fixed. + // The requested digits correspond to the digits after the point. If the + // number is much too small, then there is no need in trying to get any + // digits. + if (mode == BIGNUM_DTOA_FIXED && -estimated_power - 1 > requested_digits) { + buffer[0] = '\0'; + *length = 0; + // Set decimal-point to -requested_digits. This is what Gay does. + // Note that it should not have any effect anyways since the string is + // empty. + *decimal_point = -requested_digits; + return; + } + + Bignum numerator; + Bignum denominator; + Bignum delta_minus; + Bignum delta_plus; + // Make sure the bignum can grow large enough. The smallest double equals + // 4e-324. In this case the denominator needs fewer than 324*4 binary digits. + // The maximum double is 1.7976931348623157e308 which needs fewer than + // 308*4 binary digits. + ASSERT(Bignum::kMaxSignificantBits >= 324*4); + InitialScaledStartValues(significand, exponent, lower_boundary_is_closer, + estimated_power, need_boundary_deltas, + &numerator, &denominator, + &delta_minus, &delta_plus); + // We now have v = (numerator / denominator) * 10^estimated_power. + FixupMultiply10(estimated_power, is_even, decimal_point, + &numerator, &denominator, + &delta_minus, &delta_plus); + // We now have v = (numerator / denominator) * 10^(decimal_point-1), and + // 1 <= (numerator + delta_plus) / denominator < 10 + switch (mode) { + case BIGNUM_DTOA_SHORTEST: + case BIGNUM_DTOA_SHORTEST_SINGLE: + GenerateShortestDigits(&numerator, &denominator, + &delta_minus, &delta_plus, + is_even, buffer, length); + break; + case BIGNUM_DTOA_FIXED: + BignumToFixed(requested_digits, decimal_point, + &numerator, &denominator, + buffer, length); + break; + case BIGNUM_DTOA_PRECISION: + GenerateCountedDigits(requested_digits, decimal_point, + &numerator, &denominator, + buffer, length); + break; + default: + UNREACHABLE(); + } + buffer[*length] = '\0'; +} + + +// The procedure starts generating digits from the left to the right and stops +// when the generated digits yield the shortest decimal representation of v. A +// decimal representation of v is a number lying closer to v than to any other +// double, so it converts to v when read. +// +// This is true if d, the decimal representation, is between m- and m+, the +// upper and lower boundaries. d must be strictly between them if !is_even. +// m- := (numerator - delta_minus) / denominator +// m+ := (numerator + delta_plus) / denominator +// +// Precondition: 0 <= (numerator+delta_plus) / denominator < 10. +// If 1 <= (numerator+delta_plus) / denominator < 10 then no leading 0 digit +// will be produced. This should be the standard precondition. +static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator, + Bignum* delta_minus, Bignum* delta_plus, + bool is_even, + Vector buffer, int* length) { + // Small optimization: if delta_minus and delta_plus are the same just reuse + // one of the two bignums. + if (Bignum::Equal(*delta_minus, *delta_plus)) { + delta_plus = delta_minus; + } + *length = 0; + while (true) { + uint16_t digit; + digit = numerator->DivideModuloIntBignum(*denominator); + ASSERT(digit <= 9); // digit is a uint16_t and therefore always positive. + // digit = numerator / denominator (integer division). + // numerator = numerator % denominator. + buffer[(*length)++] = digit + '0'; + + // Can we stop already? + // If the remainder of the division is less than the distance to the lower + // boundary we can stop. In this case we simply round down (discarding the + // remainder). + // Similarly we test if we can round up (using the upper boundary). + bool in_delta_room_minus; + bool in_delta_room_plus; + if (is_even) { + in_delta_room_minus = Bignum::LessEqual(*numerator, *delta_minus); + } else { + in_delta_room_minus = Bignum::Less(*numerator, *delta_minus); + } + if (is_even) { + in_delta_room_plus = + Bignum::PlusCompare(*numerator, *delta_plus, *denominator) >= 0; + } else { + in_delta_room_plus = + Bignum::PlusCompare(*numerator, *delta_plus, *denominator) > 0; + } + if (!in_delta_room_minus && !in_delta_room_plus) { + // Prepare for next iteration. + numerator->Times10(); + delta_minus->Times10(); + // We optimized delta_plus to be equal to delta_minus (if they share the + // same value). So don't multiply delta_plus if they point to the same + // object. + if (delta_minus != delta_plus) { + delta_plus->Times10(); + } + } else if (in_delta_room_minus && in_delta_room_plus) { + // Let's see if 2*numerator < denominator. + // If yes, then the next digit would be < 5 and we can round down. + int compare = Bignum::PlusCompare(*numerator, *numerator, *denominator); + if (compare < 0) { + // Remaining digits are less than .5. -> Round down (== do nothing). + } else if (compare > 0) { + // Remaining digits are more than .5 of denominator. -> Round up. + // Note that the last digit could not be a '9' as otherwise the whole + // loop would have stopped earlier. + // We still have an assert here in case the preconditions were not + // satisfied. + ASSERT(buffer[(*length) - 1] != '9'); + buffer[(*length) - 1]++; + } else { + // Halfway case. + // TODO(floitsch): need a way to solve half-way cases. + // For now let's round towards even (since this is what Gay seems to + // do). + + if ((buffer[(*length) - 1] - '0') % 2 == 0) { + // Round down => Do nothing. + } else { + ASSERT(buffer[(*length) - 1] != '9'); + buffer[(*length) - 1]++; + } + } + return; + } else if (in_delta_room_minus) { + // Round down (== do nothing). + return; + } else { // in_delta_room_plus + // Round up. + // Note again that the last digit could not be '9' since this would have + // stopped the loop earlier. + // We still have an ASSERT here, in case the preconditions were not + // satisfied. + ASSERT(buffer[(*length) -1] != '9'); + buffer[(*length) - 1]++; + return; + } + } +} + + +// Let v = numerator / denominator < 10. +// Then we generate 'count' digits of d = x.xxxxx... (without the decimal point) +// from left to right. Once 'count' digits have been produced we decide wether +// to round up or down. Remainders of exactly .5 round upwards. Numbers such +// as 9.999999 propagate a carry all the way, and change the +// exponent (decimal_point), when rounding upwards. +static void GenerateCountedDigits(int count, int* decimal_point, + Bignum* numerator, Bignum* denominator, + Vector(buffer), int* length) { + ASSERT(count >= 0); + for (int i = 0; i < count - 1; ++i) { + uint16_t digit; + digit = numerator->DivideModuloIntBignum(*denominator); + ASSERT(digit <= 9); // digit is a uint16_t and therefore always positive. + // digit = numerator / denominator (integer division). + // numerator = numerator % denominator. + buffer[i] = digit + '0'; + // Prepare for next iteration. + numerator->Times10(); + } + // Generate the last digit. + uint16_t digit; + digit = numerator->DivideModuloIntBignum(*denominator); + if (Bignum::PlusCompare(*numerator, *numerator, *denominator) >= 0) { + digit++; + } + buffer[count - 1] = digit + '0'; + // Correct bad digits (in case we had a sequence of '9's). Propagate the + // carry until we hat a non-'9' or til we reach the first digit. + for (int i = count - 1; i > 0; --i) { + if (buffer[i] != '0' + 10) break; + buffer[i] = '0'; + buffer[i - 1]++; + } + if (buffer[0] == '0' + 10) { + // Propagate a carry past the top place. + buffer[0] = '1'; + (*decimal_point)++; + } + *length = count; +} + + +// Generates 'requested_digits' after the decimal point. It might omit +// trailing '0's. If the input number is too small then no digits at all are +// generated (ex.: 2 fixed digits for 0.00001). +// +// Input verifies: 1 <= (numerator + delta) / denominator < 10. +static void BignumToFixed(int requested_digits, int* decimal_point, + Bignum* numerator, Bignum* denominator, + Vector(buffer), int* length) { + // Note that we have to look at more than just the requested_digits, since + // a number could be rounded up. Example: v=0.5 with requested_digits=0. + // Even though the power of v equals 0 we can't just stop here. + if (-(*decimal_point) > requested_digits) { + // The number is definitively too small. + // Ex: 0.001 with requested_digits == 1. + // Set decimal-point to -requested_digits. This is what Gay does. + // Note that it should not have any effect anyways since the string is + // empty. + *decimal_point = -requested_digits; + *length = 0; + return; + } else if (-(*decimal_point) == requested_digits) { + // We only need to verify if the number rounds down or up. + // Ex: 0.04 and 0.06 with requested_digits == 1. + ASSERT(*decimal_point == -requested_digits); + // Initially the fraction lies in range (1, 10]. Multiply the denominator + // by 10 so that we can compare more easily. + denominator->Times10(); + if (Bignum::PlusCompare(*numerator, *numerator, *denominator) >= 0) { + // If the fraction is >= 0.5 then we have to include the rounded + // digit. + buffer[0] = '1'; + *length = 1; + (*decimal_point)++; + } else { + // Note that we caught most of similar cases earlier. + *length = 0; + } + return; + } else { + // The requested digits correspond to the digits after the point. + // The variable 'needed_digits' includes the digits before the point. + int needed_digits = (*decimal_point) + requested_digits; + GenerateCountedDigits(needed_digits, decimal_point, + numerator, denominator, + buffer, length); + } +} + + +// Returns an estimation of k such that 10^(k-1) <= v < 10^k where +// v = f * 2^exponent and 2^52 <= f < 2^53. +// v is hence a normalized double with the given exponent. The output is an +// approximation for the exponent of the decimal approimation .digits * 10^k. +// +// The result might undershoot by 1 in which case 10^k <= v < 10^k+1. +// Note: this property holds for v's upper boundary m+ too. +// 10^k <= m+ < 10^k+1. +// (see explanation below). +// +// Examples: +// EstimatePower(0) => 16 +// EstimatePower(-52) => 0 +// +// Note: e >= 0 => EstimatedPower(e) > 0. No similar claim can be made for e<0. +static int EstimatePower(int exponent) { + // This function estimates log10 of v where v = f*2^e (with e == exponent). + // Note that 10^floor(log10(v)) <= v, but v <= 10^ceil(log10(v)). + // Note that f is bounded by its container size. Let p = 53 (the double's + // significand size). Then 2^(p-1) <= f < 2^p. + // + // Given that log10(v) == log2(v)/log2(10) and e+(len(f)-1) is quite close + // to log2(v) the function is simplified to (e+(len(f)-1)/log2(10)). + // The computed number undershoots by less than 0.631 (when we compute log3 + // and not log10). + // + // Optimization: since we only need an approximated result this computation + // can be performed on 64 bit integers. On x86/x64 architecture the speedup is + // not really measurable, though. + // + // Since we want to avoid overshooting we decrement by 1e10 so that + // floating-point imprecisions don't affect us. + // + // Explanation for v's boundary m+: the computation takes advantage of + // the fact that 2^(p-1) <= f < 2^p. Boundaries still satisfy this requirement + // (even for denormals where the delta can be much more important). + + const double k1Log10 = 0.30102999566398114; // 1/lg(10) + + // For doubles len(f) == 53 (don't forget the hidden bit). + const int kSignificandSize = Double::kSignificandSize; + double estimate = ceil((exponent + kSignificandSize - 1) * k1Log10 - 1e-10); + return static_cast(estimate); +} + + +// See comments for InitialScaledStartValues. +static void InitialScaledStartValuesPositiveExponent( + uint64_t significand, int exponent, + int estimated_power, bool need_boundary_deltas, + Bignum* numerator, Bignum* denominator, + Bignum* delta_minus, Bignum* delta_plus) { + // A positive exponent implies a positive power. + ASSERT(estimated_power >= 0); + // Since the estimated_power is positive we simply multiply the denominator + // by 10^estimated_power. + + // numerator = v. + numerator->AssignUInt64(significand); + numerator->ShiftLeft(exponent); + // denominator = 10^estimated_power. + denominator->AssignPowerUInt16(10, estimated_power); + + if (need_boundary_deltas) { + // Introduce a common denominator so that the deltas to the boundaries are + // integers. + denominator->ShiftLeft(1); + numerator->ShiftLeft(1); + // Let v = f * 2^e, then m+ - v = 1/2 * 2^e; With the common + // denominator (of 2) delta_plus equals 2^e. + delta_plus->AssignUInt16(1); + delta_plus->ShiftLeft(exponent); + // Same for delta_minus. The adjustments if f == 2^p-1 are done later. + delta_minus->AssignUInt16(1); + delta_minus->ShiftLeft(exponent); + } +} + + +// See comments for InitialScaledStartValues +static void InitialScaledStartValuesNegativeExponentPositivePower( + uint64_t significand, int exponent, + int estimated_power, bool need_boundary_deltas, + Bignum* numerator, Bignum* denominator, + Bignum* delta_minus, Bignum* delta_plus) { + // v = f * 2^e with e < 0, and with estimated_power >= 0. + // This means that e is close to 0 (have a look at how estimated_power is + // computed). + + // numerator = significand + // since v = significand * 2^exponent this is equivalent to + // numerator = v * / 2^-exponent + numerator->AssignUInt64(significand); + // denominator = 10^estimated_power * 2^-exponent (with exponent < 0) + denominator->AssignPowerUInt16(10, estimated_power); + denominator->ShiftLeft(-exponent); + + if (need_boundary_deltas) { + // Introduce a common denominator so that the deltas to the boundaries are + // integers. + denominator->ShiftLeft(1); + numerator->ShiftLeft(1); + // Let v = f * 2^e, then m+ - v = 1/2 * 2^e; With the common + // denominator (of 2) delta_plus equals 2^e. + // Given that the denominator already includes v's exponent the distance + // to the boundaries is simply 1. + delta_plus->AssignUInt16(1); + // Same for delta_minus. The adjustments if f == 2^p-1 are done later. + delta_minus->AssignUInt16(1); + } +} + + +// See comments for InitialScaledStartValues +static void InitialScaledStartValuesNegativeExponentNegativePower( + uint64_t significand, int exponent, + int estimated_power, bool need_boundary_deltas, + Bignum* numerator, Bignum* denominator, + Bignum* delta_minus, Bignum* delta_plus) { + // Instead of multiplying the denominator with 10^estimated_power we + // multiply all values (numerator and deltas) by 10^-estimated_power. + + // Use numerator as temporary container for power_ten. + Bignum* power_ten = numerator; + power_ten->AssignPowerUInt16(10, -estimated_power); + + if (need_boundary_deltas) { + // Since power_ten == numerator we must make a copy of 10^estimated_power + // before we complete the computation of the numerator. + // delta_plus = delta_minus = 10^estimated_power + delta_plus->AssignBignum(*power_ten); + delta_minus->AssignBignum(*power_ten); + } + + // numerator = significand * 2 * 10^-estimated_power + // since v = significand * 2^exponent this is equivalent to + // numerator = v * 10^-estimated_power * 2 * 2^-exponent. + // Remember: numerator has been abused as power_ten. So no need to assign it + // to itself. + ASSERT(numerator == power_ten); + numerator->MultiplyByUInt64(significand); + + // denominator = 2 * 2^-exponent with exponent < 0. + denominator->AssignUInt16(1); + denominator->ShiftLeft(-exponent); + + if (need_boundary_deltas) { + // Introduce a common denominator so that the deltas to the boundaries are + // integers. + numerator->ShiftLeft(1); + denominator->ShiftLeft(1); + // With this shift the boundaries have their correct value, since + // delta_plus = 10^-estimated_power, and + // delta_minus = 10^-estimated_power. + // These assignments have been done earlier. + // The adjustments if f == 2^p-1 (lower boundary is closer) are done later. + } +} + + +// Let v = significand * 2^exponent. +// Computes v / 10^estimated_power exactly, as a ratio of two bignums, numerator +// and denominator. The functions GenerateShortestDigits and +// GenerateCountedDigits will then convert this ratio to its decimal +// representation d, with the required accuracy. +// Then d * 10^estimated_power is the representation of v. +// (Note: the fraction and the estimated_power might get adjusted before +// generating the decimal representation.) +// +// The initial start values consist of: +// - a scaled numerator: s.t. numerator/denominator == v / 10^estimated_power. +// - a scaled (common) denominator. +// optionally (used by GenerateShortestDigits to decide if it has the shortest +// decimal converting back to v): +// - v - m-: the distance to the lower boundary. +// - m+ - v: the distance to the upper boundary. +// +// v, m+, m-, and therefore v - m- and m+ - v all share the same denominator. +// +// Let ep == estimated_power, then the returned values will satisfy: +// v / 10^ep = numerator / denominator. +// v's boundarys m- and m+: +// m- / 10^ep == v / 10^ep - delta_minus / denominator +// m+ / 10^ep == v / 10^ep + delta_plus / denominator +// Or in other words: +// m- == v - delta_minus * 10^ep / denominator; +// m+ == v + delta_plus * 10^ep / denominator; +// +// Since 10^(k-1) <= v < 10^k (with k == estimated_power) +// or 10^k <= v < 10^(k+1) +// we then have 0.1 <= numerator/denominator < 1 +// or 1 <= numerator/denominator < 10 +// +// It is then easy to kickstart the digit-generation routine. +// +// The boundary-deltas are only filled if the mode equals BIGNUM_DTOA_SHORTEST +// or BIGNUM_DTOA_SHORTEST_SINGLE. + +static void InitialScaledStartValues(uint64_t significand, + int exponent, + bool lower_boundary_is_closer, + int estimated_power, + bool need_boundary_deltas, + Bignum* numerator, + Bignum* denominator, + Bignum* delta_minus, + Bignum* delta_plus) { + if (exponent >= 0) { + InitialScaledStartValuesPositiveExponent( + significand, exponent, estimated_power, need_boundary_deltas, + numerator, denominator, delta_minus, delta_plus); + } else if (estimated_power >= 0) { + InitialScaledStartValuesNegativeExponentPositivePower( + significand, exponent, estimated_power, need_boundary_deltas, + numerator, denominator, delta_minus, delta_plus); + } else { + InitialScaledStartValuesNegativeExponentNegativePower( + significand, exponent, estimated_power, need_boundary_deltas, + numerator, denominator, delta_minus, delta_plus); + } + + if (need_boundary_deltas && lower_boundary_is_closer) { + // The lower boundary is closer at half the distance of "normal" numbers. + // Increase the common denominator and adapt all but the delta_minus. + denominator->ShiftLeft(1); // *2 + numerator->ShiftLeft(1); // *2 + delta_plus->ShiftLeft(1); // *2 + } +} + + +// This routine multiplies numerator/denominator so that its values lies in the +// range 1-10. That is after a call to this function we have: +// 1 <= (numerator + delta_plus) /denominator < 10. +// Let numerator the input before modification and numerator' the argument +// after modification, then the output-parameter decimal_point is such that +// numerator / denominator * 10^estimated_power == +// numerator' / denominator' * 10^(decimal_point - 1) +// In some cases estimated_power was too low, and this is already the case. We +// then simply adjust the power so that 10^(k-1) <= v < 10^k (with k == +// estimated_power) but do not touch the numerator or denominator. +// Otherwise the routine multiplies the numerator and the deltas by 10. +static void FixupMultiply10(int estimated_power, bool is_even, + int* decimal_point, + Bignum* numerator, Bignum* denominator, + Bignum* delta_minus, Bignum* delta_plus) { + bool in_range; + if (is_even) { + // For IEEE doubles half-way cases (in decimal system numbers ending with 5) + // are rounded to the closest floating-point number with even significand. + in_range = Bignum::PlusCompare(*numerator, *delta_plus, *denominator) >= 0; + } else { + in_range = Bignum::PlusCompare(*numerator, *delta_plus, *denominator) > 0; + } + if (in_range) { + // Since numerator + delta_plus >= denominator we already have + // 1 <= numerator/denominator < 10. Simply update the estimated_power. + *decimal_point = estimated_power + 1; + } else { + *decimal_point = estimated_power; + numerator->Times10(); + if (Bignum::Equal(*delta_minus, *delta_plus)) { + delta_minus->Times10(); + delta_plus->AssignBignum(*delta_minus); + } else { + delta_minus->Times10(); + delta_plus->Times10(); + } + } +} + +} // namespace double_conversion diff --git a/Foundation/src/bignum-dtoa.h b/Foundation/src/bignum-dtoa.h new file mode 100644 index 000000000..34b961992 --- /dev/null +++ b/Foundation/src/bignum-dtoa.h @@ -0,0 +1,84 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef DOUBLE_CONVERSION_BIGNUM_DTOA_H_ +#define DOUBLE_CONVERSION_BIGNUM_DTOA_H_ + +#include "utils.h" + +namespace double_conversion { + +enum BignumDtoaMode { + // Return the shortest correct representation. + // For example the output of 0.299999999999999988897 is (the less accurate but + // correct) 0.3. + BIGNUM_DTOA_SHORTEST, + // Same as BIGNUM_DTOA_SHORTEST but for single-precision floats. + BIGNUM_DTOA_SHORTEST_SINGLE, + // Return a fixed number of digits after the decimal point. + // For instance fixed(0.1, 4) becomes 0.1000 + // If the input number is big, the output will be big. + BIGNUM_DTOA_FIXED, + // Return a fixed number of digits, no matter what the exponent is. + BIGNUM_DTOA_PRECISION +}; + +// Converts the given double 'v' to ascii. +// The result should be interpreted as buffer * 10^(point-length). +// The buffer will be null-terminated. +// +// The input v must be > 0 and different from NaN, and Infinity. +// +// The output depends on the given mode: +// - SHORTEST: produce the least amount of digits for which the internal +// identity requirement is still satisfied. If the digits are printed +// (together with the correct exponent) then reading this number will give +// 'v' again. The buffer will choose the representation that is closest to +// 'v'. If there are two at the same distance, than the number is round up. +// In this mode the 'requested_digits' parameter is ignored. +// - FIXED: produces digits necessary to print a given number with +// 'requested_digits' digits after the decimal point. The produced digits +// might be too short in which case the caller has to fill the gaps with '0's. +// Example: toFixed(0.001, 5) is allowed to return buffer="1", point=-2. +// Halfway cases are rounded up. The call toFixed(0.15, 2) thus returns +// buffer="2", point=0. +// Note: the length of the returned buffer has no meaning wrt the significance +// of its digits. That is, just because it contains '0's does not mean that +// any other digit would not satisfy the internal identity requirement. +// - PRECISION: produces 'requested_digits' where the first digit is not '0'. +// Even though the length of produced digits usually equals +// 'requested_digits', the function is allowed to return fewer digits, in +// which case the caller has to fill the missing digits with '0's. +// Halfway cases are again rounded up. +// 'BignumDtoa' expects the given buffer to be big enough to hold all digits +// and a terminating null-character. +void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits, + Vector buffer, int* length, int* point); + +} // namespace double_conversion + +#endif // DOUBLE_CONVERSION_BIGNUM_DTOA_H_ diff --git a/Foundation/src/bignum.cc b/Foundation/src/bignum.cc new file mode 100644 index 000000000..747491a08 --- /dev/null +++ b/Foundation/src/bignum.cc @@ -0,0 +1,764 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "bignum.h" +#include "utils.h" + +namespace double_conversion { + +Bignum::Bignum() + : bigits_(bigits_buffer_, kBigitCapacity), used_digits_(0), exponent_(0) { + for (int i = 0; i < kBigitCapacity; ++i) { + bigits_[i] = 0; + } +} + + +template +static int BitSize(S value) { + return 8 * sizeof(value); +} + +// Guaranteed to lie in one Bigit. +void Bignum::AssignUInt16(uint16_t value) { + ASSERT(kBigitSize >= BitSize(value)); + Zero(); + if (value == 0) return; + + EnsureCapacity(1); + bigits_[0] = value; + used_digits_ = 1; +} + + +void Bignum::AssignUInt64(uint64_t value) { + const int kUInt64Size = 64; + + Zero(); + if (value == 0) return; + + int needed_bigits = kUInt64Size / kBigitSize + 1; + EnsureCapacity(needed_bigits); + for (int i = 0; i < needed_bigits; ++i) { + bigits_[i] = value & kBigitMask; + value = value >> kBigitSize; + } + used_digits_ = needed_bigits; + Clamp(); +} + + +void Bignum::AssignBignum(const Bignum& other) { + exponent_ = other.exponent_; + for (int i = 0; i < other.used_digits_; ++i) { + bigits_[i] = other.bigits_[i]; + } + // Clear the excess digits (if there were any). + for (int i = other.used_digits_; i < used_digits_; ++i) { + bigits_[i] = 0; + } + used_digits_ = other.used_digits_; +} + + +static uint64_t ReadUInt64(Vector buffer, + int from, + int digits_to_read) { + uint64_t result = 0; + for (int i = from; i < from + digits_to_read; ++i) { + int digit = buffer[i] - '0'; + ASSERT(0 <= digit && digit <= 9); + result = result * 10 + digit; + } + return result; +} + + +void Bignum::AssignDecimalString(Vector value) { + // 2^64 = 18446744073709551616 > 10^19 + const int kMaxUint64DecimalDigits = 19; + Zero(); + int length = value.length(); + int pos = 0; + // Let's just say that each digit needs 4 bits. + while (length >= kMaxUint64DecimalDigits) { + uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits); + pos += kMaxUint64DecimalDigits; + length -= kMaxUint64DecimalDigits; + MultiplyByPowerOfTen(kMaxUint64DecimalDigits); + AddUInt64(digits); + } + uint64_t digits = ReadUInt64(value, pos, length); + MultiplyByPowerOfTen(length); + AddUInt64(digits); + Clamp(); +} + + +static int HexCharValue(char c) { + if ('0' <= c && c <= '9') return c - '0'; + if ('a' <= c && c <= 'f') return 10 + c - 'a'; + if ('A' <= c && c <= 'F') return 10 + c - 'A'; + UNREACHABLE(); + return 0; // To make compiler happy. +} + + +void Bignum::AssignHexString(Vector value) { + Zero(); + int length = value.length(); + + int needed_bigits = length * 4 / kBigitSize + 1; + EnsureCapacity(needed_bigits); + int string_index = length - 1; + for (int i = 0; i < needed_bigits - 1; ++i) { + // These bigits are guaranteed to be "full". + Chunk current_bigit = 0; + for (int j = 0; j < kBigitSize / 4; j++) { + current_bigit += HexCharValue(value[string_index--]) << (j * 4); + } + bigits_[i] = current_bigit; + } + used_digits_ = needed_bigits - 1; + + Chunk most_significant_bigit = 0; // Could be = 0; + for (int j = 0; j <= string_index; ++j) { + most_significant_bigit <<= 4; + most_significant_bigit += HexCharValue(value[j]); + } + if (most_significant_bigit != 0) { + bigits_[used_digits_] = most_significant_bigit; + used_digits_++; + } + Clamp(); +} + + +void Bignum::AddUInt64(uint64_t operand) { + if (operand == 0) return; + Bignum other; + other.AssignUInt64(operand); + AddBignum(other); +} + + +void Bignum::AddBignum(const Bignum& other) { + ASSERT(IsClamped()); + ASSERT(other.IsClamped()); + + // If this has a greater exponent than other append zero-bigits to this. + // After this call exponent_ <= other.exponent_. + Align(other); + + // There are two possibilities: + // aaaaaaaaaaa 0000 (where the 0s represent a's exponent) + // bbbbb 00000000 + // ---------------- + // ccccccccccc 0000 + // or + // aaaaaaaaaa 0000 + // bbbbbbbbb 0000000 + // ----------------- + // cccccccccccc 0000 + // In both cases we might need a carry bigit. + + EnsureCapacity(1 + Max(BigitLength(), other.BigitLength()) - exponent_); + Chunk carry = 0; + int bigit_pos = other.exponent_ - exponent_; + ASSERT(bigit_pos >= 0); + for (int i = 0; i < other.used_digits_; ++i) { + Chunk sum = bigits_[bigit_pos] + other.bigits_[i] + carry; + bigits_[bigit_pos] = sum & kBigitMask; + carry = sum >> kBigitSize; + bigit_pos++; + } + + while (carry != 0) { + Chunk sum = bigits_[bigit_pos] + carry; + bigits_[bigit_pos] = sum & kBigitMask; + carry = sum >> kBigitSize; + bigit_pos++; + } + used_digits_ = Max(bigit_pos, used_digits_); + ASSERT(IsClamped()); +} + + +void Bignum::SubtractBignum(const Bignum& other) { + ASSERT(IsClamped()); + ASSERT(other.IsClamped()); + // We require this to be bigger than other. + ASSERT(LessEqual(other, *this)); + + Align(other); + + int offset = other.exponent_ - exponent_; + Chunk borrow = 0; + int i; + for (i = 0; i < other.used_digits_; ++i) { + ASSERT((borrow == 0) || (borrow == 1)); + Chunk difference = bigits_[i + offset] - other.bigits_[i] - borrow; + bigits_[i + offset] = difference & kBigitMask; + borrow = difference >> (kChunkSize - 1); + } + while (borrow != 0) { + Chunk difference = bigits_[i + offset] - borrow; + bigits_[i + offset] = difference & kBigitMask; + borrow = difference >> (kChunkSize - 1); + ++i; + } + Clamp(); +} + + +void Bignum::ShiftLeft(int shift_amount) { + if (used_digits_ == 0) return; + exponent_ += shift_amount / kBigitSize; + int local_shift = shift_amount % kBigitSize; + EnsureCapacity(used_digits_ + 1); + BigitsShiftLeft(local_shift); +} + + +void Bignum::MultiplyByUInt32(uint32_t factor) { + if (factor == 1) return; + if (factor == 0) { + Zero(); + return; + } + if (used_digits_ == 0) return; + + // The product of a bigit with the factor is of size kBigitSize + 32. + // Assert that this number + 1 (for the carry) fits into double chunk. + ASSERT(kDoubleChunkSize >= kBigitSize + 32 + 1); + DoubleChunk carry = 0; + for (int i = 0; i < used_digits_; ++i) { + DoubleChunk product = static_cast(factor) * bigits_[i] + carry; + bigits_[i] = static_cast(product & kBigitMask); + carry = (product >> kBigitSize); + } + while (carry != 0) { + EnsureCapacity(used_digits_ + 1); + bigits_[used_digits_] = carry & kBigitMask; + used_digits_++; + carry >>= kBigitSize; + } +} + + +void Bignum::MultiplyByUInt64(uint64_t factor) { + if (factor == 1) return; + if (factor == 0) { + Zero(); + return; + } + ASSERT(kBigitSize < 32); + uint64_t carry = 0; + uint64_t low = factor & 0xFFFFFFFF; + uint64_t high = factor >> 32; + for (int i = 0; i < used_digits_; ++i) { + uint64_t product_low = low * bigits_[i]; + uint64_t product_high = high * bigits_[i]; + uint64_t tmp = (carry & kBigitMask) + product_low; + bigits_[i] = tmp & kBigitMask; + carry = (carry >> kBigitSize) + (tmp >> kBigitSize) + + (product_high << (32 - kBigitSize)); + } + while (carry != 0) { + EnsureCapacity(used_digits_ + 1); + bigits_[used_digits_] = carry & kBigitMask; + used_digits_++; + carry >>= kBigitSize; + } +} + + +void Bignum::MultiplyByPowerOfTen(int exponent) { + const uint64_t kFive27 = UINT64_2PART_C(0x6765c793, fa10079d); + const uint16_t kFive1 = 5; + const uint16_t kFive2 = kFive1 * 5; + const uint16_t kFive3 = kFive2 * 5; + const uint16_t kFive4 = kFive3 * 5; + const uint16_t kFive5 = kFive4 * 5; + const uint16_t kFive6 = kFive5 * 5; + const uint32_t kFive7 = kFive6 * 5; + const uint32_t kFive8 = kFive7 * 5; + const uint32_t kFive9 = kFive8 * 5; + const uint32_t kFive10 = kFive9 * 5; + const uint32_t kFive11 = kFive10 * 5; + const uint32_t kFive12 = kFive11 * 5; + const uint32_t kFive13 = kFive12 * 5; + const uint32_t kFive1_to_12[] = + { kFive1, kFive2, kFive3, kFive4, kFive5, kFive6, + kFive7, kFive8, kFive9, kFive10, kFive11, kFive12 }; + + ASSERT(exponent >= 0); + if (exponent == 0) return; + if (used_digits_ == 0) return; + + // We shift by exponent at the end just before returning. + int remaining_exponent = exponent; + while (remaining_exponent >= 27) { + MultiplyByUInt64(kFive27); + remaining_exponent -= 27; + } + while (remaining_exponent >= 13) { + MultiplyByUInt32(kFive13); + remaining_exponent -= 13; + } + if (remaining_exponent > 0) { + MultiplyByUInt32(kFive1_to_12[remaining_exponent - 1]); + } + ShiftLeft(exponent); +} + + +void Bignum::Square() { + ASSERT(IsClamped()); + int product_length = 2 * used_digits_; + EnsureCapacity(product_length); + + // Comba multiplication: compute each column separately. + // Example: r = a2a1a0 * b2b1b0. + // r = 1 * a0b0 + + // 10 * (a1b0 + a0b1) + + // 100 * (a2b0 + a1b1 + a0b2) + + // 1000 * (a2b1 + a1b2) + + // 10000 * a2b2 + // + // In the worst case we have to accumulate nb-digits products of digit*digit. + // + // Assert that the additional number of bits in a DoubleChunk are enough to + // sum up used_digits of Bigit*Bigit. + if ((1 << (2 * (kChunkSize - kBigitSize))) <= used_digits_) { + UNIMPLEMENTED(); + } + DoubleChunk accumulator = 0; + // First shift the digits so we don't overwrite them. + int copy_offset = used_digits_; + for (int i = 0; i < used_digits_; ++i) { + bigits_[copy_offset + i] = bigits_[i]; + } + // We have two loops to avoid some 'if's in the loop. + for (int i = 0; i < used_digits_; ++i) { + // Process temporary digit i with power i. + // The sum of the two indices must be equal to i. + int bigit_index1 = i; + int bigit_index2 = 0; + // Sum all of the sub-products. + while (bigit_index1 >= 0) { + Chunk chunk1 = bigits_[copy_offset + bigit_index1]; + Chunk chunk2 = bigits_[copy_offset + bigit_index2]; + accumulator += static_cast(chunk1) * chunk2; + bigit_index1--; + bigit_index2++; + } + bigits_[i] = static_cast(accumulator) & kBigitMask; + accumulator >>= kBigitSize; + } + for (int i = used_digits_; i < product_length; ++i) { + int bigit_index1 = used_digits_ - 1; + int bigit_index2 = i - bigit_index1; + // Invariant: sum of both indices is again equal to i. + // Inner loop runs 0 times on last iteration, emptying accumulator. + while (bigit_index2 < used_digits_) { + Chunk chunk1 = bigits_[copy_offset + bigit_index1]; + Chunk chunk2 = bigits_[copy_offset + bigit_index2]; + accumulator += static_cast(chunk1) * chunk2; + bigit_index1--; + bigit_index2++; + } + // The overwritten bigits_[i] will never be read in further loop iterations, + // because bigit_index1 and bigit_index2 are always greater + // than i - used_digits_. + bigits_[i] = static_cast(accumulator) & kBigitMask; + accumulator >>= kBigitSize; + } + // Since the result was guaranteed to lie inside the number the + // accumulator must be 0 now. + ASSERT(accumulator == 0); + + // Don't forget to update the used_digits and the exponent. + used_digits_ = product_length; + exponent_ *= 2; + Clamp(); +} + + +void Bignum::AssignPowerUInt16(uint16_t base, int power_exponent) { + ASSERT(base != 0); + ASSERT(power_exponent >= 0); + if (power_exponent == 0) { + AssignUInt16(1); + return; + } + Zero(); + int shifts = 0; + // We expect base to be in range 2-32, and most often to be 10. + // It does not make much sense to implement different algorithms for counting + // the bits. + while ((base & 1) == 0) { + base >>= 1; + shifts++; + } + int bit_size = 0; + int tmp_base = base; + while (tmp_base != 0) { + tmp_base >>= 1; + bit_size++; + } + int final_size = bit_size * power_exponent; + // 1 extra bigit for the shifting, and one for rounded final_size. + EnsureCapacity(final_size / kBigitSize + 2); + + // Left to Right exponentiation. + int mask = 1; + while (power_exponent >= mask) mask <<= 1; + + // The mask is now pointing to the bit above the most significant 1-bit of + // power_exponent. + // Get rid of first 1-bit; + mask >>= 2; + uint64_t this_value = base; + + bool delayed_multipliciation = false; + const uint64_t max_32bits = 0xFFFFFFFF; + while (mask != 0 && this_value <= max_32bits) { + this_value = this_value * this_value; + // Verify that there is enough space in this_value to perform the + // multiplication. The first bit_size bits must be 0. + if ((power_exponent & mask) != 0) { + uint64_t base_bits_mask = + ~((static_cast(1) << (64 - bit_size)) - 1); + bool high_bits_zero = (this_value & base_bits_mask) == 0; + if (high_bits_zero) { + this_value *= base; + } else { + delayed_multipliciation = true; + } + } + mask >>= 1; + } + AssignUInt64(this_value); + if (delayed_multipliciation) { + MultiplyByUInt32(base); + } + + // Now do the same thing as a bignum. + while (mask != 0) { + Square(); + if ((power_exponent & mask) != 0) { + MultiplyByUInt32(base); + } + mask >>= 1; + } + + // And finally add the saved shifts. + ShiftLeft(shifts * power_exponent); +} + + +// Precondition: this/other < 16bit. +uint16_t Bignum::DivideModuloIntBignum(const Bignum& other) { + ASSERT(IsClamped()); + ASSERT(other.IsClamped()); + ASSERT(other.used_digits_ > 0); + + // Easy case: if we have less digits than the divisor than the result is 0. + // Note: this handles the case where this == 0, too. + if (BigitLength() < other.BigitLength()) { + return 0; + } + + Align(other); + + uint16_t result = 0; + + // Start by removing multiples of 'other' until both numbers have the same + // number of digits. + while (BigitLength() > other.BigitLength()) { + // This naive approach is extremely inefficient if the this divided other + // might be big. This function is implemented for doubleToString where + // the result should be small (less than 10). + ASSERT(other.bigits_[other.used_digits_ - 1] >= ((1 << kBigitSize) / 16)); + // Remove the multiples of the first digit. + // Example this = 23 and other equals 9. -> Remove 2 multiples. + result += bigits_[used_digits_ - 1]; + SubtractTimes(other, bigits_[used_digits_ - 1]); + } + + ASSERT(BigitLength() == other.BigitLength()); + + // Both bignums are at the same length now. + // Since other has more than 0 digits we know that the access to + // bigits_[used_digits_ - 1] is safe. + Chunk this_bigit = bigits_[used_digits_ - 1]; + Chunk other_bigit = other.bigits_[other.used_digits_ - 1]; + + if (other.used_digits_ == 1) { + // Shortcut for easy (and common) case. + int quotient = this_bigit / other_bigit; + bigits_[used_digits_ - 1] = this_bigit - other_bigit * quotient; + result += quotient; + Clamp(); + return result; + } + + int division_estimate = this_bigit / (other_bigit + 1); + result += division_estimate; + SubtractTimes(other, division_estimate); + + if (other_bigit * (division_estimate + 1) > this_bigit) { + // No need to even try to subtract. Even if other's remaining digits were 0 + // another subtraction would be too much. + return result; + } + + while (LessEqual(other, *this)) { + SubtractBignum(other); + result++; + } + return result; +} + + +template +static int SizeInHexChars(S number) { + ASSERT(number > 0); + int result = 0; + while (number != 0) { + number >>= 4; + result++; + } + return result; +} + + +static char HexCharOfValue(int value) { + ASSERT(0 <= value && value <= 16); + if (value < 10) return value + '0'; + return value - 10 + 'A'; +} + + +bool Bignum::ToHexString(char* buffer, int buffer_size) const { + ASSERT(IsClamped()); + // Each bigit must be printable as separate hex-character. + ASSERT(kBigitSize % 4 == 0); + const int kHexCharsPerBigit = kBigitSize / 4; + + if (used_digits_ == 0) { + if (buffer_size < 2) return false; + buffer[0] = '0'; + buffer[1] = '\0'; + return true; + } + // We add 1 for the terminating '\0' character. + int needed_chars = (BigitLength() - 1) * kHexCharsPerBigit + + SizeInHexChars(bigits_[used_digits_ - 1]) + 1; + if (needed_chars > buffer_size) return false; + int string_index = needed_chars - 1; + buffer[string_index--] = '\0'; + for (int i = 0; i < exponent_; ++i) { + for (int j = 0; j < kHexCharsPerBigit; ++j) { + buffer[string_index--] = '0'; + } + } + for (int i = 0; i < used_digits_ - 1; ++i) { + Chunk current_bigit = bigits_[i]; + for (int j = 0; j < kHexCharsPerBigit; ++j) { + buffer[string_index--] = HexCharOfValue(current_bigit & 0xF); + current_bigit >>= 4; + } + } + // And finally the last bigit. + Chunk most_significant_bigit = bigits_[used_digits_ - 1]; + while (most_significant_bigit != 0) { + buffer[string_index--] = HexCharOfValue(most_significant_bigit & 0xF); + most_significant_bigit >>= 4; + } + return true; +} + + +Bignum::Chunk Bignum::BigitAt(int index) const { + if (index >= BigitLength()) return 0; + if (index < exponent_) return 0; + return bigits_[index - exponent_]; +} + + +int Bignum::Compare(const Bignum& a, const Bignum& b) { + ASSERT(a.IsClamped()); + ASSERT(b.IsClamped()); + int bigit_length_a = a.BigitLength(); + int bigit_length_b = b.BigitLength(); + if (bigit_length_a < bigit_length_b) return -1; + if (bigit_length_a > bigit_length_b) return +1; + for (int i = bigit_length_a - 1; i >= Min(a.exponent_, b.exponent_); --i) { + Chunk bigit_a = a.BigitAt(i); + Chunk bigit_b = b.BigitAt(i); + if (bigit_a < bigit_b) return -1; + if (bigit_a > bigit_b) return +1; + // Otherwise they are equal up to this digit. Try the next digit. + } + return 0; +} + + +int Bignum::PlusCompare(const Bignum& a, const Bignum& b, const Bignum& c) { + ASSERT(a.IsClamped()); + ASSERT(b.IsClamped()); + ASSERT(c.IsClamped()); + if (a.BigitLength() < b.BigitLength()) { + return PlusCompare(b, a, c); + } + if (a.BigitLength() + 1 < c.BigitLength()) return -1; + if (a.BigitLength() > c.BigitLength()) return +1; + // The exponent encodes 0-bigits. So if there are more 0-digits in 'a' than + // 'b' has digits, then the bigit-length of 'a'+'b' must be equal to the one + // of 'a'. + if (a.exponent_ >= b.BigitLength() && a.BigitLength() < c.BigitLength()) { + return -1; + } + + Chunk borrow = 0; + // Starting at min_exponent all digits are == 0. So no need to compare them. + int min_exponent = Min(Min(a.exponent_, b.exponent_), c.exponent_); + for (int i = c.BigitLength() - 1; i >= min_exponent; --i) { + Chunk chunk_a = a.BigitAt(i); + Chunk chunk_b = b.BigitAt(i); + Chunk chunk_c = c.BigitAt(i); + Chunk sum = chunk_a + chunk_b; + if (sum > chunk_c + borrow) { + return +1; + } else { + borrow = chunk_c + borrow - sum; + if (borrow > 1) return -1; + borrow <<= kBigitSize; + } + } + if (borrow == 0) return 0; + return -1; +} + + +void Bignum::Clamp() { + while (used_digits_ > 0 && bigits_[used_digits_ - 1] == 0) { + used_digits_--; + } + if (used_digits_ == 0) { + // Zero. + exponent_ = 0; + } +} + + +bool Bignum::IsClamped() const { + return used_digits_ == 0 || bigits_[used_digits_ - 1] != 0; +} + + +void Bignum::Zero() { + for (int i = 0; i < used_digits_; ++i) { + bigits_[i] = 0; + } + used_digits_ = 0; + exponent_ = 0; +} + + +void Bignum::Align(const Bignum& other) { + if (exponent_ > other.exponent_) { + // If "X" represents a "hidden" digit (by the exponent) then we are in the + // following case (a == this, b == other): + // a: aaaaaaXXXX or a: aaaaaXXX + // b: bbbbbbX b: bbbbbbbbXX + // We replace some of the hidden digits (X) of a with 0 digits. + // a: aaaaaa000X or a: aaaaa0XX + int zero_digits = exponent_ - other.exponent_; + EnsureCapacity(used_digits_ + zero_digits); + for (int i = used_digits_ - 1; i >= 0; --i) { + bigits_[i + zero_digits] = bigits_[i]; + } + for (int i = 0; i < zero_digits; ++i) { + bigits_[i] = 0; + } + used_digits_ += zero_digits; + exponent_ -= zero_digits; + ASSERT(used_digits_ >= 0); + ASSERT(exponent_ >= 0); + } +} + + +void Bignum::BigitsShiftLeft(int shift_amount) { + ASSERT(shift_amount < kBigitSize); + ASSERT(shift_amount >= 0); + Chunk carry = 0; + for (int i = 0; i < used_digits_; ++i) { + Chunk new_carry = bigits_[i] >> (kBigitSize - shift_amount); + bigits_[i] = ((bigits_[i] << shift_amount) + carry) & kBigitMask; + carry = new_carry; + } + if (carry != 0) { + bigits_[used_digits_] = carry; + used_digits_++; + } +} + + +void Bignum::SubtractTimes(const Bignum& other, int factor) { + ASSERT(exponent_ <= other.exponent_); + if (factor < 3) { + for (int i = 0; i < factor; ++i) { + SubtractBignum(other); + } + return; + } + Chunk borrow = 0; + int exponent_diff = other.exponent_ - exponent_; + for (int i = 0; i < other.used_digits_; ++i) { + DoubleChunk product = static_cast(factor) * other.bigits_[i]; + DoubleChunk remove = borrow + product; + Chunk difference = bigits_[i + exponent_diff] - (remove & kBigitMask); + bigits_[i + exponent_diff] = difference & kBigitMask; + borrow = static_cast((difference >> (kChunkSize - 1)) + + (remove >> kBigitSize)); + } + for (int i = other.used_digits_ + exponent_diff; i < used_digits_; ++i) { + if (borrow == 0) return; + Chunk difference = bigits_[i] - borrow; + bigits_[i] = difference & kBigitMask; + borrow = difference >> (kChunkSize - 1); + ++i; + } + Clamp(); +} + + +} // namespace double_conversion diff --git a/Foundation/src/bignum.h b/Foundation/src/bignum.h new file mode 100644 index 000000000..5ec3544f5 --- /dev/null +++ b/Foundation/src/bignum.h @@ -0,0 +1,145 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef DOUBLE_CONVERSION_BIGNUM_H_ +#define DOUBLE_CONVERSION_BIGNUM_H_ + +#include "utils.h" + +namespace double_conversion { + +class Bignum { + public: + // 3584 = 128 * 28. We can represent 2^3584 > 10^1000 accurately. + // This bignum can encode much bigger numbers, since it contains an + // exponent. + static const int kMaxSignificantBits = 3584; + + Bignum(); + void AssignUInt16(uint16_t value); + void AssignUInt64(uint64_t value); + void AssignBignum(const Bignum& other); + + void AssignDecimalString(Vector value); + void AssignHexString(Vector value); + + void AssignPowerUInt16(uint16_t base, int exponent); + + void AddUInt16(uint16_t operand); + void AddUInt64(uint64_t operand); + void AddBignum(const Bignum& other); + // Precondition: this >= other. + void SubtractBignum(const Bignum& other); + + void Square(); + void ShiftLeft(int shift_amount); + void MultiplyByUInt32(uint32_t factor); + void MultiplyByUInt64(uint64_t factor); + void MultiplyByPowerOfTen(int exponent); + void Times10() { return MultiplyByUInt32(10); } + // Pseudocode: + // int result = this / other; + // this = this % other; + // In the worst case this function is in O(this/other). + uint16_t DivideModuloIntBignum(const Bignum& other); + + bool ToHexString(char* buffer, int buffer_size) const; + + // Returns + // -1 if a < b, + // 0 if a == b, and + // +1 if a > b. + static int Compare(const Bignum& a, const Bignum& b); + static bool Equal(const Bignum& a, const Bignum& b) { + return Compare(a, b) == 0; + } + static bool LessEqual(const Bignum& a, const Bignum& b) { + return Compare(a, b) <= 0; + } + static bool Less(const Bignum& a, const Bignum& b) { + return Compare(a, b) < 0; + } + // Returns Compare(a + b, c); + static int PlusCompare(const Bignum& a, const Bignum& b, const Bignum& c); + // Returns a + b == c + static bool PlusEqual(const Bignum& a, const Bignum& b, const Bignum& c) { + return PlusCompare(a, b, c) == 0; + } + // Returns a + b <= c + static bool PlusLessEqual(const Bignum& a, const Bignum& b, const Bignum& c) { + return PlusCompare(a, b, c) <= 0; + } + // Returns a + b < c + static bool PlusLess(const Bignum& a, const Bignum& b, const Bignum& c) { + return PlusCompare(a, b, c) < 0; + } + private: + typedef uint32_t Chunk; + typedef uint64_t DoubleChunk; + + static const int kChunkSize = sizeof(Chunk) * 8; + static const int kDoubleChunkSize = sizeof(DoubleChunk) * 8; + // With bigit size of 28 we loose some bits, but a double still fits easily + // into two chunks, and more importantly we can use the Comba multiplication. + static const int kBigitSize = 28; + static const Chunk kBigitMask = (1 << kBigitSize) - 1; + // Every instance allocates kBigitLength chunks on the stack. Bignums cannot + // grow. There are no checks if the stack-allocated space is sufficient. + static const int kBigitCapacity = kMaxSignificantBits / kBigitSize; + + void EnsureCapacity(int size) { + if (size > kBigitCapacity) { + UNREACHABLE(); + } + } + void Align(const Bignum& other); + void Clamp(); + bool IsClamped() const; + void Zero(); + // Requires this to have enough capacity (no tests done). + // Updates used_digits_ if necessary. + // shift_amount must be < kBigitSize. + void BigitsShiftLeft(int shift_amount); + // BigitLength includes the "hidden" digits encoded in the exponent. + int BigitLength() const { return used_digits_ + exponent_; } + Chunk BigitAt(int index) const; + void SubtractTimes(const Bignum& other, int factor); + + Chunk bigits_buffer_[kBigitCapacity]; + // A vector backed by bigits_buffer_. This way accesses to the array are + // checked for out-of-bounds errors. + Vector bigits_; + int used_digits_; + // The Bignum's value equals value(bigits_) * 2^(exponent_ * kBigitSize). + int exponent_; + + DISALLOW_COPY_AND_ASSIGN(Bignum); +}; + +} // namespace double_conversion + +#endif // DOUBLE_CONVERSION_BIGNUM_H_ diff --git a/Foundation/src/cached-powers.cc b/Foundation/src/cached-powers.cc new file mode 100644 index 000000000..c67642919 --- /dev/null +++ b/Foundation/src/cached-powers.cc @@ -0,0 +1,175 @@ +// Copyright 2006-2008 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include +#include +#include + +#include "utils.h" + +#include "cached-powers.h" + +namespace double_conversion { + +struct CachedPower { + uint64_t significand; + int16_t binary_exponent; + int16_t decimal_exponent; +}; + +static const CachedPower kCachedPowers[] = { + {UINT64_2PART_C(0xfa8fd5a0, 081c0288), -1220, -348}, + {UINT64_2PART_C(0xbaaee17f, a23ebf76), -1193, -340}, + {UINT64_2PART_C(0x8b16fb20, 3055ac76), -1166, -332}, + {UINT64_2PART_C(0xcf42894a, 5dce35ea), -1140, -324}, + {UINT64_2PART_C(0x9a6bb0aa, 55653b2d), -1113, -316}, + {UINT64_2PART_C(0xe61acf03, 3d1a45df), -1087, -308}, + {UINT64_2PART_C(0xab70fe17, c79ac6ca), -1060, -300}, + {UINT64_2PART_C(0xff77b1fc, bebcdc4f), -1034, -292}, + {UINT64_2PART_C(0xbe5691ef, 416bd60c), -1007, -284}, + {UINT64_2PART_C(0x8dd01fad, 907ffc3c), -980, -276}, + {UINT64_2PART_C(0xd3515c28, 31559a83), -954, -268}, + {UINT64_2PART_C(0x9d71ac8f, ada6c9b5), -927, -260}, + {UINT64_2PART_C(0xea9c2277, 23ee8bcb), -901, -252}, + {UINT64_2PART_C(0xaecc4991, 4078536d), -874, -244}, + {UINT64_2PART_C(0x823c1279, 5db6ce57), -847, -236}, + {UINT64_2PART_C(0xc2109436, 4dfb5637), -821, -228}, + {UINT64_2PART_C(0x9096ea6f, 3848984f), -794, -220}, + {UINT64_2PART_C(0xd77485cb, 25823ac7), -768, -212}, + {UINT64_2PART_C(0xa086cfcd, 97bf97f4), -741, -204}, + {UINT64_2PART_C(0xef340a98, 172aace5), -715, -196}, + {UINT64_2PART_C(0xb23867fb, 2a35b28e), -688, -188}, + {UINT64_2PART_C(0x84c8d4df, d2c63f3b), -661, -180}, + {UINT64_2PART_C(0xc5dd4427, 1ad3cdba), -635, -172}, + {UINT64_2PART_C(0x936b9fce, bb25c996), -608, -164}, + {UINT64_2PART_C(0xdbac6c24, 7d62a584), -582, -156}, + {UINT64_2PART_C(0xa3ab6658, 0d5fdaf6), -555, -148}, + {UINT64_2PART_C(0xf3e2f893, dec3f126), -529, -140}, + {UINT64_2PART_C(0xb5b5ada8, aaff80b8), -502, -132}, + {UINT64_2PART_C(0x87625f05, 6c7c4a8b), -475, -124}, + {UINT64_2PART_C(0xc9bcff60, 34c13053), -449, -116}, + {UINT64_2PART_C(0x964e858c, 91ba2655), -422, -108}, + {UINT64_2PART_C(0xdff97724, 70297ebd), -396, -100}, + {UINT64_2PART_C(0xa6dfbd9f, b8e5b88f), -369, -92}, + {UINT64_2PART_C(0xf8a95fcf, 88747d94), -343, -84}, + {UINT64_2PART_C(0xb9447093, 8fa89bcf), -316, -76}, + {UINT64_2PART_C(0x8a08f0f8, bf0f156b), -289, -68}, + {UINT64_2PART_C(0xcdb02555, 653131b6), -263, -60}, + {UINT64_2PART_C(0x993fe2c6, d07b7fac), -236, -52}, + {UINT64_2PART_C(0xe45c10c4, 2a2b3b06), -210, -44}, + {UINT64_2PART_C(0xaa242499, 697392d3), -183, -36}, + {UINT64_2PART_C(0xfd87b5f2, 8300ca0e), -157, -28}, + {UINT64_2PART_C(0xbce50864, 92111aeb), -130, -20}, + {UINT64_2PART_C(0x8cbccc09, 6f5088cc), -103, -12}, + {UINT64_2PART_C(0xd1b71758, e219652c), -77, -4}, + {UINT64_2PART_C(0x9c400000, 00000000), -50, 4}, + {UINT64_2PART_C(0xe8d4a510, 00000000), -24, 12}, + {UINT64_2PART_C(0xad78ebc5, ac620000), 3, 20}, + {UINT64_2PART_C(0x813f3978, f8940984), 30, 28}, + {UINT64_2PART_C(0xc097ce7b, c90715b3), 56, 36}, + {UINT64_2PART_C(0x8f7e32ce, 7bea5c70), 83, 44}, + {UINT64_2PART_C(0xd5d238a4, abe98068), 109, 52}, + {UINT64_2PART_C(0x9f4f2726, 179a2245), 136, 60}, + {UINT64_2PART_C(0xed63a231, d4c4fb27), 162, 68}, + {UINT64_2PART_C(0xb0de6538, 8cc8ada8), 189, 76}, + {UINT64_2PART_C(0x83c7088e, 1aab65db), 216, 84}, + {UINT64_2PART_C(0xc45d1df9, 42711d9a), 242, 92}, + {UINT64_2PART_C(0x924d692c, a61be758), 269, 100}, + {UINT64_2PART_C(0xda01ee64, 1a708dea), 295, 108}, + {UINT64_2PART_C(0xa26da399, 9aef774a), 322, 116}, + {UINT64_2PART_C(0xf209787b, b47d6b85), 348, 124}, + {UINT64_2PART_C(0xb454e4a1, 79dd1877), 375, 132}, + {UINT64_2PART_C(0x865b8692, 5b9bc5c2), 402, 140}, + {UINT64_2PART_C(0xc83553c5, c8965d3d), 428, 148}, + {UINT64_2PART_C(0x952ab45c, fa97a0b3), 455, 156}, + {UINT64_2PART_C(0xde469fbd, 99a05fe3), 481, 164}, + {UINT64_2PART_C(0xa59bc234, db398c25), 508, 172}, + {UINT64_2PART_C(0xf6c69a72, a3989f5c), 534, 180}, + {UINT64_2PART_C(0xb7dcbf53, 54e9bece), 561, 188}, + {UINT64_2PART_C(0x88fcf317, f22241e2), 588, 196}, + {UINT64_2PART_C(0xcc20ce9b, d35c78a5), 614, 204}, + {UINT64_2PART_C(0x98165af3, 7b2153df), 641, 212}, + {UINT64_2PART_C(0xe2a0b5dc, 971f303a), 667, 220}, + {UINT64_2PART_C(0xa8d9d153, 5ce3b396), 694, 228}, + {UINT64_2PART_C(0xfb9b7cd9, a4a7443c), 720, 236}, + {UINT64_2PART_C(0xbb764c4c, a7a44410), 747, 244}, + {UINT64_2PART_C(0x8bab8eef, b6409c1a), 774, 252}, + {UINT64_2PART_C(0xd01fef10, a657842c), 800, 260}, + {UINT64_2PART_C(0x9b10a4e5, e9913129), 827, 268}, + {UINT64_2PART_C(0xe7109bfb, a19c0c9d), 853, 276}, + {UINT64_2PART_C(0xac2820d9, 623bf429), 880, 284}, + {UINT64_2PART_C(0x80444b5e, 7aa7cf85), 907, 292}, + {UINT64_2PART_C(0xbf21e440, 03acdd2d), 933, 300}, + {UINT64_2PART_C(0x8e679c2f, 5e44ff8f), 960, 308}, + {UINT64_2PART_C(0xd433179d, 9c8cb841), 986, 316}, + {UINT64_2PART_C(0x9e19db92, b4e31ba9), 1013, 324}, + {UINT64_2PART_C(0xeb96bf6e, badf77d9), 1039, 332}, + {UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340}, +}; + +static const int kCachedPowersLength = ARRAY_SIZE(kCachedPowers); +static const int kCachedPowersOffset = 348; // -1 * the first decimal_exponent. +static const double kD_1_LOG2_10 = 0.30102999566398114; // 1 / lg(10) +// Difference between the decimal exponents in the table above. +const int PowersOfTenCache::kDecimalExponentDistance = 8; +const int PowersOfTenCache::kMinDecimalExponent = -348; +const int PowersOfTenCache::kMaxDecimalExponent = 340; + +void PowersOfTenCache::GetCachedPowerForBinaryExponentRange( + int min_exponent, + int max_exponent, + DiyFp* power, + int* decimal_exponent) { + int kQ = DiyFp::kSignificandSize; + double k = ceil((min_exponent + kQ - 1) * kD_1_LOG2_10); + int foo = kCachedPowersOffset; + int index = + (foo + static_cast(k) - 1) / kDecimalExponentDistance + 1; + ASSERT(0 <= index && index < kCachedPowersLength); + CachedPower cached_power = kCachedPowers[index]; + ASSERT(min_exponent <= cached_power.binary_exponent); + ASSERT(cached_power.binary_exponent <= max_exponent); + *decimal_exponent = cached_power.decimal_exponent; + *power = DiyFp(cached_power.significand, cached_power.binary_exponent); +} + + +void PowersOfTenCache::GetCachedPowerForDecimalExponent(int requested_exponent, + DiyFp* power, + int* found_exponent) { + ASSERT(kMinDecimalExponent <= requested_exponent); + ASSERT(requested_exponent < kMaxDecimalExponent + kDecimalExponentDistance); + int index = + (requested_exponent + kCachedPowersOffset) / kDecimalExponentDistance; + CachedPower cached_power = kCachedPowers[index]; + *power = DiyFp(cached_power.significand, cached_power.binary_exponent); + *found_exponent = cached_power.decimal_exponent; + ASSERT(*found_exponent <= requested_exponent); + ASSERT(requested_exponent < *found_exponent + kDecimalExponentDistance); +} + +} // namespace double_conversion diff --git a/Foundation/src/cached-powers.h b/Foundation/src/cached-powers.h new file mode 100644 index 000000000..61a50614c --- /dev/null +++ b/Foundation/src/cached-powers.h @@ -0,0 +1,64 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef DOUBLE_CONVERSION_CACHED_POWERS_H_ +#define DOUBLE_CONVERSION_CACHED_POWERS_H_ + +#include "diy-fp.h" + +namespace double_conversion { + +class PowersOfTenCache { + public: + + // Not all powers of ten are cached. The decimal exponent of two neighboring + // cached numbers will differ by kDecimalExponentDistance. + static const int kDecimalExponentDistance; + + static const int kMinDecimalExponent; + static const int kMaxDecimalExponent; + + // Returns a cached power-of-ten with a binary exponent in the range + // [min_exponent; max_exponent] (boundaries included). + static void GetCachedPowerForBinaryExponentRange(int min_exponent, + int max_exponent, + DiyFp* power, + int* decimal_exponent); + + // Returns a cached power of ten x ~= 10^k such that + // k <= decimal_exponent < k + kCachedPowersDecimalDistance. + // The given decimal_exponent must satisfy + // kMinDecimalExponent <= requested_exponent, and + // requested_exponent < kMaxDecimalExponent + kDecimalExponentDistance. + static void GetCachedPowerForDecimalExponent(int requested_exponent, + DiyFp* power, + int* found_exponent); +}; + +} // namespace double_conversion + +#endif // DOUBLE_CONVERSION_CACHED_POWERS_H_ diff --git a/Foundation/src/diy-fp.cc b/Foundation/src/diy-fp.cc new file mode 100644 index 000000000..ddd1891b1 --- /dev/null +++ b/Foundation/src/diy-fp.cc @@ -0,0 +1,57 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +#include "diy-fp.h" +#include "utils.h" + +namespace double_conversion { + +void DiyFp::Multiply(const DiyFp& other) { + // Simply "emulates" a 128 bit multiplication. + // However: the resulting number only contains 64 bits. The least + // significant 64 bits are only used for rounding the most significant 64 + // bits. + const uint64_t kM32 = 0xFFFFFFFFU; + uint64_t a = f_ >> 32; + uint64_t b = f_ & kM32; + uint64_t c = other.f_ >> 32; + uint64_t d = other.f_ & kM32; + uint64_t ac = a * c; + uint64_t bc = b * c; + uint64_t ad = a * d; + uint64_t bd = b * d; + uint64_t tmp = (bd >> 32) + (ad & kM32) + (bc & kM32); + // By adding 1U << 31 to tmp we round the final result. + // Halfway cases will be round up. + tmp += 1U << 31; + uint64_t result_f = ac + (ad >> 32) + (bc >> 32) + (tmp >> 32); + e_ += other.e_ + 64; + f_ = result_f; +} + +} // namespace double_conversion diff --git a/Foundation/src/diy-fp.h b/Foundation/src/diy-fp.h new file mode 100644 index 000000000..9dcf8fbdb --- /dev/null +++ b/Foundation/src/diy-fp.h @@ -0,0 +1,118 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef DOUBLE_CONVERSION_DIY_FP_H_ +#define DOUBLE_CONVERSION_DIY_FP_H_ + +#include "utils.h" + +namespace double_conversion { + +// This "Do It Yourself Floating Point" class implements a floating-point number +// with a uint64 significand and an int exponent. Normalized DiyFp numbers will +// have the most significant bit of the significand set. +// Multiplication and Subtraction do not normalize their results. +// DiyFp are not designed to contain special doubles (NaN and Infinity). +class DiyFp { + public: + static const int kSignificandSize = 64; + + DiyFp() : f_(0), e_(0) {} + DiyFp(uint64_t f, int e) : f_(f), e_(e) {} + + // this = this - other. + // The exponents of both numbers must be the same and the significand of this + // must be bigger than the significand of other. + // The result will not be normalized. + void Subtract(const DiyFp& other) { + ASSERT(e_ == other.e_); + ASSERT(f_ >= other.f_); + f_ -= other.f_; + } + + // Returns a - b. + // The exponents of both numbers must be the same and this must be bigger + // than other. The result will not be normalized. + static DiyFp Minus(const DiyFp& a, const DiyFp& b) { + DiyFp result = a; + result.Subtract(b); + return result; + } + + + // this = this * other. + void Multiply(const DiyFp& other); + + // returns a * b; + static DiyFp Times(const DiyFp& a, const DiyFp& b) { + DiyFp result = a; + result.Multiply(b); + return result; + } + + void Normalize() { + ASSERT(f_ != 0); + uint64_t f = f_; + int e = e_; + + // This method is mainly called for normalizing boundaries. In general + // boundaries need to be shifted by 10 bits. We thus optimize for this case. + const uint64_t k10MSBits = UINT64_2PART_C(0xFFC00000, 00000000); + while ((f & k10MSBits) == 0) { + f <<= 10; + e -= 10; + } + while ((f & kUint64MSB) == 0) { + f <<= 1; + e--; + } + f_ = f; + e_ = e; + } + + static DiyFp Normalize(const DiyFp& a) { + DiyFp result = a; + result.Normalize(); + return result; + } + + uint64_t f() const { return f_; } + int e() const { return e_; } + + void set_f(uint64_t new_value) { f_ = new_value; } + void set_e(int new_value) { e_ = new_value; } + + private: + static const uint64_t kUint64MSB = UINT64_2PART_C(0x80000000, 00000000); + + uint64_t f_; + int e_; +}; + +} // namespace double_conversion + +#endif // DOUBLE_CONVERSION_DIY_FP_H_ diff --git a/Foundation/src/double-conversion.cc b/Foundation/src/double-conversion.cc new file mode 100644 index 000000000..a79fe92d2 --- /dev/null +++ b/Foundation/src/double-conversion.cc @@ -0,0 +1,889 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include +#include + +#include "double-conversion.h" + +#include "bignum-dtoa.h" +#include "fast-dtoa.h" +#include "fixed-dtoa.h" +#include "ieee.h" +#include "strtod.h" +#include "utils.h" + +namespace double_conversion { + +const DoubleToStringConverter& DoubleToStringConverter::EcmaScriptConverter() { + int flags = UNIQUE_ZERO | EMIT_POSITIVE_EXPONENT_SIGN; + static DoubleToStringConverter converter(flags, + "Infinity", + "NaN", + 'e', + -6, 21, + 6, 0); + return converter; +} + + +bool DoubleToStringConverter::HandleSpecialValues( + double value, + StringBuilder* result_builder) const { + Double double_inspect(value); + if (double_inspect.IsInfinite()) { + if (infinity_symbol_ == NULL) return false; + if (value < 0) { + result_builder->AddCharacter('-'); + } + result_builder->AddString(infinity_symbol_); + return true; + } + if (double_inspect.IsNan()) { + if (nan_symbol_ == NULL) return false; + result_builder->AddString(nan_symbol_); + return true; + } + return false; +} + + +void DoubleToStringConverter::CreateExponentialRepresentation( + const char* decimal_digits, + int length, + int exponent, + StringBuilder* result_builder) const { + ASSERT(length != 0); + result_builder->AddCharacter(decimal_digits[0]); + if (length != 1) { + result_builder->AddCharacter('.'); + result_builder->AddSubstring(&decimal_digits[1], length-1); + } + result_builder->AddCharacter(exponent_character_); + if (exponent < 0) { + result_builder->AddCharacter('-'); + exponent = -exponent; + } else { + if ((flags_ & EMIT_POSITIVE_EXPONENT_SIGN) != 0) { + result_builder->AddCharacter('+'); + } + } + if (exponent == 0) { + result_builder->AddCharacter('0'); + return; + } + ASSERT(exponent < 1e4); + const int kMaxExponentLength = 5; + char buffer[kMaxExponentLength + 1]; + buffer[kMaxExponentLength] = '\0'; + int first_char_pos = kMaxExponentLength; + while (exponent > 0) { + buffer[--first_char_pos] = '0' + (exponent % 10); + exponent /= 10; + } + result_builder->AddSubstring(&buffer[first_char_pos], + kMaxExponentLength - first_char_pos); +} + + +void DoubleToStringConverter::CreateDecimalRepresentation( + const char* decimal_digits, + int length, + int decimal_point, + int digits_after_point, + StringBuilder* result_builder) const { + // Create a representation that is padded with zeros if needed. + if (decimal_point <= 0) { + // "0.00000decimal_rep". + result_builder->AddCharacter('0'); + if (digits_after_point > 0) { + result_builder->AddCharacter('.'); + result_builder->AddPadding('0', -decimal_point); + ASSERT(length <= digits_after_point - (-decimal_point)); + result_builder->AddSubstring(decimal_digits, length); + int remaining_digits = digits_after_point - (-decimal_point) - length; + result_builder->AddPadding('0', remaining_digits); + } + } else if (decimal_point >= length) { + // "decimal_rep0000.00000" or "decimal_rep.0000" + result_builder->AddSubstring(decimal_digits, length); + result_builder->AddPadding('0', decimal_point - length); + if (digits_after_point > 0) { + result_builder->AddCharacter('.'); + result_builder->AddPadding('0', digits_after_point); + } + } else { + // "decima.l_rep000" + ASSERT(digits_after_point > 0); + result_builder->AddSubstring(decimal_digits, decimal_point); + result_builder->AddCharacter('.'); + ASSERT(length - decimal_point <= digits_after_point); + result_builder->AddSubstring(&decimal_digits[decimal_point], + length - decimal_point); + int remaining_digits = digits_after_point - (length - decimal_point); + result_builder->AddPadding('0', remaining_digits); + } + if (digits_after_point == 0) { + if ((flags_ & EMIT_TRAILING_DECIMAL_POINT) != 0) { + result_builder->AddCharacter('.'); + } + if ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) { + result_builder->AddCharacter('0'); + } + } +} + + +bool DoubleToStringConverter::ToShortestIeeeNumber( + double value, + StringBuilder* result_builder, + DoubleToStringConverter::DtoaMode mode) const { + ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE); + if (Double(value).IsSpecial()) { + return HandleSpecialValues(value, result_builder); + } + + int decimal_point; + bool sign; + const int kDecimalRepCapacity = kBase10MaximalLength + 1; + char decimal_rep[kDecimalRepCapacity]; + int decimal_rep_length; + + DoubleToAscii(value, mode, 0, decimal_rep, kDecimalRepCapacity, + &sign, &decimal_rep_length, &decimal_point); + + bool unique_zero = (flags_ & UNIQUE_ZERO) != 0; + if (sign && (value != 0.0 || !unique_zero)) { + result_builder->AddCharacter('-'); + } + + int exponent = decimal_point - 1; + if ((decimal_in_shortest_low_ <= exponent) && + (exponent < decimal_in_shortest_high_)) { + CreateDecimalRepresentation(decimal_rep, decimal_rep_length, + decimal_point, + Max(0, decimal_rep_length - decimal_point), + result_builder); + } else { + CreateExponentialRepresentation(decimal_rep, decimal_rep_length, exponent, + result_builder); + } + return true; +} + + +bool DoubleToStringConverter::ToFixed(double value, + int requested_digits, + StringBuilder* result_builder) const { + ASSERT(kMaxFixedDigitsBeforePoint == 60); + const double kFirstNonFixed = 1e60; + + if (Double(value).IsSpecial()) { + return HandleSpecialValues(value, result_builder); + } + + if (requested_digits > kMaxFixedDigitsAfterPoint) return false; + if (value >= kFirstNonFixed || value <= -kFirstNonFixed) return false; + + // Find a sufficiently precise decimal representation of n. + int decimal_point; + bool sign; + // Add space for the '\0' byte. + const int kDecimalRepCapacity = + kMaxFixedDigitsBeforePoint + kMaxFixedDigitsAfterPoint + 1; + char decimal_rep[kDecimalRepCapacity]; + int decimal_rep_length; + DoubleToAscii(value, FIXED, requested_digits, + decimal_rep, kDecimalRepCapacity, + &sign, &decimal_rep_length, &decimal_point); + + bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0); + if (sign && (value != 0.0 || !unique_zero)) { + result_builder->AddCharacter('-'); + } + + CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point, + requested_digits, result_builder); + return true; +} + + +bool DoubleToStringConverter::ToExponential( + double value, + int requested_digits, + StringBuilder* result_builder) const { + if (Double(value).IsSpecial()) { + return HandleSpecialValues(value, result_builder); + } + + if (requested_digits < -1) return false; + if (requested_digits > kMaxExponentialDigits) return false; + + int decimal_point; + bool sign; + // Add space for digit before the decimal point and the '\0' character. + const int kDecimalRepCapacity = kMaxExponentialDigits + 2; + ASSERT(kDecimalRepCapacity > kBase10MaximalLength); + char decimal_rep[kDecimalRepCapacity]; + int decimal_rep_length; + + if (requested_digits == -1) { + DoubleToAscii(value, SHORTEST, 0, + decimal_rep, kDecimalRepCapacity, + &sign, &decimal_rep_length, &decimal_point); + } else { + DoubleToAscii(value, PRECISION, requested_digits + 1, + decimal_rep, kDecimalRepCapacity, + &sign, &decimal_rep_length, &decimal_point); + ASSERT(decimal_rep_length <= requested_digits + 1); + + for (int i = decimal_rep_length; i < requested_digits + 1; ++i) { + decimal_rep[i] = '0'; + } + decimal_rep_length = requested_digits + 1; + } + + bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0); + if (sign && (value != 0.0 || !unique_zero)) { + result_builder->AddCharacter('-'); + } + + int exponent = decimal_point - 1; + CreateExponentialRepresentation(decimal_rep, + decimal_rep_length, + exponent, + result_builder); + return true; +} + + +bool DoubleToStringConverter::ToPrecision(double value, + int precision, + StringBuilder* result_builder) const { + if (Double(value).IsSpecial()) { + return HandleSpecialValues(value, result_builder); + } + + if (precision < kMinPrecisionDigits || precision > kMaxPrecisionDigits) { + return false; + } + + // Find a sufficiently precise decimal representation of n. + int decimal_point; + bool sign; + // Add one for the terminating null character. + const int kDecimalRepCapacity = kMaxPrecisionDigits + 1; + char decimal_rep[kDecimalRepCapacity]; + int decimal_rep_length; + + DoubleToAscii(value, PRECISION, precision, + decimal_rep, kDecimalRepCapacity, + &sign, &decimal_rep_length, &decimal_point); + ASSERT(decimal_rep_length <= precision); + + bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0); + if (sign && (value != 0.0 || !unique_zero)) { + result_builder->AddCharacter('-'); + } + + // The exponent if we print the number as x.xxeyyy. That is with the + // decimal point after the first digit. + int exponent = decimal_point - 1; + + int extra_zero = ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) ? 1 : 0; + if ((-decimal_point + 1 > max_leading_padding_zeroes_in_precision_mode_) || + (decimal_point - precision + extra_zero > + max_trailing_padding_zeroes_in_precision_mode_)) { + // Fill buffer to contain 'precision' digits. + // Usually the buffer is already at the correct length, but 'DoubleToAscii' + // is allowed to return less characters. + for (int i = decimal_rep_length; i < precision; ++i) { + decimal_rep[i] = '0'; + } + + CreateExponentialRepresentation(decimal_rep, + precision, + exponent, + result_builder); + } else { + CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point, + Max(0, precision - decimal_point), + result_builder); + } + return true; +} + + +static BignumDtoaMode DtoaToBignumDtoaMode( + DoubleToStringConverter::DtoaMode dtoa_mode) { + switch (dtoa_mode) { + case DoubleToStringConverter::SHORTEST: return BIGNUM_DTOA_SHORTEST; + case DoubleToStringConverter::SHORTEST_SINGLE: + return BIGNUM_DTOA_SHORTEST_SINGLE; + case DoubleToStringConverter::FIXED: return BIGNUM_DTOA_FIXED; + case DoubleToStringConverter::PRECISION: return BIGNUM_DTOA_PRECISION; + default: + UNREACHABLE(); + return BIGNUM_DTOA_SHORTEST; // To silence compiler. + } +} + + +void DoubleToStringConverter::DoubleToAscii(double v, + DtoaMode mode, + int requested_digits, + char* buffer, + int buffer_length, + bool* sign, + int* length, + int* point) { + Vector vector(buffer, buffer_length); + ASSERT(!Double(v).IsSpecial()); + ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE || requested_digits >= 0); + + if (Double(v).Sign() < 0) { + *sign = true; + v = -v; + } else { + *sign = false; + } + + if (mode == PRECISION && requested_digits == 0) { + vector[0] = '\0'; + *length = 0; + return; + } + + if (v == 0) { + vector[0] = '0'; + vector[1] = '\0'; + *length = 1; + *point = 1; + return; + } + + bool fast_worked; + switch (mode) { + case SHORTEST: + fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST, 0, vector, length, point); + break; + case SHORTEST_SINGLE: + fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST_SINGLE, 0, + vector, length, point); + break; + case FIXED: + fast_worked = FastFixedDtoa(v, requested_digits, vector, length, point); + break; + case PRECISION: + fast_worked = FastDtoa(v, FAST_DTOA_PRECISION, requested_digits, + vector, length, point); + break; + default: + UNREACHABLE(); + fast_worked = false; + } + if (fast_worked) return; + + // If the fast dtoa didn't succeed use the slower bignum version. + BignumDtoaMode bignum_mode = DtoaToBignumDtoaMode(mode); + BignumDtoa(v, bignum_mode, requested_digits, vector, length, point); + vector[*length] = '\0'; +} + + +// Consumes the given substring from the iterator. +// Returns false, if the substring does not match. +static bool ConsumeSubString(const char** current, + const char* end, + const char* substring) { + ASSERT(**current == *substring); + for (substring++; *substring != '\0'; substring++) { + ++*current; + if (*current == end || **current != *substring) return false; + } + ++*current; + return true; +} + + +// Maximum number of significant digits in decimal representation. +// The longest possible double in decimal representation is +// (2^53 - 1) * 2 ^ -1074 that is (2 ^ 53 - 1) * 5 ^ 1074 / 10 ^ 1074 +// (768 digits). If we parse a number whose first digits are equal to a +// mean of 2 adjacent doubles (that could have up to 769 digits) the result +// must be rounded to the bigger one unless the tail consists of zeros, so +// we don't need to preserve all the digits. +const int kMaxSignificantDigits = 772; + + +// Returns true if a nonspace found and false if the end has reached. +static inline bool AdvanceToNonspace(const char** current, const char* end) { + while (*current != end) { + if (**current != ' ') return true; + ++*current; + } + return false; +} + + +static bool isDigit(int x, int radix) { + return (x >= '0' && x <= '9' && x < '0' + radix) + || (radix > 10 && x >= 'a' && x < 'a' + radix - 10) + || (radix > 10 && x >= 'A' && x < 'A' + radix - 10); +} + + +static double SignedZero(bool sign) { + return sign ? -0.0 : 0.0; +} + + +// Parsing integers with radix 2, 4, 8, 16, 32. Assumes current != end. +template +static double RadixStringToIeee(const char* current, + const char* end, + bool sign, + bool allow_trailing_junk, + double junk_string_value, + bool read_as_double, + const char** trailing_pointer) { + ASSERT(current != end); + + const int kDoubleSize = Double::kSignificandSize; + const int kSingleSize = Single::kSignificandSize; + const int kSignificandSize = read_as_double? kDoubleSize: kSingleSize; + + // Skip leading 0s. + while (*current == '0') { + ++current; + if (current == end) { + *trailing_pointer = end; + return SignedZero(sign); + } + } + + int64_t number = 0; + int exponent = 0; + const int radix = (1 << radix_log_2); + + do { + int digit; + if (*current >= '0' && *current <= '9' && *current < '0' + radix) { + digit = static_cast(*current) - '0'; + } else if (radix > 10 && *current >= 'a' && *current < 'a' + radix - 10) { + digit = static_cast(*current) - 'a' + 10; + } else if (radix > 10 && *current >= 'A' && *current < 'A' + radix - 10) { + digit = static_cast(*current) - 'A' + 10; + } else { + if (allow_trailing_junk || !AdvanceToNonspace(¤t, end)) { + break; + } else { + return junk_string_value; + } + } + + number = number * radix + digit; + int overflow = static_cast(number >> kSignificandSize); + if (overflow != 0) { + // Overflow occurred. Need to determine which direction to round the + // result. + int overflow_bits_count = 1; + while (overflow > 1) { + overflow_bits_count++; + overflow >>= 1; + } + + int dropped_bits_mask = ((1 << overflow_bits_count) - 1); + int dropped_bits = static_cast(number) & dropped_bits_mask; + number >>= overflow_bits_count; + exponent = overflow_bits_count; + + bool zero_tail = true; + while (true) { + ++current; + if (current == end || !isDigit(*current, radix)) break; + zero_tail = zero_tail && *current == '0'; + exponent += radix_log_2; + } + + if (!allow_trailing_junk && AdvanceToNonspace(¤t, end)) { + return junk_string_value; + } + + int middle_value = (1 << (overflow_bits_count - 1)); + if (dropped_bits > middle_value) { + number++; // Rounding up. + } else if (dropped_bits == middle_value) { + // Rounding to even to consistency with decimals: half-way case rounds + // up if significant part is odd and down otherwise. + if ((number & 1) != 0 || !zero_tail) { + number++; // Rounding up. + } + } + + // Rounding up may cause overflow. + if ((number & ((int64_t)1 << kSignificandSize)) != 0) { + exponent++; + number >>= 1; + } + break; + } + ++current; + } while (current != end); + + ASSERT(number < ((int64_t)1 << kSignificandSize)); + ASSERT(static_cast(static_cast(number)) == number); + + *trailing_pointer = current; + + if (exponent == 0) { + if (sign) { + if (number == 0) return -0.0; + number = -number; + } + return static_cast(number); + } + + ASSERT(number != 0); + return Double(DiyFp(number, exponent)).value(); +} + + +double StringToDoubleConverter::StringToIeee( + const char* input, + int length, + int* processed_characters_count, + bool read_as_double) { + const char* current = input; + const char* end = input + length; + + *processed_characters_count = 0; + + const bool allow_trailing_junk = (flags_ & ALLOW_TRAILING_JUNK) != 0; + const bool allow_leading_spaces = (flags_ & ALLOW_LEADING_SPACES) != 0; + const bool allow_trailing_spaces = (flags_ & ALLOW_TRAILING_SPACES) != 0; + const bool allow_spaces_after_sign = (flags_ & ALLOW_SPACES_AFTER_SIGN) != 0; + + // To make sure that iterator dereferencing is valid the following + // convention is used: + // 1. Each '++current' statement is followed by check for equality to 'end'. + // 2. If AdvanceToNonspace returned false then current == end. + // 3. If 'current' becomes equal to 'end' the function returns or goes to + // 'parsing_done'. + // 4. 'current' is not dereferenced after the 'parsing_done' label. + // 5. Code before 'parsing_done' may rely on 'current != end'. + if (current == end) return empty_string_value_; + + if (allow_leading_spaces || allow_trailing_spaces) { + if (!AdvanceToNonspace(¤t, end)) { + *processed_characters_count = current - input; + return empty_string_value_; + } + if (!allow_leading_spaces && (input != current)) { + // No leading spaces allowed, but AdvanceToNonspace moved forward. + return junk_string_value_; + } + } + + // The longest form of simplified number is: "-.1eXXX\0". + const int kBufferSize = kMaxSignificantDigits + 10; + char buffer[kBufferSize]; // NOLINT: size is known at compile time. + int buffer_pos = 0; + + // Exponent will be adjusted if insignificant digits of the integer part + // or insignificant leading zeros of the fractional part are dropped. + int exponent = 0; + int significant_digits = 0; + int insignificant_digits = 0; + bool nonzero_digit_dropped = false; + + bool sign = false; + + if (*current == '+' || *current == '-') { + sign = (*current == '-'); + ++current; + const char* next_non_space = current; + // Skip following spaces (if allowed). + if (!AdvanceToNonspace(&next_non_space, end)) return junk_string_value_; + if (!allow_spaces_after_sign && (current != next_non_space)) { + return junk_string_value_; + } + current = next_non_space; + } + + if (infinity_symbol_ != NULL) { + if (*current == infinity_symbol_[0]) { + if (!ConsumeSubString(¤t, end, infinity_symbol_)) { + return junk_string_value_; + } + + if (!(allow_trailing_spaces || allow_trailing_junk) && (current != end)) { + return junk_string_value_; + } + if (!allow_trailing_junk && AdvanceToNonspace(¤t, end)) { + return junk_string_value_; + } + + ASSERT(buffer_pos == 0); + *processed_characters_count = current - input; + return sign ? -Double::Infinity() : Double::Infinity(); + } + } + + if (nan_symbol_ != NULL) { + if (*current == nan_symbol_[0]) { + if (!ConsumeSubString(¤t, end, nan_symbol_)) { + return junk_string_value_; + } + + if (!(allow_trailing_spaces || allow_trailing_junk) && (current != end)) { + return junk_string_value_; + } + if (!allow_trailing_junk && AdvanceToNonspace(¤t, end)) { + return junk_string_value_; + } + + ASSERT(buffer_pos == 0); + *processed_characters_count = current - input; + return sign ? -Double::NaN() : Double::NaN(); + } + } + + bool leading_zero = false; + if (*current == '0') { + ++current; + if (current == end) { + *processed_characters_count = current - input; + return SignedZero(sign); + } + + leading_zero = true; + + // It could be hexadecimal value. + if ((flags_ & ALLOW_HEX) && (*current == 'x' || *current == 'X')) { + ++current; + if (current == end || !isDigit(*current, 16)) { + return junk_string_value_; // "0x". + } + + const char* tail_pointer = NULL; + double result = RadixStringToIeee<4>(current, + end, + sign, + allow_trailing_junk, + junk_string_value_, + read_as_double, + &tail_pointer); + if (tail_pointer != NULL) { + if (allow_trailing_spaces) AdvanceToNonspace(&tail_pointer, end); + *processed_characters_count = tail_pointer - input; + } + return result; + } + + // Ignore leading zeros in the integer part. + while (*current == '0') { + ++current; + if (current == end) { + *processed_characters_count = current - input; + return SignedZero(sign); + } + } + } + + bool octal = leading_zero && (flags_ & ALLOW_OCTALS) != 0; + + // Copy significant digits of the integer part (if any) to the buffer. + while (*current >= '0' && *current <= '9') { + if (significant_digits < kMaxSignificantDigits) { + ASSERT(buffer_pos < kBufferSize); + buffer[buffer_pos++] = static_cast(*current); + significant_digits++; + // Will later check if it's an octal in the buffer. + } else { + insignificant_digits++; // Move the digit into the exponential part. + nonzero_digit_dropped = nonzero_digit_dropped || *current != '0'; + } + octal = octal && *current < '8'; + ++current; + if (current == end) goto parsing_done; + } + + if (significant_digits == 0) { + octal = false; + } + + if (*current == '.') { + if (octal && !allow_trailing_junk) return junk_string_value_; + if (octal) goto parsing_done; + + ++current; + if (current == end) { + if (significant_digits == 0 && !leading_zero) { + return junk_string_value_; + } else { + goto parsing_done; + } + } + + if (significant_digits == 0) { + // octal = false; + // Integer part consists of 0 or is absent. Significant digits start after + // leading zeros (if any). + while (*current == '0') { + ++current; + if (current == end) { + *processed_characters_count = current - input; + return SignedZero(sign); + } + exponent--; // Move this 0 into the exponent. + } + } + + // There is a fractional part. + // We don't emit a '.', but adjust the exponent instead. + while (*current >= '0' && *current <= '9') { + if (significant_digits < kMaxSignificantDigits) { + ASSERT(buffer_pos < kBufferSize); + buffer[buffer_pos++] = static_cast(*current); + significant_digits++; + exponent--; + } else { + // Ignore insignificant digits in the fractional part. + nonzero_digit_dropped = nonzero_digit_dropped || *current != '0'; + } + ++current; + if (current == end) goto parsing_done; + } + } + + if (!leading_zero && exponent == 0 && significant_digits == 0) { + // If leading_zeros is true then the string contains zeros. + // If exponent < 0 then string was [+-]\.0*... + // If significant_digits != 0 the string is not equal to 0. + // Otherwise there are no digits in the string. + return junk_string_value_; + } + + // Parse exponential part. + if (*current == 'e' || *current == 'E') { + if (octal && !allow_trailing_junk) return junk_string_value_; + if (octal) goto parsing_done; + ++current; + if (current == end) { + if (allow_trailing_junk) { + goto parsing_done; + } else { + return junk_string_value_; + } + } + char sign = '+'; + if (*current == '+' || *current == '-') { + sign = static_cast(*current); + ++current; + if (current == end) { + if (allow_trailing_junk) { + goto parsing_done; + } else { + return junk_string_value_; + } + } + } + + if (current == end || *current < '0' || *current > '9') { + if (allow_trailing_junk) { + goto parsing_done; + } else { + return junk_string_value_; + } + } + + const int max_exponent = INT_MAX / 2; + ASSERT(-max_exponent / 2 <= exponent && exponent <= max_exponent / 2); + int num = 0; + do { + // Check overflow. + int digit = *current - '0'; + if (num >= max_exponent / 10 + && !(num == max_exponent / 10 && digit <= max_exponent % 10)) { + num = max_exponent; + } else { + num = num * 10 + digit; + } + ++current; + } while (current != end && *current >= '0' && *current <= '9'); + + exponent += (sign == '-' ? -num : num); + } + + if (!(allow_trailing_spaces || allow_trailing_junk) && (current != end)) { + return junk_string_value_; + } + if (!allow_trailing_junk && AdvanceToNonspace(¤t, end)) { + return junk_string_value_; + } + if (allow_trailing_spaces) { + AdvanceToNonspace(¤t, end); + } + + parsing_done: + exponent += insignificant_digits; + + if (octal) { + double result; + const char* tail_pointer = NULL; + result = RadixStringToIeee<3>(buffer, + buffer + buffer_pos, + sign, + allow_trailing_junk, + junk_string_value_, + read_as_double, + &tail_pointer); + ASSERT(tail_pointer != NULL); + *processed_characters_count = current - input; + return result; + } + + if (nonzero_digit_dropped) { + buffer[buffer_pos++] = '1'; + exponent--; + } + + ASSERT(buffer_pos < kBufferSize); + buffer[buffer_pos] = '\0'; + + double converted; + if (read_as_double) { + converted = Strtod(Vector(buffer, buffer_pos), exponent); + } else { + converted = Strtof(Vector(buffer, buffer_pos), exponent); + } + *processed_characters_count = current - input; + return sign? -converted: converted; +} + +} // namespace double_conversion diff --git a/Foundation/src/double-conversion.h b/Foundation/src/double-conversion.h new file mode 100644 index 000000000..f98edae75 --- /dev/null +++ b/Foundation/src/double-conversion.h @@ -0,0 +1,536 @@ +// Copyright 2012 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ +#define DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ + +#include "utils.h" + +namespace double_conversion { + +class DoubleToStringConverter { + public: + // When calling ToFixed with a double > 10^kMaxFixedDigitsBeforePoint + // or a requested_digits parameter > kMaxFixedDigitsAfterPoint then the + // function returns false. + static const int kMaxFixedDigitsBeforePoint = 60; + static const int kMaxFixedDigitsAfterPoint = 60; + + // When calling ToExponential with a requested_digits + // parameter > kMaxExponentialDigits then the function returns false. + static const int kMaxExponentialDigits = 120; + + // When calling ToPrecision with a requested_digits + // parameter < kMinPrecisionDigits or requested_digits > kMaxPrecisionDigits + // then the function returns false. + static const int kMinPrecisionDigits = 1; + static const int kMaxPrecisionDigits = 120; + + enum Flags { + NO_FLAGS = 0, + EMIT_POSITIVE_EXPONENT_SIGN = 1, + EMIT_TRAILING_DECIMAL_POINT = 2, + EMIT_TRAILING_ZERO_AFTER_POINT = 4, + UNIQUE_ZERO = 8 + }; + + // Flags should be a bit-or combination of the possible Flags-enum. + // - NO_FLAGS: no special flags. + // - EMIT_POSITIVE_EXPONENT_SIGN: when the number is converted into exponent + // form, emits a '+' for positive exponents. Example: 1.2e+2. + // - EMIT_TRAILING_DECIMAL_POINT: when the input number is an integer and is + // converted into decimal format then a trailing decimal point is appended. + // Example: 2345.0 is converted to "2345.". + // - EMIT_TRAILING_ZERO_AFTER_POINT: in addition to a trailing decimal point + // emits a trailing '0'-character. This flag requires the + // EXMIT_TRAILING_DECIMAL_POINT flag. + // Example: 2345.0 is converted to "2345.0". + // - UNIQUE_ZERO: "-0.0" is converted to "0.0". + // + // Infinity symbol and nan_symbol provide the string representation for these + // special values. If the string is NULL and the special value is encountered + // then the conversion functions return false. + // + // The exponent_character is used in exponential representations. It is + // usually 'e' or 'E'. + // + // When converting to the shortest representation the converter will + // represent input numbers in decimal format if they are in the interval + // [10^decimal_in_shortest_low; 10^decimal_in_shortest_high[ + // (lower boundary included, greater boundary excluded). + // Example: with decimal_in_shortest_low = -6 and + // decimal_in_shortest_high = 21: + // ToShortest(0.000001) -> "0.000001" + // ToShortest(0.0000001) -> "1e-7" + // ToShortest(111111111111111111111.0) -> "111111111111111110000" + // ToShortest(100000000000000000000.0) -> "100000000000000000000" + // ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21" + // + // When converting to precision mode the converter may add + // max_leading_padding_zeroes before returning the number in exponential + // format. + // Example with max_leading_padding_zeroes_in_precision_mode = 6. + // ToPrecision(0.0000012345, 2) -> "0.0000012" + // ToPrecision(0.00000012345, 2) -> "1.2e-7" + // Similarily the converter may add up to + // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid + // returning an exponential representation. A zero added by the + // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit. + // Examples for max_trailing_padding_zeroes_in_precision_mode = 1: + // ToPrecision(230.0, 2) -> "230" + // ToPrecision(230.0, 2) -> "230." with EMIT_TRAILING_DECIMAL_POINT. + // ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT. + DoubleToStringConverter(int flags, + const char* infinity_symbol, + const char* nan_symbol, + char exponent_character, + int decimal_in_shortest_low, + int decimal_in_shortest_high, + int max_leading_padding_zeroes_in_precision_mode, + int max_trailing_padding_zeroes_in_precision_mode) + : flags_(flags), + infinity_symbol_(infinity_symbol), + nan_symbol_(nan_symbol), + exponent_character_(exponent_character), + decimal_in_shortest_low_(decimal_in_shortest_low), + decimal_in_shortest_high_(decimal_in_shortest_high), + max_leading_padding_zeroes_in_precision_mode_( + max_leading_padding_zeroes_in_precision_mode), + max_trailing_padding_zeroes_in_precision_mode_( + max_trailing_padding_zeroes_in_precision_mode) { + // When 'trailing zero after the point' is set, then 'trailing point' + // must be set too. + ASSERT(((flags & EMIT_TRAILING_DECIMAL_POINT) != 0) || + !((flags & EMIT_TRAILING_ZERO_AFTER_POINT) != 0)); + } + + // Returns a converter following the EcmaScript specification. + static const DoubleToStringConverter& EcmaScriptConverter(); + + // Computes the shortest string of digits that correctly represent the input + // number. Depending on decimal_in_shortest_low and decimal_in_shortest_high + // (see constructor) it then either returns a decimal representation, or an + // exponential representation. + // Example with decimal_in_shortest_low = -6, + // decimal_in_shortest_high = 21, + // EMIT_POSITIVE_EXPONENT_SIGN activated, and + // EMIT_TRAILING_DECIMAL_POINT deactived: + // ToShortest(0.000001) -> "0.000001" + // ToShortest(0.0000001) -> "1e-7" + // ToShortest(111111111111111111111.0) -> "111111111111111110000" + // ToShortest(100000000000000000000.0) -> "100000000000000000000" + // ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21" + // + // Note: the conversion may round the output if the returned string + // is accurate enough to uniquely identify the input-number. + // For example the most precise representation of the double 9e59 equals + // "899999999999999918767229449717619953810131273674690656206848", but + // the converter will return the shorter (but still correct) "9e59". + // + // Returns true if the conversion succeeds. The conversion always succeeds + // except when the input value is special and no infinity_symbol or + // nan_symbol has been given to the constructor. + bool ToShortest(double value, StringBuilder* result_builder) const { + return ToShortestIeeeNumber(value, result_builder, SHORTEST); + } + + // Same as ToShortest, but for single-precision floats. + bool ToShortestSingle(float value, StringBuilder* result_builder) const { + return ToShortestIeeeNumber(value, result_builder, SHORTEST_SINGLE); + } + + + // Computes a decimal representation with a fixed number of digits after the + // decimal point. The last emitted digit is rounded. + // + // Examples: + // ToFixed(3.12, 1) -> "3.1" + // ToFixed(3.1415, 3) -> "3.142" + // ToFixed(1234.56789, 4) -> "1234.5679" + // ToFixed(1.23, 5) -> "1.23000" + // ToFixed(0.1, 4) -> "0.1000" + // ToFixed(1e30, 2) -> "1000000000000000019884624838656.00" + // ToFixed(0.1, 30) -> "0.100000000000000005551115123126" + // ToFixed(0.1, 17) -> "0.10000000000000001" + // + // If requested_digits equals 0, then the tail of the result depends on + // the EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT. + // Examples, for requested_digits == 0, + // let EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT be + // - false and false: then 123.45 -> 123 + // 0.678 -> 1 + // - true and false: then 123.45 -> 123. + // 0.678 -> 1. + // - true and true: then 123.45 -> 123.0 + // 0.678 -> 1.0 + // + // Returns true if the conversion succeeds. The conversion always succeeds + // except for the following cases: + // - the input value is special and no infinity_symbol or nan_symbol has + // been provided to the constructor, + // - 'value' > 10^kMaxFixedDigitsBeforePoint, or + // - 'requested_digits' > kMaxFixedDigitsAfterPoint. + // The last two conditions imply that the result will never contain more than + // 1 + kMaxFixedDigitsBeforePoint + 1 + kMaxFixedDigitsAfterPoint characters + // (one additional character for the sign, and one for the decimal point). + bool ToFixed(double value, + int requested_digits, + StringBuilder* result_builder) const; + + // Computes a representation in exponential format with requested_digits + // after the decimal point. The last emitted digit is rounded. + // If requested_digits equals -1, then the shortest exponential representation + // is computed. + // + // Examples with EMIT_POSITIVE_EXPONENT_SIGN deactivated, and + // exponent_character set to 'e'. + // ToExponential(3.12, 1) -> "3.1e0" + // ToExponential(5.0, 3) -> "5.000e0" + // ToExponential(0.001, 2) -> "1.00e-3" + // ToExponential(3.1415, -1) -> "3.1415e0" + // ToExponential(3.1415, 4) -> "3.1415e0" + // ToExponential(3.1415, 3) -> "3.142e0" + // ToExponential(123456789000000, 3) -> "1.235e14" + // ToExponential(1000000000000000019884624838656.0, -1) -> "1e30" + // ToExponential(1000000000000000019884624838656.0, 32) -> + // "1.00000000000000001988462483865600e30" + // ToExponential(1234, 0) -> "1e3" + // + // Returns true if the conversion succeeds. The conversion always succeeds + // except for the following cases: + // - the input value is special and no infinity_symbol or nan_symbol has + // been provided to the constructor, + // - 'requested_digits' > kMaxExponentialDigits. + // The last condition implies that the result will never contain more than + // kMaxExponentialDigits + 8 characters (the sign, the digit before the + // decimal point, the decimal point, the exponent character, the + // exponent's sign, and at most 3 exponent digits). + bool ToExponential(double value, + int requested_digits, + StringBuilder* result_builder) const; + + // Computes 'precision' leading digits of the given 'value' and returns them + // either in exponential or decimal format, depending on + // max_{leading|trailing}_padding_zeroes_in_precision_mode (given to the + // constructor). + // The last computed digit is rounded. + // + // Example with max_leading_padding_zeroes_in_precision_mode = 6. + // ToPrecision(0.0000012345, 2) -> "0.0000012" + // ToPrecision(0.00000012345, 2) -> "1.2e-7" + // Similarily the converter may add up to + // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid + // returning an exponential representation. A zero added by the + // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit. + // Examples for max_trailing_padding_zeroes_in_precision_mode = 1: + // ToPrecision(230.0, 2) -> "230" + // ToPrecision(230.0, 2) -> "230." with EMIT_TRAILING_DECIMAL_POINT. + // ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT. + // Examples for max_trailing_padding_zeroes_in_precision_mode = 3, and no + // EMIT_TRAILING_ZERO_AFTER_POINT: + // ToPrecision(123450.0, 6) -> "123450" + // ToPrecision(123450.0, 5) -> "123450" + // ToPrecision(123450.0, 4) -> "123500" + // ToPrecision(123450.0, 3) -> "123000" + // ToPrecision(123450.0, 2) -> "1.2e5" + // + // Returns true if the conversion succeeds. The conversion always succeeds + // except for the following cases: + // - the input value is special and no infinity_symbol or nan_symbol has + // been provided to the constructor, + // - precision < kMinPericisionDigits + // - precision > kMaxPrecisionDigits + // The last condition implies that the result will never contain more than + // kMaxPrecisionDigits + 7 characters (the sign, the decimal point, the + // exponent character, the exponent's sign, and at most 3 exponent digits). + bool ToPrecision(double value, + int precision, + StringBuilder* result_builder) const; + + enum DtoaMode { + // Produce the shortest correct representation. + // For example the output of 0.299999999999999988897 is (the less accurate + // but correct) 0.3. + SHORTEST, + // Same as SHORTEST, but for single-precision floats. + SHORTEST_SINGLE, + // Produce a fixed number of digits after the decimal point. + // For instance fixed(0.1, 4) becomes 0.1000 + // If the input number is big, the output will be big. + FIXED, + // Fixed number of digits (independent of the decimal point). + PRECISION + }; + + // The maximal number of digits that are needed to emit a double in base 10. + // A higher precision can be achieved by using more digits, but the shortest + // accurate representation of any double will never use more digits than + // kBase10MaximalLength. + // Note that DoubleToAscii null-terminates its input. So the given buffer + // should be at least kBase10MaximalLength + 1 characters long. + static const int kBase10MaximalLength = 17; + + // Converts the given double 'v' to ascii. 'v' must not be NaN, +Infinity, or + // -Infinity. In SHORTEST_SINGLE-mode this restriction also applies to 'v' + // after it has been casted to a single-precision float. That is, in this + // mode static_cast(v) must not be NaN, +Infinity or -Infinity. + // + // The result should be interpreted as buffer * 10^(point-length). + // + // The output depends on the given mode: + // - SHORTEST: produce the least amount of digits for which the internal + // identity requirement is still satisfied. If the digits are printed + // (together with the correct exponent) then reading this number will give + // 'v' again. The buffer will choose the representation that is closest to + // 'v'. If there are two at the same distance, than the one farther away + // from 0 is chosen (halfway cases - ending with 5 - are rounded up). + // In this mode the 'requested_digits' parameter is ignored. + // - SHORTEST_SINGLE: same as SHORTEST but with single-precision. + // - FIXED: produces digits necessary to print a given number with + // 'requested_digits' digits after the decimal point. The produced digits + // might be too short in which case the caller has to fill the remainder + // with '0's. + // Example: toFixed(0.001, 5) is allowed to return buffer="1", point=-2. + // Halfway cases are rounded towards +/-Infinity (away from 0). The call + // toFixed(0.15, 2) thus returns buffer="2", point=0. + // The returned buffer may contain digits that would be truncated from the + // shortest representation of the input. + // - PRECISION: produces 'requested_digits' where the first digit is not '0'. + // Even though the length of produced digits usually equals + // 'requested_digits', the function is allowed to return fewer digits, in + // which case the caller has to fill the missing digits with '0's. + // Halfway cases are again rounded away from 0. + // DoubleToAscii expects the given buffer to be big enough to hold all + // digits and a terminating null-character. In SHORTEST-mode it expects a + // buffer of at least kBase10MaximalLength + 1. In all other modes the + // requested_digits parameter and the padding-zeroes limit the size of the + // output. Don't forget the decimal point, the exponent character and the + // terminating null-character when computing the maximal output size. + // The given length is only used in debug mode to ensure the buffer is big + // enough. + static void DoubleToAscii(double v, + DtoaMode mode, + int requested_digits, + char* buffer, + int buffer_length, + bool* sign, + int* length, + int* point); + + private: + // Implementation for ToShortest and ToShortestSingle. + bool ToShortestIeeeNumber(double value, + StringBuilder* result_builder, + DtoaMode mode) const; + + // If the value is a special value (NaN or Infinity) constructs the + // corresponding string using the configured infinity/nan-symbol. + // If either of them is NULL or the value is not special then the + // function returns false. + bool HandleSpecialValues(double value, StringBuilder* result_builder) const; + // Constructs an exponential representation (i.e. 1.234e56). + // The given exponent assumes a decimal point after the first decimal digit. + void CreateExponentialRepresentation(const char* decimal_digits, + int length, + int exponent, + StringBuilder* result_builder) const; + // Creates a decimal representation (i.e 1234.5678). + void CreateDecimalRepresentation(const char* decimal_digits, + int length, + int decimal_point, + int digits_after_point, + StringBuilder* result_builder) const; + + const int flags_; + const char* const infinity_symbol_; + const char* const nan_symbol_; + const char exponent_character_; + const int decimal_in_shortest_low_; + const int decimal_in_shortest_high_; + const int max_leading_padding_zeroes_in_precision_mode_; + const int max_trailing_padding_zeroes_in_precision_mode_; + + DISALLOW_IMPLICIT_CONSTRUCTORS(DoubleToStringConverter); +}; + + +class StringToDoubleConverter { + public: + // Enumeration for allowing octals and ignoring junk when converting + // strings to numbers. + enum Flags { + NO_FLAGS = 0, + ALLOW_HEX = 1, + ALLOW_OCTALS = 2, + ALLOW_TRAILING_JUNK = 4, + ALLOW_LEADING_SPACES = 8, + ALLOW_TRAILING_SPACES = 16, + ALLOW_SPACES_AFTER_SIGN = 32 + }; + + // Flags should be a bit-or combination of the possible Flags-enum. + // - NO_FLAGS: no special flags. + // - ALLOW_HEX: recognizes the prefix "0x". Hex numbers may only be integers. + // Ex: StringToDouble("0x1234") -> 4660.0 + // In StringToDouble("0x1234.56") the characters ".56" are trailing + // junk. The result of the call is hence dependent on + // the ALLOW_TRAILING_JUNK flag and/or the junk value. + // With this flag "0x" is a junk-string. Even with ALLOW_TRAILING_JUNK, + // the string will not be parsed as "0" followed by junk. + // + // - ALLOW_OCTALS: recognizes the prefix "0" for octals: + // If a sequence of octal digits starts with '0', then the number is + // read as octal integer. Octal numbers may only be integers. + // Ex: StringToDouble("01234") -> 668.0 + // StringToDouble("012349") -> 12349.0 // Not a sequence of octal + // // digits. + // In StringToDouble("01234.56") the characters ".56" are trailing + // junk. The result of the call is hence dependent on + // the ALLOW_TRAILING_JUNK flag and/or the junk value. + // In StringToDouble("01234e56") the characters "e56" are trailing + // junk, too. + // - ALLOW_TRAILING_JUNK: ignore trailing characters that are not part of + // a double literal. + // - ALLOW_LEADING_SPACES: skip over leading spaces. + // - ALLOW_TRAILING_SPACES: ignore trailing spaces. + // - ALLOW_SPACES_AFTER_SIGN: ignore spaces after the sign. + // Ex: StringToDouble("- 123.2") -> -123.2. + // StringToDouble("+ 123.2") -> 123.2 + // + // empty_string_value is returned when an empty string is given as input. + // If ALLOW_LEADING_SPACES or ALLOW_TRAILING_SPACES are set, then a string + // containing only spaces is converted to the 'empty_string_value', too. + // + // junk_string_value is returned when + // a) ALLOW_TRAILING_JUNK is not set, and a junk character (a character not + // part of a double-literal) is found. + // b) ALLOW_TRAILING_JUNK is set, but the string does not start with a + // double literal. + // + // infinity_symbol and nan_symbol are strings that are used to detect + // inputs that represent infinity and NaN. They can be null, in which case + // they are ignored. + // The conversion routine first reads any possible signs. Then it compares the + // following character of the input-string with the first character of + // the infinity, and nan-symbol. If either matches, the function assumes, that + // a match has been found, and expects the following input characters to match + // the remaining characters of the special-value symbol. + // This means that the following restrictions apply to special-value symbols: + // - they must not start with signs ('+', or '-'), + // - they must not have the same first character. + // - they must not start with digits. + // + // Examples: + // flags = ALLOW_HEX | ALLOW_TRAILING_JUNK, + // empty_string_value = 0.0, + // junk_string_value = NaN, + // infinity_symbol = "infinity", + // nan_symbol = "nan": + // StringToDouble("0x1234") -> 4660.0. + // StringToDouble("0x1234K") -> 4660.0. + // StringToDouble("") -> 0.0 // empty_string_value. + // StringToDouble(" ") -> NaN // junk_string_value. + // StringToDouble(" 1") -> NaN // junk_string_value. + // StringToDouble("0x") -> NaN // junk_string_value. + // StringToDouble("-123.45") -> -123.45. + // StringToDouble("--123.45") -> NaN // junk_string_value. + // StringToDouble("123e45") -> 123e45. + // StringToDouble("123E45") -> 123e45. + // StringToDouble("123e+45") -> 123e45. + // StringToDouble("123E-45") -> 123e-45. + // StringToDouble("123e") -> 123.0 // trailing junk ignored. + // StringToDouble("123e-") -> 123.0 // trailing junk ignored. + // StringToDouble("+NaN") -> NaN // NaN string literal. + // StringToDouble("-infinity") -> -inf. // infinity literal. + // StringToDouble("Infinity") -> NaN // junk_string_value. + // + // flags = ALLOW_OCTAL | ALLOW_LEADING_SPACES, + // empty_string_value = 0.0, + // junk_string_value = NaN, + // infinity_symbol = NULL, + // nan_symbol = NULL: + // StringToDouble("0x1234") -> NaN // junk_string_value. + // StringToDouble("01234") -> 668.0. + // StringToDouble("") -> 0.0 // empty_string_value. + // StringToDouble(" ") -> 0.0 // empty_string_value. + // StringToDouble(" 1") -> 1.0 + // StringToDouble("0x") -> NaN // junk_string_value. + // StringToDouble("0123e45") -> NaN // junk_string_value. + // StringToDouble("01239E45") -> 1239e45. + // StringToDouble("-infinity") -> NaN // junk_string_value. + // StringToDouble("NaN") -> NaN // junk_string_value. + StringToDoubleConverter(int flags, + double empty_string_value, + double junk_string_value, + const char* infinity_symbol, + const char* nan_symbol) + : flags_(flags), + empty_string_value_(empty_string_value), + junk_string_value_(junk_string_value), + infinity_symbol_(infinity_symbol), + nan_symbol_(nan_symbol) { + } + + // Performs the conversion. + // The output parameter 'processed_characters_count' is set to the number + // of characters that have been processed to read the number. + // Spaces than are processed with ALLOW_{LEADING|TRAILING}_SPACES are included + // in the 'processed_characters_count'. Trailing junk is never included. + double StringToDouble(const char* buffer, + int length, + int* processed_characters_count) { + return StringToIeee(buffer, length, processed_characters_count, true); + } + + // Same as StringToDouble but reads a float. + // Note that this is not equivalent to static_cast(StringToDouble(...)) + // due to potential double-rounding. + float StringToFloat(const char* buffer, + int length, + int* processed_characters_count) { + return static_cast(StringToIeee(buffer, length, + processed_characters_count, false)); + } + + private: + const int flags_; + const double empty_string_value_; + const double junk_string_value_; + const char* const infinity_symbol_; + const char* const nan_symbol_; + + double StringToIeee(const char* buffer, + int length, + int* processed_characters_count, + bool read_as_double); + + DISALLOW_IMPLICIT_CONSTRUCTORS(StringToDoubleConverter); +}; + +} // namespace double_conversion + +#endif // DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ diff --git a/Foundation/src/fast-dtoa.cc b/Foundation/src/fast-dtoa.cc new file mode 100644 index 000000000..1a0f82350 --- /dev/null +++ b/Foundation/src/fast-dtoa.cc @@ -0,0 +1,664 @@ +// Copyright 2012 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "fast-dtoa.h" + +#include "cached-powers.h" +#include "diy-fp.h" +#include "ieee.h" + +namespace double_conversion { + +// The minimal and maximal target exponent define the range of w's binary +// exponent, where 'w' is the result of multiplying the input by a cached power +// of ten. +// +// A different range might be chosen on a different platform, to optimize digit +// generation, but a smaller range requires more powers of ten to be cached. +static const int kMinimalTargetExponent = -60; +static const int kMaximalTargetExponent = -32; + + +// Adjusts the last digit of the generated number, and screens out generated +// solutions that may be inaccurate. A solution may be inaccurate if it is +// outside the safe interval, or if we cannot prove that it is closer to the +// input than a neighboring representation of the same length. +// +// Input: * buffer containing the digits of too_high / 10^kappa +// * the buffer's length +// * distance_too_high_w == (too_high - w).f() * unit +// * unsafe_interval == (too_high - too_low).f() * unit +// * rest = (too_high - buffer * 10^kappa).f() * unit +// * ten_kappa = 10^kappa * unit +// * unit = the common multiplier +// Output: returns true if the buffer is guaranteed to contain the closest +// representable number to the input. +// Modifies the generated digits in the buffer to approach (round towards) w. +static bool RoundWeed(Vector buffer, + int length, + uint64_t distance_too_high_w, + uint64_t unsafe_interval, + uint64_t rest, + uint64_t ten_kappa, + uint64_t unit) { + uint64_t small_distance = distance_too_high_w - unit; + uint64_t big_distance = distance_too_high_w + unit; + // Let w_low = too_high - big_distance, and + // w_high = too_high - small_distance. + // Note: w_low < w < w_high + // + // The real w (* unit) must lie somewhere inside the interval + // ]w_low; w_high[ (often written as "(w_low; w_high)") + + // Basically the buffer currently contains a number in the unsafe interval + // ]too_low; too_high[ with too_low < w < too_high + // + // too_high - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + // ^v 1 unit ^ ^ ^ ^ + // boundary_high --------------------- . . . . + // ^v 1 unit . . . . + // - - - - - - - - - - - - - - - - - - - + - - + - - - - - - . . + // . . ^ . . + // . big_distance . . . + // . . . . rest + // small_distance . . . . + // v . . . . + // w_high - - - - - - - - - - - - - - - - - - . . . . + // ^v 1 unit . . . . + // w ---------------------------------------- . . . . + // ^v 1 unit v . . . + // w_low - - - - - - - - - - - - - - - - - - - - - . . . + // . . v + // buffer --------------------------------------------------+-------+-------- + // . . + // safe_interval . + // v . + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . + // ^v 1 unit . + // boundary_low ------------------------- unsafe_interval + // ^v 1 unit v + // too_low - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + // + // + // Note that the value of buffer could lie anywhere inside the range too_low + // to too_high. + // + // boundary_low, boundary_high and w are approximations of the real boundaries + // and v (the input number). They are guaranteed to be precise up to one unit. + // In fact the error is guaranteed to be strictly less than one unit. + // + // Anything that lies outside the unsafe interval is guaranteed not to round + // to v when read again. + // Anything that lies inside the safe interval is guaranteed to round to v + // when read again. + // If the number inside the buffer lies inside the unsafe interval but not + // inside the safe interval then we simply do not know and bail out (returning + // false). + // + // Similarly we have to take into account the imprecision of 'w' when finding + // the closest representation of 'w'. If we have two potential + // representations, and one is closer to both w_low and w_high, then we know + // it is closer to the actual value v. + // + // By generating the digits of too_high we got the largest (closest to + // too_high) buffer that is still in the unsafe interval. In the case where + // w_high < buffer < too_high we try to decrement the buffer. + // This way the buffer approaches (rounds towards) w. + // There are 3 conditions that stop the decrementation process: + // 1) the buffer is already below w_high + // 2) decrementing the buffer would make it leave the unsafe interval + // 3) decrementing the buffer would yield a number below w_high and farther + // away than the current number. In other words: + // (buffer{-1} < w_high) && w_high - buffer{-1} > buffer - w_high + // Instead of using the buffer directly we use its distance to too_high. + // Conceptually rest ~= too_high - buffer + // We need to do the following tests in this order to avoid over- and + // underflows. + ASSERT(rest <= unsafe_interval); + while (rest < small_distance && // Negated condition 1 + unsafe_interval - rest >= ten_kappa && // Negated condition 2 + (rest + ten_kappa < small_distance || // buffer{-1} > w_high + small_distance - rest >= rest + ten_kappa - small_distance)) { + buffer[length - 1]--; + rest += ten_kappa; + } + + // We have approached w+ as much as possible. We now test if approaching w- + // would require changing the buffer. If yes, then we have two possible + // representations close to w, but we cannot decide which one is closer. + if (rest < big_distance && + unsafe_interval - rest >= ten_kappa && + (rest + ten_kappa < big_distance || + big_distance - rest > rest + ten_kappa - big_distance)) { + return false; + } + + // Weeding test. + // The safe interval is [too_low + 2 ulp; too_high - 2 ulp] + // Since too_low = too_high - unsafe_interval this is equivalent to + // [too_high - unsafe_interval + 4 ulp; too_high - 2 ulp] + // Conceptually we have: rest ~= too_high - buffer + return (2 * unit <= rest) && (rest <= unsafe_interval - 4 * unit); +} + + +// Rounds the buffer upwards if the result is closer to v by possibly adding +// 1 to the buffer. If the precision of the calculation is not sufficient to +// round correctly, return false. +// The rounding might shift the whole buffer in which case the kappa is +// adjusted. For example "99", kappa = 3 might become "10", kappa = 4. +// +// If 2*rest > ten_kappa then the buffer needs to be round up. +// rest can have an error of +/- 1 unit. This function accounts for the +// imprecision and returns false, if the rounding direction cannot be +// unambiguously determined. +// +// Precondition: rest < ten_kappa. +static bool RoundWeedCounted(Vector buffer, + int length, + uint64_t rest, + uint64_t ten_kappa, + uint64_t unit, + int* kappa) { + ASSERT(rest < ten_kappa); + // The following tests are done in a specific order to avoid overflows. They + // will work correctly with any uint64 values of rest < ten_kappa and unit. + // + // If the unit is too big, then we don't know which way to round. For example + // a unit of 50 means that the real number lies within rest +/- 50. If + // 10^kappa == 40 then there is no way to tell which way to round. + if (unit >= ten_kappa) return false; + // Even if unit is just half the size of 10^kappa we are already completely + // lost. (And after the previous test we know that the expression will not + // over/underflow.) + if (ten_kappa - unit <= unit) return false; + // If 2 * (rest + unit) <= 10^kappa we can safely round down. + if ((ten_kappa - rest > rest) && (ten_kappa - 2 * rest >= 2 * unit)) { + return true; + } + // If 2 * (rest - unit) >= 10^kappa, then we can safely round up. + if ((rest > unit) && (ten_kappa - (rest - unit) <= (rest - unit))) { + // Increment the last digit recursively until we find a non '9' digit. + buffer[length - 1]++; + for (int i = length - 1; i > 0; --i) { + if (buffer[i] != '0' + 10) break; + buffer[i] = '0'; + buffer[i - 1]++; + } + // If the first digit is now '0'+ 10 we had a buffer with all '9's. With the + // exception of the first digit all digits are now '0'. Simply switch the + // first digit to '1' and adjust the kappa. Example: "99" becomes "10" and + // the power (the kappa) is increased. + if (buffer[0] == '0' + 10) { + buffer[0] = '1'; + (*kappa) += 1; + } + return true; + } + return false; +} + +// Returns the biggest power of ten that is less than or equal to the given +// number. We furthermore receive the maximum number of bits 'number' has. +// +// Returns power == 10^(exponent_plus_one-1) such that +// power <= number < power * 10. +// If number_bits == 0 then 0^(0-1) is returned. +// The number of bits must be <= 32. +// Precondition: number < (1 << (number_bits + 1)). + +// Inspired by the method for finding an integer log base 10 from here: +// http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog10 +static unsigned int const kSmallPowersOfTen[] = + {0, 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, + 1000000000}; + +static void BiggestPowerTen(uint32_t number, + int number_bits, + uint32_t* power, + int* exponent_plus_one) { + ASSERT(number < (1u << (number_bits + 1))); + // 1233/4096 is approximately 1/lg(10). + int exponent_plus_one_guess = ((number_bits + 1) * 1233 >> 12); + // We increment to skip over the first entry in the kPowersOf10 table. + // Note: kPowersOf10[i] == 10^(i-1). + exponent_plus_one_guess++; + // We don't have any guarantees that 2^number_bits <= number. + // TODO(floitsch): can we change the 'while' into an 'if'? We definitely see + // number < (2^number_bits - 1), but I haven't encountered + // number < (2^number_bits - 2) yet. + while (number < kSmallPowersOfTen[exponent_plus_one_guess]) { + exponent_plus_one_guess--; + } + *power = kSmallPowersOfTen[exponent_plus_one_guess]; + *exponent_plus_one = exponent_plus_one_guess; +} + +// Generates the digits of input number w. +// w is a floating-point number (DiyFp), consisting of a significand and an +// exponent. Its exponent is bounded by kMinimalTargetExponent and +// kMaximalTargetExponent. +// Hence -60 <= w.e() <= -32. +// +// Returns false if it fails, in which case the generated digits in the buffer +// should not be used. +// Preconditions: +// * low, w and high are correct up to 1 ulp (unit in the last place). That +// is, their error must be less than a unit of their last digits. +// * low.e() == w.e() == high.e() +// * low < w < high, and taking into account their error: low~ <= high~ +// * kMinimalTargetExponent <= w.e() <= kMaximalTargetExponent +// Postconditions: returns false if procedure fails. +// otherwise: +// * buffer is not null-terminated, but len contains the number of digits. +// * buffer contains the shortest possible decimal digit-sequence +// such that LOW < buffer * 10^kappa < HIGH, where LOW and HIGH are the +// correct values of low and high (without their error). +// * if more than one decimal representation gives the minimal number of +// decimal digits then the one closest to W (where W is the correct value +// of w) is chosen. +// Remark: this procedure takes into account the imprecision of its input +// numbers. If the precision is not enough to guarantee all the postconditions +// then false is returned. This usually happens rarely (~0.5%). +// +// Say, for the sake of example, that +// w.e() == -48, and w.f() == 0x1234567890abcdef +// w's value can be computed by w.f() * 2^w.e() +// We can obtain w's integral digits by simply shifting w.f() by -w.e(). +// -> w's integral part is 0x1234 +// w's fractional part is therefore 0x567890abcdef. +// Printing w's integral part is easy (simply print 0x1234 in decimal). +// In order to print its fraction we repeatedly multiply the fraction by 10 and +// get each digit. Example the first digit after the point would be computed by +// (0x567890abcdef * 10) >> 48. -> 3 +// The whole thing becomes slightly more complicated because we want to stop +// once we have enough digits. That is, once the digits inside the buffer +// represent 'w' we can stop. Everything inside the interval low - high +// represents w. However we have to pay attention to low, high and w's +// imprecision. +static bool DigitGen(DiyFp low, + DiyFp w, + DiyFp high, + Vector buffer, + int* length, + int* kappa) { + ASSERT(low.e() == w.e() && w.e() == high.e()); + ASSERT(low.f() + 1 <= high.f() - 1); + ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent); + // low, w and high are imprecise, but by less than one ulp (unit in the last + // place). + // If we remove (resp. add) 1 ulp from low (resp. high) we are certain that + // the new numbers are outside of the interval we want the final + // representation to lie in. + // Inversely adding (resp. removing) 1 ulp from low (resp. high) would yield + // numbers that are certain to lie in the interval. We will use this fact + // later on. + // We will now start by generating the digits within the uncertain + // interval. Later we will weed out representations that lie outside the safe + // interval and thus _might_ lie outside the correct interval. + uint64_t unit = 1; + DiyFp too_low = DiyFp(low.f() - unit, low.e()); + DiyFp too_high = DiyFp(high.f() + unit, high.e()); + // too_low and too_high are guaranteed to lie outside the interval we want the + // generated number in. + DiyFp unsafe_interval = DiyFp::Minus(too_high, too_low); + // We now cut the input number into two parts: the integral digits and the + // fractionals. We will not write any decimal separator though, but adapt + // kappa instead. + // Reminder: we are currently computing the digits (stored inside the buffer) + // such that: too_low < buffer * 10^kappa < too_high + // We use too_high for the digit_generation and stop as soon as possible. + // If we stop early we effectively round down. + DiyFp one = DiyFp(static_cast(1) << -w.e(), w.e()); + // Division by one is a shift. + uint32_t integrals = static_cast(too_high.f() >> -one.e()); + // Modulo by one is an and. + uint64_t fractionals = too_high.f() & (one.f() - 1); + uint32_t divisor; + int divisor_exponent_plus_one; + BiggestPowerTen(integrals, DiyFp::kSignificandSize - (-one.e()), + &divisor, &divisor_exponent_plus_one); + *kappa = divisor_exponent_plus_one; + *length = 0; + // Loop invariant: buffer = too_high / 10^kappa (integer division) + // The invariant holds for the first iteration: kappa has been initialized + // with the divisor exponent + 1. And the divisor is the biggest power of ten + // that is smaller than integrals. + while (*kappa > 0) { + int digit = integrals / divisor; + buffer[*length] = '0' + digit; + (*length)++; + integrals %= divisor; + (*kappa)--; + // Note that kappa now equals the exponent of the divisor and that the + // invariant thus holds again. + uint64_t rest = + (static_cast(integrals) << -one.e()) + fractionals; + // Invariant: too_high = buffer * 10^kappa + DiyFp(rest, one.e()) + // Reminder: unsafe_interval.e() == one.e() + if (rest < unsafe_interval.f()) { + // Rounding down (by not emitting the remaining digits) yields a number + // that lies within the unsafe interval. + return RoundWeed(buffer, *length, DiyFp::Minus(too_high, w).f(), + unsafe_interval.f(), rest, + static_cast(divisor) << -one.e(), unit); + } + divisor /= 10; + } + + // The integrals have been generated. We are at the point of the decimal + // separator. In the following loop we simply multiply the remaining digits by + // 10 and divide by one. We just need to pay attention to multiply associated + // data (like the interval or 'unit'), too. + // Note that the multiplication by 10 does not overflow, because w.e >= -60 + // and thus one.e >= -60. + ASSERT(one.e() >= -60); + ASSERT(fractionals < one.f()); + ASSERT(UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f()); + while (true) { + fractionals *= 10; + unit *= 10; + unsafe_interval.set_f(unsafe_interval.f() * 10); + // Integer division by one. + int digit = static_cast(fractionals >> -one.e()); + buffer[*length] = '0' + digit; + (*length)++; + fractionals &= one.f() - 1; // Modulo by one. + (*kappa)--; + if (fractionals < unsafe_interval.f()) { + return RoundWeed(buffer, *length, DiyFp::Minus(too_high, w).f() * unit, + unsafe_interval.f(), fractionals, one.f(), unit); + } + } +} + + + +// Generates (at most) requested_digits digits of input number w. +// w is a floating-point number (DiyFp), consisting of a significand and an +// exponent. Its exponent is bounded by kMinimalTargetExponent and +// kMaximalTargetExponent. +// Hence -60 <= w.e() <= -32. +// +// Returns false if it fails, in which case the generated digits in the buffer +// should not be used. +// Preconditions: +// * w is correct up to 1 ulp (unit in the last place). That +// is, its error must be strictly less than a unit of its last digit. +// * kMinimalTargetExponent <= w.e() <= kMaximalTargetExponent +// +// Postconditions: returns false if procedure fails. +// otherwise: +// * buffer is not null-terminated, but length contains the number of +// digits. +// * the representation in buffer is the most precise representation of +// requested_digits digits. +// * buffer contains at most requested_digits digits of w. If there are less +// than requested_digits digits then some trailing '0's have been removed. +// * kappa is such that +// w = buffer * 10^kappa + eps with |eps| < 10^kappa / 2. +// +// Remark: This procedure takes into account the imprecision of its input +// numbers. If the precision is not enough to guarantee all the postconditions +// then false is returned. This usually happens rarely, but the failure-rate +// increases with higher requested_digits. +static bool DigitGenCounted(DiyFp w, + int requested_digits, + Vector buffer, + int* length, + int* kappa) { + ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent); + ASSERT(kMinimalTargetExponent >= -60); + ASSERT(kMaximalTargetExponent <= -32); + // w is assumed to have an error less than 1 unit. Whenever w is scaled we + // also scale its error. + uint64_t w_error = 1; + // We cut the input number into two parts: the integral digits and the + // fractional digits. We don't emit any decimal separator, but adapt kappa + // instead. Example: instead of writing "1.2" we put "12" into the buffer and + // increase kappa by 1. + DiyFp one = DiyFp(static_cast(1) << -w.e(), w.e()); + // Division by one is a shift. + uint32_t integrals = static_cast(w.f() >> -one.e()); + // Modulo by one is an and. + uint64_t fractionals = w.f() & (one.f() - 1); + uint32_t divisor; + int divisor_exponent_plus_one; + BiggestPowerTen(integrals, DiyFp::kSignificandSize - (-one.e()), + &divisor, &divisor_exponent_plus_one); + *kappa = divisor_exponent_plus_one; + *length = 0; + + // Loop invariant: buffer = w / 10^kappa (integer division) + // The invariant holds for the first iteration: kappa has been initialized + // with the divisor exponent + 1. And the divisor is the biggest power of ten + // that is smaller than 'integrals'. + while (*kappa > 0) { + int digit = integrals / divisor; + buffer[*length] = '0' + digit; + (*length)++; + requested_digits--; + integrals %= divisor; + (*kappa)--; + // Note that kappa now equals the exponent of the divisor and that the + // invariant thus holds again. + if (requested_digits == 0) break; + divisor /= 10; + } + + if (requested_digits == 0) { + uint64_t rest = + (static_cast(integrals) << -one.e()) + fractionals; + return RoundWeedCounted(buffer, *length, rest, + static_cast(divisor) << -one.e(), w_error, + kappa); + } + + // The integrals have been generated. We are at the point of the decimal + // separator. In the following loop we simply multiply the remaining digits by + // 10 and divide by one. We just need to pay attention to multiply associated + // data (the 'unit'), too. + // Note that the multiplication by 10 does not overflow, because w.e >= -60 + // and thus one.e >= -60. + ASSERT(one.e() >= -60); + ASSERT(fractionals < one.f()); + ASSERT(UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f()); + while (requested_digits > 0 && fractionals > w_error) { + fractionals *= 10; + w_error *= 10; + // Integer division by one. + int digit = static_cast(fractionals >> -one.e()); + buffer[*length] = '0' + digit; + (*length)++; + requested_digits--; + fractionals &= one.f() - 1; // Modulo by one. + (*kappa)--; + } + if (requested_digits != 0) return false; + return RoundWeedCounted(buffer, *length, fractionals, one.f(), w_error, + kappa); +} + + +// Provides a decimal representation of v. +// Returns true if it succeeds, otherwise the result cannot be trusted. +// There will be *length digits inside the buffer (not null-terminated). +// If the function returns true then +// v == (double) (buffer * 10^decimal_exponent). +// The digits in the buffer are the shortest representation possible: no +// 0.09999999999999999 instead of 0.1. The shorter representation will even be +// chosen even if the longer one would be closer to v. +// The last digit will be closest to the actual v. That is, even if several +// digits might correctly yield 'v' when read again, the closest will be +// computed. +static bool Grisu3(double v, + FastDtoaMode mode, + Vector buffer, + int* length, + int* decimal_exponent) { + DiyFp w = Double(v).AsNormalizedDiyFp(); + // boundary_minus and boundary_plus are the boundaries between v and its + // closest floating-point neighbors. Any number strictly between + // boundary_minus and boundary_plus will round to v when convert to a double. + // Grisu3 will never output representations that lie exactly on a boundary. + DiyFp boundary_minus, boundary_plus; + if (mode == FAST_DTOA_SHORTEST) { + Double(v).NormalizedBoundaries(&boundary_minus, &boundary_plus); + } else { + ASSERT(mode == FAST_DTOA_SHORTEST_SINGLE); + float single_v = static_cast(v); + Single(single_v).NormalizedBoundaries(&boundary_minus, &boundary_plus); + } + ASSERT(boundary_plus.e() == w.e()); + DiyFp ten_mk; // Cached power of ten: 10^-k + int mk; // -k + int ten_mk_minimal_binary_exponent = + kMinimalTargetExponent - (w.e() + DiyFp::kSignificandSize); + int ten_mk_maximal_binary_exponent = + kMaximalTargetExponent - (w.e() + DiyFp::kSignificandSize); + PowersOfTenCache::GetCachedPowerForBinaryExponentRange( + ten_mk_minimal_binary_exponent, + ten_mk_maximal_binary_exponent, + &ten_mk, &mk); + ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() + + DiyFp::kSignificandSize) && + (kMaximalTargetExponent >= w.e() + ten_mk.e() + + DiyFp::kSignificandSize)); + // Note that ten_mk is only an approximation of 10^-k. A DiyFp only contains a + // 64 bit significand and ten_mk is thus only precise up to 64 bits. + + // The DiyFp::Times procedure rounds its result, and ten_mk is approximated + // too. The variable scaled_w (as well as scaled_boundary_minus/plus) are now + // off by a small amount. + // In fact: scaled_w - w*10^k < 1ulp (unit in the last place) of scaled_w. + // In other words: let f = scaled_w.f() and e = scaled_w.e(), then + // (f-1) * 2^e < w*10^k < (f+1) * 2^e + DiyFp scaled_w = DiyFp::Times(w, ten_mk); + ASSERT(scaled_w.e() == + boundary_plus.e() + ten_mk.e() + DiyFp::kSignificandSize); + // In theory it would be possible to avoid some recomputations by computing + // the difference between w and boundary_minus/plus (a power of 2) and to + // compute scaled_boundary_minus/plus by subtracting/adding from + // scaled_w. However the code becomes much less readable and the speed + // enhancements are not terriffic. + DiyFp scaled_boundary_minus = DiyFp::Times(boundary_minus, ten_mk); + DiyFp scaled_boundary_plus = DiyFp::Times(boundary_plus, ten_mk); + + // DigitGen will generate the digits of scaled_w. Therefore we have + // v == (double) (scaled_w * 10^-mk). + // Set decimal_exponent == -mk and pass it to DigitGen. If scaled_w is not an + // integer than it will be updated. For instance if scaled_w == 1.23 then + // the buffer will be filled with "123" und the decimal_exponent will be + // decreased by 2. + int kappa; + bool result = DigitGen(scaled_boundary_minus, scaled_w, scaled_boundary_plus, + buffer, length, &kappa); + *decimal_exponent = -mk + kappa; + return result; +} + + +// The "counted" version of grisu3 (see above) only generates requested_digits +// number of digits. This version does not generate the shortest representation, +// and with enough requested digits 0.1 will at some point print as 0.9999999... +// Grisu3 is too imprecise for real halfway cases (1.5 will not work) and +// therefore the rounding strategy for halfway cases is irrelevant. +static bool Grisu3Counted(double v, + int requested_digits, + Vector buffer, + int* length, + int* decimal_exponent) { + DiyFp w = Double(v).AsNormalizedDiyFp(); + DiyFp ten_mk; // Cached power of ten: 10^-k + int mk; // -k + int ten_mk_minimal_binary_exponent = + kMinimalTargetExponent - (w.e() + DiyFp::kSignificandSize); + int ten_mk_maximal_binary_exponent = + kMaximalTargetExponent - (w.e() + DiyFp::kSignificandSize); + PowersOfTenCache::GetCachedPowerForBinaryExponentRange( + ten_mk_minimal_binary_exponent, + ten_mk_maximal_binary_exponent, + &ten_mk, &mk); + ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() + + DiyFp::kSignificandSize) && + (kMaximalTargetExponent >= w.e() + ten_mk.e() + + DiyFp::kSignificandSize)); + // Note that ten_mk is only an approximation of 10^-k. A DiyFp only contains a + // 64 bit significand and ten_mk is thus only precise up to 64 bits. + + // The DiyFp::Times procedure rounds its result, and ten_mk is approximated + // too. The variable scaled_w (as well as scaled_boundary_minus/plus) are now + // off by a small amount. + // In fact: scaled_w - w*10^k < 1ulp (unit in the last place) of scaled_w. + // In other words: let f = scaled_w.f() and e = scaled_w.e(), then + // (f-1) * 2^e < w*10^k < (f+1) * 2^e + DiyFp scaled_w = DiyFp::Times(w, ten_mk); + + // We now have (double) (scaled_w * 10^-mk). + // DigitGen will generate the first requested_digits digits of scaled_w and + // return together with a kappa such that scaled_w ~= buffer * 10^kappa. (It + // will not always be exactly the same since DigitGenCounted only produces a + // limited number of digits.) + int kappa; + bool result = DigitGenCounted(scaled_w, requested_digits, + buffer, length, &kappa); + *decimal_exponent = -mk + kappa; + return result; +} + + +bool FastDtoa(double v, + FastDtoaMode mode, + int requested_digits, + Vector buffer, + int* length, + int* decimal_point) { + ASSERT(v > 0); + ASSERT(!Double(v).IsSpecial()); + + bool result = false; + int decimal_exponent = 0; + switch (mode) { + case FAST_DTOA_SHORTEST: + case FAST_DTOA_SHORTEST_SINGLE: + result = Grisu3(v, mode, buffer, length, &decimal_exponent); + break; + case FAST_DTOA_PRECISION: + result = Grisu3Counted(v, requested_digits, + buffer, length, &decimal_exponent); + break; + default: + UNREACHABLE(); + } + if (result) { + *decimal_point = *length + decimal_exponent; + buffer[*length] = '\0'; + } + return result; +} + +} // namespace double_conversion diff --git a/Foundation/src/fast-dtoa.h b/Foundation/src/fast-dtoa.h new file mode 100644 index 000000000..5f1e8eee5 --- /dev/null +++ b/Foundation/src/fast-dtoa.h @@ -0,0 +1,88 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef DOUBLE_CONVERSION_FAST_DTOA_H_ +#define DOUBLE_CONVERSION_FAST_DTOA_H_ + +#include "utils.h" + +namespace double_conversion { + +enum FastDtoaMode { + // Computes the shortest representation of the given input. The returned + // result will be the most accurate number of this length. Longer + // representations might be more accurate. + FAST_DTOA_SHORTEST, + // Same as FAST_DTOA_SHORTEST but for single-precision floats. + FAST_DTOA_SHORTEST_SINGLE, + // Computes a representation where the precision (number of digits) is + // given as input. The precision is independent of the decimal point. + FAST_DTOA_PRECISION +}; + +// FastDtoa will produce at most kFastDtoaMaximalLength digits. This does not +// include the terminating '\0' character. +static const int kFastDtoaMaximalLength = 17; +// Same for single-precision numbers. +static const int kFastDtoaMaximalSingleLength = 9; + +// Provides a decimal representation of v. +// The result should be interpreted as buffer * 10^(point - length). +// +// Precondition: +// * v must be a strictly positive finite double. +// +// Returns true if it succeeds, otherwise the result can not be trusted. +// There will be *length digits inside the buffer followed by a null terminator. +// If the function returns true and mode equals +// - FAST_DTOA_SHORTEST, then +// the parameter requested_digits is ignored. +// The result satisfies +// v == (double) (buffer * 10^(point - length)). +// The digits in the buffer are the shortest representation possible. E.g. +// if 0.099999999999 and 0.1 represent the same double then "1" is returned +// with point = 0. +// The last digit will be closest to the actual v. That is, even if several +// digits might correctly yield 'v' when read again, the buffer will contain +// the one closest to v. +// - FAST_DTOA_PRECISION, then +// the buffer contains requested_digits digits. +// the difference v - (buffer * 10^(point-length)) is closest to zero for +// all possible representations of requested_digits digits. +// If there are two values that are equally close, then FastDtoa returns +// false. +// For both modes the buffer must be large enough to hold the result. +bool FastDtoa(double d, + FastDtoaMode mode, + int requested_digits, + Vector buffer, + int* length, + int* decimal_point); + +} // namespace double_conversion + +#endif // DOUBLE_CONVERSION_FAST_DTOA_H_ diff --git a/Foundation/src/fixed-dtoa.cc b/Foundation/src/fixed-dtoa.cc new file mode 100644 index 000000000..d56b1449b --- /dev/null +++ b/Foundation/src/fixed-dtoa.cc @@ -0,0 +1,402 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include + +#include "fixed-dtoa.h" +#include "ieee.h" + +namespace double_conversion { + +// Represents a 128bit type. This class should be replaced by a native type on +// platforms that support 128bit integers. +class UInt128 { + public: + UInt128() : high_bits_(0), low_bits_(0) { } + UInt128(uint64_t high, uint64_t low) : high_bits_(high), low_bits_(low) { } + + void Multiply(uint32_t multiplicand) { + uint64_t accumulator; + + accumulator = (low_bits_ & kMask32) * multiplicand; + uint32_t part = static_cast(accumulator & kMask32); + accumulator >>= 32; + accumulator = accumulator + (low_bits_ >> 32) * multiplicand; + low_bits_ = (accumulator << 32) + part; + accumulator >>= 32; + accumulator = accumulator + (high_bits_ & kMask32) * multiplicand; + part = static_cast(accumulator & kMask32); + accumulator >>= 32; + accumulator = accumulator + (high_bits_ >> 32) * multiplicand; + high_bits_ = (accumulator << 32) + part; + ASSERT((accumulator >> 32) == 0); + } + + void Shift(int shift_amount) { + ASSERT(-64 <= shift_amount && shift_amount <= 64); + if (shift_amount == 0) { + return; + } else if (shift_amount == -64) { + high_bits_ = low_bits_; + low_bits_ = 0; + } else if (shift_amount == 64) { + low_bits_ = high_bits_; + high_bits_ = 0; + } else if (shift_amount <= 0) { + high_bits_ <<= -shift_amount; + high_bits_ += low_bits_ >> (64 + shift_amount); + low_bits_ <<= -shift_amount; + } else { + low_bits_ >>= shift_amount; + low_bits_ += high_bits_ << (64 - shift_amount); + high_bits_ >>= shift_amount; + } + } + + // Modifies *this to *this MOD (2^power). + // Returns *this DIV (2^power). + int DivModPowerOf2(int power) { + if (power >= 64) { + int result = static_cast(high_bits_ >> (power - 64)); + high_bits_ -= static_cast(result) << (power - 64); + return result; + } else { + uint64_t part_low = low_bits_ >> power; + uint64_t part_high = high_bits_ << (64 - power); + int result = static_cast(part_low + part_high); + high_bits_ = 0; + low_bits_ -= part_low << power; + return result; + } + } + + bool IsZero() const { + return high_bits_ == 0 && low_bits_ == 0; + } + + int BitAt(int position) { + if (position >= 64) { + return static_cast(high_bits_ >> (position - 64)) & 1; + } else { + return static_cast(low_bits_ >> position) & 1; + } + } + + private: + static const uint64_t kMask32 = 0xFFFFFFFF; + // Value == (high_bits_ << 64) + low_bits_ + uint64_t high_bits_; + uint64_t low_bits_; +}; + + +static const int kDoubleSignificandSize = 53; // Includes the hidden bit. + + +static void FillDigits32FixedLength(uint32_t number, int requested_length, + Vector buffer, int* length) { + for (int i = requested_length - 1; i >= 0; --i) { + buffer[(*length) + i] = '0' + number % 10; + number /= 10; + } + *length += requested_length; +} + + +static void FillDigits32(uint32_t number, Vector buffer, int* length) { + int number_length = 0; + // We fill the digits in reverse order and exchange them afterwards. + while (number != 0) { + int digit = number % 10; + number /= 10; + buffer[(*length) + number_length] = '0' + digit; + number_length++; + } + // Exchange the digits. + int i = *length; + int j = *length + number_length - 1; + while (i < j) { + char tmp = buffer[i]; + buffer[i] = buffer[j]; + buffer[j] = tmp; + i++; + j--; + } + *length += number_length; +} + + +static void FillDigits64FixedLength(uint64_t number, int requested_length, + Vector buffer, int* length) { + const uint32_t kTen7 = 10000000; + // For efficiency cut the number into 3 uint32_t parts, and print those. + uint32_t part2 = static_cast(number % kTen7); + number /= kTen7; + uint32_t part1 = static_cast(number % kTen7); + uint32_t part0 = static_cast(number / kTen7); + + FillDigits32FixedLength(part0, 3, buffer, length); + FillDigits32FixedLength(part1, 7, buffer, length); + FillDigits32FixedLength(part2, 7, buffer, length); +} + + +static void FillDigits64(uint64_t number, Vector buffer, int* length) { + const uint32_t kTen7 = 10000000; + // For efficiency cut the number into 3 uint32_t parts, and print those. + uint32_t part2 = static_cast(number % kTen7); + number /= kTen7; + uint32_t part1 = static_cast(number % kTen7); + uint32_t part0 = static_cast(number / kTen7); + + if (part0 != 0) { + FillDigits32(part0, buffer, length); + FillDigits32FixedLength(part1, 7, buffer, length); + FillDigits32FixedLength(part2, 7, buffer, length); + } else if (part1 != 0) { + FillDigits32(part1, buffer, length); + FillDigits32FixedLength(part2, 7, buffer, length); + } else { + FillDigits32(part2, buffer, length); + } +} + + +static void RoundUp(Vector buffer, int* length, int* decimal_point) { + // An empty buffer represents 0. + if (*length == 0) { + buffer[0] = '1'; + *decimal_point = 1; + *length = 1; + return; + } + // Round the last digit until we either have a digit that was not '9' or until + // we reached the first digit. + buffer[(*length) - 1]++; + for (int i = (*length) - 1; i > 0; --i) { + if (buffer[i] != '0' + 10) { + return; + } + buffer[i] = '0'; + buffer[i - 1]++; + } + // If the first digit is now '0' + 10, we would need to set it to '0' and add + // a '1' in front. However we reach the first digit only if all following + // digits had been '9' before rounding up. Now all trailing digits are '0' and + // we simply switch the first digit to '1' and update the decimal-point + // (indicating that the point is now one digit to the right). + if (buffer[0] == '0' + 10) { + buffer[0] = '1'; + (*decimal_point)++; + } +} + + +// The given fractionals number represents a fixed-point number with binary +// point at bit (-exponent). +// Preconditions: +// -128 <= exponent <= 0. +// 0 <= fractionals * 2^exponent < 1 +// The buffer holds the result. +// The function will round its result. During the rounding-process digits not +// generated by this function might be updated, and the decimal-point variable +// might be updated. If this function generates the digits 99 and the buffer +// already contained "199" (thus yielding a buffer of "19999") then a +// rounding-up will change the contents of the buffer to "20000". +static void FillFractionals(uint64_t fractionals, int exponent, + int fractional_count, Vector buffer, + int* length, int* decimal_point) { + ASSERT(-128 <= exponent && exponent <= 0); + // 'fractionals' is a fixed-point number, with binary point at bit + // (-exponent). Inside the function the non-converted remainder of fractionals + // is a fixed-point number, with binary point at bit 'point'. + if (-exponent <= 64) { + // One 64 bit number is sufficient. + ASSERT(fractionals >> 56 == 0); + int point = -exponent; + for (int i = 0; i < fractional_count; ++i) { + if (fractionals == 0) break; + // Instead of multiplying by 10 we multiply by 5 and adjust the point + // location. This way the fractionals variable will not overflow. + // Invariant at the beginning of the loop: fractionals < 2^point. + // Initially we have: point <= 64 and fractionals < 2^56 + // After each iteration the point is decremented by one. + // Note that 5^3 = 125 < 128 = 2^7. + // Therefore three iterations of this loop will not overflow fractionals + // (even without the subtraction at the end of the loop body). At this + // time point will satisfy point <= 61 and therefore fractionals < 2^point + // and any further multiplication of fractionals by 5 will not overflow. + fractionals *= 5; + point--; + int digit = static_cast(fractionals >> point); + buffer[*length] = '0' + digit; + (*length)++; + fractionals -= static_cast(digit) << point; + } + // If the first bit after the point is set we have to round up. + if (((fractionals >> (point - 1)) & 1) == 1) { + RoundUp(buffer, length, decimal_point); + } + } else { // We need 128 bits. + ASSERT(64 < -exponent && -exponent <= 128); + UInt128 fractionals128 = UInt128(fractionals, 0); + fractionals128.Shift(-exponent - 64); + int point = 128; + for (int i = 0; i < fractional_count; ++i) { + if (fractionals128.IsZero()) break; + // As before: instead of multiplying by 10 we multiply by 5 and adjust the + // point location. + // This multiplication will not overflow for the same reasons as before. + fractionals128.Multiply(5); + point--; + int digit = fractionals128.DivModPowerOf2(point); + buffer[*length] = '0' + digit; + (*length)++; + } + if (fractionals128.BitAt(point - 1) == 1) { + RoundUp(buffer, length, decimal_point); + } + } +} + + +// Removes leading and trailing zeros. +// If leading zeros are removed then the decimal point position is adjusted. +static void TrimZeros(Vector buffer, int* length, int* decimal_point) { + while (*length > 0 && buffer[(*length) - 1] == '0') { + (*length)--; + } + int first_non_zero = 0; + while (first_non_zero < *length && buffer[first_non_zero] == '0') { + first_non_zero++; + } + if (first_non_zero != 0) { + for (int i = first_non_zero; i < *length; ++i) { + buffer[i - first_non_zero] = buffer[i]; + } + *length -= first_non_zero; + *decimal_point -= first_non_zero; + } +} + + +bool FastFixedDtoa(double v, + int fractional_count, + Vector buffer, + int* length, + int* decimal_point) { + const uint32_t kMaxUInt32 = 0xFFFFFFFF; + uint64_t significand = Double(v).Significand(); + int exponent = Double(v).Exponent(); + // v = significand * 2^exponent (with significand a 53bit integer). + // If the exponent is larger than 20 (i.e. we may have a 73bit number) then we + // don't know how to compute the representation. 2^73 ~= 9.5*10^21. + // If necessary this limit could probably be increased, but we don't need + // more. + if (exponent > 20) return false; + if (fractional_count > 20) return false; + *length = 0; + // At most kDoubleSignificandSize bits of the significand are non-zero. + // Given a 64 bit integer we have 11 0s followed by 53 potentially non-zero + // bits: 0..11*..0xxx..53*..xx + if (exponent + kDoubleSignificandSize > 64) { + // The exponent must be > 11. + // + // We know that v = significand * 2^exponent. + // And the exponent > 11. + // We simplify the task by dividing v by 10^17. + // The quotient delivers the first digits, and the remainder fits into a 64 + // bit number. + // Dividing by 10^17 is equivalent to dividing by 5^17*2^17. + const uint64_t kFive17 = UINT64_2PART_C(0xB1, A2BC2EC5); // 5^17 + uint64_t divisor = kFive17; + int divisor_power = 17; + uint64_t dividend = significand; + uint32_t quotient; + uint64_t remainder; + // Let v = f * 2^e with f == significand and e == exponent. + // Then need q (quotient) and r (remainder) as follows: + // v = q * 10^17 + r + // f * 2^e = q * 10^17 + r + // f * 2^e = q * 5^17 * 2^17 + r + // If e > 17 then + // f * 2^(e-17) = q * 5^17 + r/2^17 + // else + // f = q * 5^17 * 2^(17-e) + r/2^e + if (exponent > divisor_power) { + // We only allow exponents of up to 20 and therefore (17 - e) <= 3 + dividend <<= exponent - divisor_power; + quotient = static_cast(dividend / divisor); + remainder = (dividend % divisor) << divisor_power; + } else { + divisor <<= divisor_power - exponent; + quotient = static_cast(dividend / divisor); + remainder = (dividend % divisor) << exponent; + } + FillDigits32(quotient, buffer, length); + FillDigits64FixedLength(remainder, divisor_power, buffer, length); + *decimal_point = *length; + } else if (exponent >= 0) { + // 0 <= exponent <= 11 + significand <<= exponent; + FillDigits64(significand, buffer, length); + *decimal_point = *length; + } else if (exponent > -kDoubleSignificandSize) { + // We have to cut the number. + uint64_t integrals = significand >> -exponent; + uint64_t fractionals = significand - (integrals << -exponent); + if (integrals > kMaxUInt32) { + FillDigits64(integrals, buffer, length); + } else { + FillDigits32(static_cast(integrals), buffer, length); + } + *decimal_point = *length; + FillFractionals(fractionals, exponent, fractional_count, + buffer, length, decimal_point); + } else if (exponent < -128) { + // This configuration (with at most 20 digits) means that all digits must be + // 0. + ASSERT(fractional_count <= 20); + buffer[0] = '\0'; + *length = 0; + *decimal_point = -fractional_count; + } else { + *decimal_point = 0; + FillFractionals(significand, exponent, fractional_count, + buffer, length, decimal_point); + } + TrimZeros(buffer, length, decimal_point); + buffer[*length] = '\0'; + if ((*length) == 0) { + // The string is empty and the decimal_point thus has no importance. Mimick + // Gay's dtoa and and set it to -fractional_count. + *decimal_point = -fractional_count; + } + return true; +} + +} // namespace double_conversion diff --git a/Foundation/src/fixed-dtoa.h b/Foundation/src/fixed-dtoa.h new file mode 100644 index 000000000..3bdd08e21 --- /dev/null +++ b/Foundation/src/fixed-dtoa.h @@ -0,0 +1,56 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef DOUBLE_CONVERSION_FIXED_DTOA_H_ +#define DOUBLE_CONVERSION_FIXED_DTOA_H_ + +#include "utils.h" + +namespace double_conversion { + +// Produces digits necessary to print a given number with +// 'fractional_count' digits after the decimal point. +// The buffer must be big enough to hold the result plus one terminating null +// character. +// +// The produced digits might be too short in which case the caller has to fill +// the gaps with '0's. +// Example: FastFixedDtoa(0.001, 5, ...) is allowed to return buffer = "1", and +// decimal_point = -2. +// Halfway cases are rounded towards +/-Infinity (away from 0). The call +// FastFixedDtoa(0.15, 2, ...) thus returns buffer = "2", decimal_point = 0. +// The returned buffer may contain digits that would be truncated from the +// shortest representation of the input. +// +// This method only works for some parameters. If it can't handle the input it +// returns false. The output is null-terminated when the function succeeds. +bool FastFixedDtoa(double v, int fractional_count, + Vector buffer, int* length, int* decimal_point); + +} // namespace double_conversion + +#endif // DOUBLE_CONVERSION_FIXED_DTOA_H_ diff --git a/Foundation/src/ieee.h b/Foundation/src/ieee.h new file mode 100644 index 000000000..839dc47d4 --- /dev/null +++ b/Foundation/src/ieee.h @@ -0,0 +1,398 @@ +// Copyright 2012 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef DOUBLE_CONVERSION_DOUBLE_H_ +#define DOUBLE_CONVERSION_DOUBLE_H_ + +#include "diy-fp.h" + +namespace double_conversion { + +// We assume that doubles and uint64_t have the same endianness. +static uint64_t double_to_uint64(double d) { return BitCast(d); } +static double uint64_to_double(uint64_t d64) { return BitCast(d64); } +static uint32_t float_to_uint32(float f) { return BitCast(f); } +static float uint32_to_float(uint32_t d32) { return BitCast(d32); } + +// Helper functions for doubles. +class Double { + public: + static const uint64_t kSignMask = UINT64_2PART_C(0x80000000, 00000000); + static const uint64_t kExponentMask = UINT64_2PART_C(0x7FF00000, 00000000); + static const uint64_t kSignificandMask = UINT64_2PART_C(0x000FFFFF, FFFFFFFF); + static const uint64_t kHiddenBit = UINT64_2PART_C(0x00100000, 00000000); + static const int kPhysicalSignificandSize = 52; // Excludes the hidden bit. + static const int kSignificandSize = 53; + + Double() : d64_(0) {} + explicit Double(double d) : d64_(double_to_uint64(d)) {} + explicit Double(uint64_t d64) : d64_(d64) {} + explicit Double(DiyFp diy_fp) + : d64_(DiyFpToUint64(diy_fp)) {} + + // The value encoded by this Double must be greater or equal to +0.0. + // It must not be special (infinity, or NaN). + DiyFp AsDiyFp() const { + ASSERT(Sign() > 0); + ASSERT(!IsSpecial()); + return DiyFp(Significand(), Exponent()); + } + + // The value encoded by this Double must be strictly greater than 0. + DiyFp AsNormalizedDiyFp() const { + ASSERT(value() > 0.0); + uint64_t f = Significand(); + int e = Exponent(); + + // The current double could be a denormal. + while ((f & kHiddenBit) == 0) { + f <<= 1; + e--; + } + // Do the final shifts in one go. + f <<= DiyFp::kSignificandSize - kSignificandSize; + e -= DiyFp::kSignificandSize - kSignificandSize; + return DiyFp(f, e); + } + + // Returns the double's bit as uint64. + uint64_t AsUint64() const { + return d64_; + } + + // Returns the next greater double. Returns +infinity on input +infinity. + double NextDouble() const { + if (d64_ == kInfinity) return Double(kInfinity).value(); + if (Sign() < 0 && Significand() == 0) { + // -0.0 + return 0.0; + } + if (Sign() < 0) { + return Double(d64_ - 1).value(); + } else { + return Double(d64_ + 1).value(); + } + } + + double PreviousDouble() const { + if (d64_ == (kInfinity | kSignMask)) return -Double::Infinity(); + if (Sign() < 0) { + return Double(d64_ + 1).value(); + } else { + if (Significand() == 0) return -0.0; + return Double(d64_ - 1).value(); + } + } + + int Exponent() const { + if (IsDenormal()) return kDenormalExponent; + + uint64_t d64 = AsUint64(); + int biased_e = + static_cast((d64 & kExponentMask) >> kPhysicalSignificandSize); + return biased_e - kExponentBias; + } + + uint64_t Significand() const { + uint64_t d64 = AsUint64(); + uint64_t significand = d64 & kSignificandMask; + if (!IsDenormal()) { + return significand + kHiddenBit; + } else { + return significand; + } + } + + // Returns true if the double is a denormal. + bool IsDenormal() const { + uint64_t d64 = AsUint64(); + return (d64 & kExponentMask) == 0; + } + + // We consider denormals not to be special. + // Hence only Infinity and NaN are special. + bool IsSpecial() const { + uint64_t d64 = AsUint64(); + return (d64 & kExponentMask) == kExponentMask; + } + + bool IsNan() const { + uint64_t d64 = AsUint64(); + return ((d64 & kExponentMask) == kExponentMask) && + ((d64 & kSignificandMask) != 0); + } + + bool IsInfinite() const { + uint64_t d64 = AsUint64(); + return ((d64 & kExponentMask) == kExponentMask) && + ((d64 & kSignificandMask) == 0); + } + + int Sign() const { + uint64_t d64 = AsUint64(); + return (d64 & kSignMask) == 0? 1: -1; + } + + // Precondition: the value encoded by this Double must be greater or equal + // than +0.0. + DiyFp UpperBoundary() const { + ASSERT(Sign() > 0); + return DiyFp(Significand() * 2 + 1, Exponent() - 1); + } + + // Computes the two boundaries of this. + // The bigger boundary (m_plus) is normalized. The lower boundary has the same + // exponent as m_plus. + // Precondition: the value encoded by this Double must be greater than 0. + void NormalizedBoundaries(DiyFp* out_m_minus, DiyFp* out_m_plus) const { + ASSERT(value() > 0.0); + DiyFp v = this->AsDiyFp(); + DiyFp m_plus = DiyFp::Normalize(DiyFp((v.f() << 1) + 1, v.e() - 1)); + DiyFp m_minus; + if (LowerBoundaryIsCloser()) { + m_minus = DiyFp((v.f() << 2) - 1, v.e() - 2); + } else { + m_minus = DiyFp((v.f() << 1) - 1, v.e() - 1); + } + m_minus.set_f(m_minus.f() << (m_minus.e() - m_plus.e())); + m_minus.set_e(m_plus.e()); + *out_m_plus = m_plus; + *out_m_minus = m_minus; + } + + bool LowerBoundaryIsCloser() const { + // The boundary is closer if the significand is of the form f == 2^p-1 then + // the lower boundary is closer. + // Think of v = 1000e10 and v- = 9999e9. + // Then the boundary (== (v - v-)/2) is not just at a distance of 1e9 but + // at a distance of 1e8. + // The only exception is for the smallest normal: the largest denormal is + // at the same distance as its successor. + // Note: denormals have the same exponent as the smallest normals. + bool physical_significand_is_zero = ((AsUint64() & kSignificandMask) == 0); + return physical_significand_is_zero && (Exponent() != kDenormalExponent); + } + + double value() const { return uint64_to_double(d64_); } + + // Returns the significand size for a given order of magnitude. + // If v = f*2^e with 2^p-1 <= f <= 2^p then p+e is v's order of magnitude. + // This function returns the number of significant binary digits v will have + // once it's encoded into a double. In almost all cases this is equal to + // kSignificandSize. The only exceptions are denormals. They start with + // leading zeroes and their effective significand-size is hence smaller. + static int SignificandSizeForOrderOfMagnitude(int order) { + if (order >= (kDenormalExponent + kSignificandSize)) { + return kSignificandSize; + } + if (order <= kDenormalExponent) return 0; + return order - kDenormalExponent; + } + + static double Infinity() { + return Double(kInfinity).value(); + } + + static double NaN() { + return Double(kNaN).value(); + } + + private: + static const int kExponentBias = 0x3FF + kPhysicalSignificandSize; + static const int kDenormalExponent = -kExponentBias + 1; + static const int kMaxExponent = 0x7FF - kExponentBias; + static const uint64_t kInfinity = UINT64_2PART_C(0x7FF00000, 00000000); + static const uint64_t kNaN = UINT64_2PART_C(0x7FF80000, 00000000); + + const uint64_t d64_; + + static uint64_t DiyFpToUint64(DiyFp diy_fp) { + uint64_t significand = diy_fp.f(); + int exponent = diy_fp.e(); + while (significand > kHiddenBit + kSignificandMask) { + significand >>= 1; + exponent++; + } + if (exponent >= kMaxExponent) { + return kInfinity; + } + if (exponent < kDenormalExponent) { + return 0; + } + while (exponent > kDenormalExponent && (significand & kHiddenBit) == 0) { + significand <<= 1; + exponent--; + } + uint64_t biased_exponent; + if (exponent == kDenormalExponent && (significand & kHiddenBit) == 0) { + biased_exponent = 0; + } else { + biased_exponent = static_cast(exponent + kExponentBias); + } + return (significand & kSignificandMask) | + (biased_exponent << kPhysicalSignificandSize); + } +}; + +class Single { + public: + static const uint32_t kSignMask = 0x80000000; + static const uint32_t kExponentMask = 0x7F800000; + static const uint32_t kSignificandMask = 0x007FFFFF; + static const uint32_t kHiddenBit = 0x00800000; + static const int kPhysicalSignificandSize = 23; // Excludes the hidden bit. + static const int kSignificandSize = 24; + + Single() : d32_(0) {} + explicit Single(float f) : d32_(float_to_uint32(f)) {} + explicit Single(uint32_t d32) : d32_(d32) {} + + // The value encoded by this Single must be greater or equal to +0.0. + // It must not be special (infinity, or NaN). + DiyFp AsDiyFp() const { + ASSERT(Sign() > 0); + ASSERT(!IsSpecial()); + return DiyFp(Significand(), Exponent()); + } + + // Returns the single's bit as uint64. + uint32_t AsUint32() const { + return d32_; + } + + int Exponent() const { + if (IsDenormal()) return kDenormalExponent; + + uint32_t d32 = AsUint32(); + int biased_e = + static_cast((d32 & kExponentMask) >> kPhysicalSignificandSize); + return biased_e - kExponentBias; + } + + uint32_t Significand() const { + uint32_t d32 = AsUint32(); + uint32_t significand = d32 & kSignificandMask; + if (!IsDenormal()) { + return significand + kHiddenBit; + } else { + return significand; + } + } + + // Returns true if the single is a denormal. + bool IsDenormal() const { + uint32_t d32 = AsUint32(); + return (d32 & kExponentMask) == 0; + } + + // We consider denormals not to be special. + // Hence only Infinity and NaN are special. + bool IsSpecial() const { + uint32_t d32 = AsUint32(); + return (d32 & kExponentMask) == kExponentMask; + } + + bool IsNan() const { + uint32_t d32 = AsUint32(); + return ((d32 & kExponentMask) == kExponentMask) && + ((d32 & kSignificandMask) != 0); + } + + bool IsInfinite() const { + uint32_t d32 = AsUint32(); + return ((d32 & kExponentMask) == kExponentMask) && + ((d32 & kSignificandMask) == 0); + } + + int Sign() const { + uint32_t d32 = AsUint32(); + return (d32 & kSignMask) == 0? 1: -1; + } + + // Computes the two boundaries of this. + // The bigger boundary (m_plus) is normalized. The lower boundary has the same + // exponent as m_plus. + // Precondition: the value encoded by this Single must be greater than 0. + void NormalizedBoundaries(DiyFp* out_m_minus, DiyFp* out_m_plus) const { + ASSERT(value() > 0.0); + DiyFp v = this->AsDiyFp(); + DiyFp m_plus = DiyFp::Normalize(DiyFp((v.f() << 1) + 1, v.e() - 1)); + DiyFp m_minus; + if (LowerBoundaryIsCloser()) { + m_minus = DiyFp((v.f() << 2) - 1, v.e() - 2); + } else { + m_minus = DiyFp((v.f() << 1) - 1, v.e() - 1); + } + m_minus.set_f(m_minus.f() << (m_minus.e() - m_plus.e())); + m_minus.set_e(m_plus.e()); + *out_m_plus = m_plus; + *out_m_minus = m_minus; + } + + // Precondition: the value encoded by this Single must be greater or equal + // than +0.0. + DiyFp UpperBoundary() const { + ASSERT(Sign() > 0); + return DiyFp(Significand() * 2 + 1, Exponent() - 1); + } + + bool LowerBoundaryIsCloser() const { + // The boundary is closer if the significand is of the form f == 2^p-1 then + // the lower boundary is closer. + // Think of v = 1000e10 and v- = 9999e9. + // Then the boundary (== (v - v-)/2) is not just at a distance of 1e9 but + // at a distance of 1e8. + // The only exception is for the smallest normal: the largest denormal is + // at the same distance as its successor. + // Note: denormals have the same exponent as the smallest normals. + bool physical_significand_is_zero = ((AsUint32() & kSignificandMask) == 0); + return physical_significand_is_zero && (Exponent() != kDenormalExponent); + } + + float value() const { return uint32_to_float(d32_); } + + static float Infinity() { + return Single(kInfinity).value(); + } + + static float NaN() { + return Single(kNaN).value(); + } + + private: + static const int kExponentBias = 0x7F + kPhysicalSignificandSize; + static const int kDenormalExponent = -kExponentBias + 1; + static const int kMaxExponent = 0xFF - kExponentBias; + static const uint32_t kInfinity = 0x7F800000; + static const uint32_t kNaN = 0x7FC00000; + + const uint32_t d32_; +}; + +} // namespace double_conversion + +#endif // DOUBLE_CONVERSION_DOUBLE_H_ diff --git a/Foundation/src/strtod.cc b/Foundation/src/strtod.cc new file mode 100644 index 000000000..9758989f7 --- /dev/null +++ b/Foundation/src/strtod.cc @@ -0,0 +1,554 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include +#include + +#include "strtod.h" +#include "bignum.h" +#include "cached-powers.h" +#include "ieee.h" + +namespace double_conversion { + +// 2^53 = 9007199254740992. +// Any integer with at most 15 decimal digits will hence fit into a double +// (which has a 53bit significand) without loss of precision. +static const int kMaxExactDoubleIntegerDecimalDigits = 15; +// 2^64 = 18446744073709551616 > 10^19 +static const int kMaxUint64DecimalDigits = 19; + +// Max double: 1.7976931348623157 x 10^308 +// Min non-zero double: 4.9406564584124654 x 10^-324 +// Any x >= 10^309 is interpreted as +infinity. +// Any x <= 10^-324 is interpreted as 0. +// Note that 2.5e-324 (despite being smaller than the min double) will be read +// as non-zero (equal to the min non-zero double). +static const int kMaxDecimalPower = 309; +static const int kMinDecimalPower = -324; + +// 2^64 = 18446744073709551616 +static const uint64_t kMaxUint64 = UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF); + + +static const double exact_powers_of_ten[] = { + 1.0, // 10^0 + 10.0, + 100.0, + 1000.0, + 10000.0, + 100000.0, + 1000000.0, + 10000000.0, + 100000000.0, + 1000000000.0, + 10000000000.0, // 10^10 + 100000000000.0, + 1000000000000.0, + 10000000000000.0, + 100000000000000.0, + 1000000000000000.0, + 10000000000000000.0, + 100000000000000000.0, + 1000000000000000000.0, + 10000000000000000000.0, + 100000000000000000000.0, // 10^20 + 1000000000000000000000.0, + // 10^22 = 0x21e19e0c9bab2400000 = 0x878678326eac9 * 2^22 + 10000000000000000000000.0 +}; +static const int kExactPowersOfTenSize = ARRAY_SIZE(exact_powers_of_ten); + +// Maximum number of significant digits in the decimal representation. +// In fact the value is 772 (see conversions.cc), but to give us some margin +// we round up to 780. +static const int kMaxSignificantDecimalDigits = 780; + +static Vector TrimLeadingZeros(Vector buffer) { + for (int i = 0; i < buffer.length(); i++) { + if (buffer[i] != '0') { + return buffer.SubVector(i, buffer.length()); + } + } + return Vector(buffer.start(), 0); +} + + +static Vector TrimTrailingZeros(Vector buffer) { + for (int i = buffer.length() - 1; i >= 0; --i) { + if (buffer[i] != '0') { + return buffer.SubVector(0, i + 1); + } + } + return Vector(buffer.start(), 0); +} + + +static void CutToMaxSignificantDigits(Vector buffer, + int exponent, + char* significant_buffer, + int* significant_exponent) { + for (int i = 0; i < kMaxSignificantDecimalDigits - 1; ++i) { + significant_buffer[i] = buffer[i]; + } + // The input buffer has been trimmed. Therefore the last digit must be + // different from '0'. + ASSERT(buffer[buffer.length() - 1] != '0'); + // Set the last digit to be non-zero. This is sufficient to guarantee + // correct rounding. + significant_buffer[kMaxSignificantDecimalDigits - 1] = '1'; + *significant_exponent = + exponent + (buffer.length() - kMaxSignificantDecimalDigits); +} + + +// Trims the buffer and cuts it to at most kMaxSignificantDecimalDigits. +// If possible the input-buffer is reused, but if the buffer needs to be +// modified (due to cutting), then the input needs to be copied into the +// buffer_copy_space. +static void TrimAndCut(Vector buffer, int exponent, + char* buffer_copy_space, int space_size, + Vector* trimmed, int* updated_exponent) { + Vector left_trimmed = TrimLeadingZeros(buffer); + Vector right_trimmed = TrimTrailingZeros(left_trimmed); + exponent += left_trimmed.length() - right_trimmed.length(); + if (right_trimmed.length() > kMaxSignificantDecimalDigits) { + ASSERT(space_size >= kMaxSignificantDecimalDigits); + CutToMaxSignificantDigits(right_trimmed, exponent, + buffer_copy_space, updated_exponent); + *trimmed = Vector(buffer_copy_space, + kMaxSignificantDecimalDigits); + } else { + *trimmed = right_trimmed; + *updated_exponent = exponent; + } +} + + +// Reads digits from the buffer and converts them to a uint64. +// Reads in as many digits as fit into a uint64. +// When the string starts with "1844674407370955161" no further digit is read. +// Since 2^64 = 18446744073709551616 it would still be possible read another +// digit if it was less or equal than 6, but this would complicate the code. +static uint64_t ReadUint64(Vector buffer, + int* number_of_read_digits) { + uint64_t result = 0; + int i = 0; + while (i < buffer.length() && result <= (kMaxUint64 / 10 - 1)) { + int digit = buffer[i++] - '0'; + ASSERT(0 <= digit && digit <= 9); + result = 10 * result + digit; + } + *number_of_read_digits = i; + return result; +} + + +// Reads a DiyFp from the buffer. +// The returned DiyFp is not necessarily normalized. +// If remaining_decimals is zero then the returned DiyFp is accurate. +// Otherwise it has been rounded and has error of at most 1/2 ulp. +static void ReadDiyFp(Vector buffer, + DiyFp* result, + int* remaining_decimals) { + int read_digits; + uint64_t significand = ReadUint64(buffer, &read_digits); + if (buffer.length() == read_digits) { + *result = DiyFp(significand, 0); + *remaining_decimals = 0; + } else { + // Round the significand. + if (buffer[read_digits] >= '5') { + significand++; + } + // Compute the binary exponent. + int exponent = 0; + *result = DiyFp(significand, exponent); + *remaining_decimals = buffer.length() - read_digits; + } +} + + +static bool DoubleStrtod(Vector trimmed, + int exponent, + double* result) { +#if !defined(DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS) + // On x86 the floating-point stack can be 64 or 80 bits wide. If it is + // 80 bits wide (as is the case on Linux) then double-rounding occurs and the + // result is not accurate. + // We know that Windows32 uses 64 bits and is therefore accurate. + // Note that the ARM simulator is compiled for 32bits. It therefore exhibits + // the same problem. + return false; +#endif + if (trimmed.length() <= kMaxExactDoubleIntegerDecimalDigits) { + int read_digits; + // The trimmed input fits into a double. + // If the 10^exponent (resp. 10^-exponent) fits into a double too then we + // can compute the result-double simply by multiplying (resp. dividing) the + // two numbers. + // This is possible because IEEE guarantees that floating-point operations + // return the best possible approximation. + if (exponent < 0 && -exponent < kExactPowersOfTenSize) { + // 10^-exponent fits into a double. + *result = static_cast(ReadUint64(trimmed, &read_digits)); + ASSERT(read_digits == trimmed.length()); + *result /= exact_powers_of_ten[-exponent]; + return true; + } + if (0 <= exponent && exponent < kExactPowersOfTenSize) { + // 10^exponent fits into a double. + *result = static_cast(ReadUint64(trimmed, &read_digits)); + ASSERT(read_digits == trimmed.length()); + *result *= exact_powers_of_ten[exponent]; + return true; + } + int remaining_digits = + kMaxExactDoubleIntegerDecimalDigits - trimmed.length(); + if ((0 <= exponent) && + (exponent - remaining_digits < kExactPowersOfTenSize)) { + // The trimmed string was short and we can multiply it with + // 10^remaining_digits. As a result the remaining exponent now fits + // into a double too. + *result = static_cast(ReadUint64(trimmed, &read_digits)); + ASSERT(read_digits == trimmed.length()); + *result *= exact_powers_of_ten[remaining_digits]; + *result *= exact_powers_of_ten[exponent - remaining_digits]; + return true; + } + } + return false; +} + + +// Returns 10^exponent as an exact DiyFp. +// The given exponent must be in the range [1; kDecimalExponentDistance[. +static DiyFp AdjustmentPowerOfTen(int exponent) { + ASSERT(0 < exponent); + ASSERT(exponent < PowersOfTenCache::kDecimalExponentDistance); + // Simply hardcode the remaining powers for the given decimal exponent + // distance. + ASSERT(PowersOfTenCache::kDecimalExponentDistance == 8); + switch (exponent) { + case 1: return DiyFp(UINT64_2PART_C(0xa0000000, 00000000), -60); + case 2: return DiyFp(UINT64_2PART_C(0xc8000000, 00000000), -57); + case 3: return DiyFp(UINT64_2PART_C(0xfa000000, 00000000), -54); + case 4: return DiyFp(UINT64_2PART_C(0x9c400000, 00000000), -50); + case 5: return DiyFp(UINT64_2PART_C(0xc3500000, 00000000), -47); + case 6: return DiyFp(UINT64_2PART_C(0xf4240000, 00000000), -44); + case 7: return DiyFp(UINT64_2PART_C(0x98968000, 00000000), -40); + default: + UNREACHABLE(); + return DiyFp(0, 0); + } +} + + +// If the function returns true then the result is the correct double. +// Otherwise it is either the correct double or the double that is just below +// the correct double. +static bool DiyFpStrtod(Vector buffer, + int exponent, + double* result) { + DiyFp input; + int remaining_decimals; + ReadDiyFp(buffer, &input, &remaining_decimals); + // Since we may have dropped some digits the input is not accurate. + // If remaining_decimals is different than 0 than the error is at most + // .5 ulp (unit in the last place). + // We don't want to deal with fractions and therefore keep a common + // denominator. + const int kDenominatorLog = 3; + const int kDenominator = 1 << kDenominatorLog; + // Move the remaining decimals into the exponent. + exponent += remaining_decimals; + int error = (remaining_decimals == 0 ? 0 : kDenominator / 2); + + int old_e = input.e(); + input.Normalize(); + error <<= old_e - input.e(); + + ASSERT(exponent <= PowersOfTenCache::kMaxDecimalExponent); + if (exponent < PowersOfTenCache::kMinDecimalExponent) { + *result = 0.0; + return true; + } + DiyFp cached_power; + int cached_decimal_exponent; + PowersOfTenCache::GetCachedPowerForDecimalExponent(exponent, + &cached_power, + &cached_decimal_exponent); + + if (cached_decimal_exponent != exponent) { + int adjustment_exponent = exponent - cached_decimal_exponent; + DiyFp adjustment_power = AdjustmentPowerOfTen(adjustment_exponent); + input.Multiply(adjustment_power); + if (kMaxUint64DecimalDigits - buffer.length() >= adjustment_exponent) { + // The product of input with the adjustment power fits into a 64 bit + // integer. + ASSERT(DiyFp::kSignificandSize == 64); + } else { + // The adjustment power is exact. There is hence only an error of 0.5. + error += kDenominator / 2; + } + } + + input.Multiply(cached_power); + // The error introduced by a multiplication of a*b equals + // error_a + error_b + error_a*error_b/2^64 + 0.5 + // Substituting a with 'input' and b with 'cached_power' we have + // error_b = 0.5 (all cached powers have an error of less than 0.5 ulp), + // error_ab = 0 or 1 / kDenominator > error_a*error_b/ 2^64 + int error_b = kDenominator / 2; + int error_ab = (error == 0 ? 0 : 1); // We round up to 1. + int fixed_error = kDenominator / 2; + error += error_b + error_ab + fixed_error; + + old_e = input.e(); + input.Normalize(); + error <<= old_e - input.e(); + + // See if the double's significand changes if we add/subtract the error. + int order_of_magnitude = DiyFp::kSignificandSize + input.e(); + int effective_significand_size = + Double::SignificandSizeForOrderOfMagnitude(order_of_magnitude); + int precision_digits_count = + DiyFp::kSignificandSize - effective_significand_size; + if (precision_digits_count + kDenominatorLog >= DiyFp::kSignificandSize) { + // This can only happen for very small denormals. In this case the + // half-way multiplied by the denominator exceeds the range of an uint64. + // Simply shift everything to the right. + int shift_amount = (precision_digits_count + kDenominatorLog) - + DiyFp::kSignificandSize + 1; + input.set_f(input.f() >> shift_amount); + input.set_e(input.e() + shift_amount); + // We add 1 for the lost precision of error, and kDenominator for + // the lost precision of input.f(). + error = (error >> shift_amount) + 1 + kDenominator; + precision_digits_count -= shift_amount; + } + // We use uint64_ts now. This only works if the DiyFp uses uint64_ts too. + ASSERT(DiyFp::kSignificandSize == 64); + ASSERT(precision_digits_count < 64); + uint64_t one64 = 1; + uint64_t precision_bits_mask = (one64 << precision_digits_count) - 1; + uint64_t precision_bits = input.f() & precision_bits_mask; + uint64_t half_way = one64 << (precision_digits_count - 1); + precision_bits *= kDenominator; + half_way *= kDenominator; + DiyFp rounded_input(input.f() >> precision_digits_count, + input.e() + precision_digits_count); + if (precision_bits >= half_way + error) { + rounded_input.set_f(rounded_input.f() + 1); + } + // If the last_bits are too close to the half-way case than we are too + // inaccurate and round down. In this case we return false so that we can + // fall back to a more precise algorithm. + + *result = Double(rounded_input).value(); + if (half_way - error < precision_bits && precision_bits < half_way + error) { + // Too imprecise. The caller will have to fall back to a slower version. + // However the returned number is guaranteed to be either the correct + // double, or the next-lower double. + return false; + } else { + return true; + } +} + + +// Returns +// - -1 if buffer*10^exponent < diy_fp. +// - 0 if buffer*10^exponent == diy_fp. +// - +1 if buffer*10^exponent > diy_fp. +// Preconditions: +// buffer.length() + exponent <= kMaxDecimalPower + 1 +// buffer.length() + exponent > kMinDecimalPower +// buffer.length() <= kMaxDecimalSignificantDigits +static int CompareBufferWithDiyFp(Vector buffer, + int exponent, + DiyFp diy_fp) { + ASSERT(buffer.length() + exponent <= kMaxDecimalPower + 1); + ASSERT(buffer.length() + exponent > kMinDecimalPower); + ASSERT(buffer.length() <= kMaxSignificantDecimalDigits); + // Make sure that the Bignum will be able to hold all our numbers. + // Our Bignum implementation has a separate field for exponents. Shifts will + // consume at most one bigit (< 64 bits). + // ln(10) == 3.3219... + ASSERT(((kMaxDecimalPower + 1) * 333 / 100) < Bignum::kMaxSignificantBits); + Bignum buffer_bignum; + Bignum diy_fp_bignum; + buffer_bignum.AssignDecimalString(buffer); + diy_fp_bignum.AssignUInt64(diy_fp.f()); + if (exponent >= 0) { + buffer_bignum.MultiplyByPowerOfTen(exponent); + } else { + diy_fp_bignum.MultiplyByPowerOfTen(-exponent); + } + if (diy_fp.e() > 0) { + diy_fp_bignum.ShiftLeft(diy_fp.e()); + } else { + buffer_bignum.ShiftLeft(-diy_fp.e()); + } + return Bignum::Compare(buffer_bignum, diy_fp_bignum); +} + + +// Returns true if the guess is the correct double. +// Returns false, when guess is either correct or the next-lower double. +static bool ComputeGuess(Vector trimmed, int exponent, + double* guess) { + if (trimmed.length() == 0) { + *guess = 0.0; + return true; + } + if (exponent + trimmed.length() - 1 >= kMaxDecimalPower) { + *guess = Double::Infinity(); + return true; + } + if (exponent + trimmed.length() <= kMinDecimalPower) { + *guess = 0.0; + return true; + } + + if (DoubleStrtod(trimmed, exponent, guess) || + DiyFpStrtod(trimmed, exponent, guess)) { + return true; + } + if (*guess == Double::Infinity()) { + return true; + } + return false; +} + +double Strtod(Vector buffer, int exponent) { + char copy_buffer[kMaxSignificantDecimalDigits]; + Vector trimmed; + int updated_exponent; + TrimAndCut(buffer, exponent, copy_buffer, kMaxSignificantDecimalDigits, + &trimmed, &updated_exponent); + exponent = updated_exponent; + + double guess; + bool is_correct = ComputeGuess(trimmed, exponent, &guess); + if (is_correct) return guess; + + DiyFp upper_boundary = Double(guess).UpperBoundary(); + int comparison = CompareBufferWithDiyFp(trimmed, exponent, upper_boundary); + if (comparison < 0) { + return guess; + } else if (comparison > 0) { + return Double(guess).NextDouble(); + } else if ((Double(guess).Significand() & 1) == 0) { + // Round towards even. + return guess; + } else { + return Double(guess).NextDouble(); + } +} + +float Strtof(Vector buffer, int exponent) { + char copy_buffer[kMaxSignificantDecimalDigits]; + Vector trimmed; + int updated_exponent; + TrimAndCut(buffer, exponent, copy_buffer, kMaxSignificantDecimalDigits, + &trimmed, &updated_exponent); + exponent = updated_exponent; + + double double_guess; + bool is_correct = ComputeGuess(trimmed, exponent, &double_guess); + + float float_guess = static_cast(double_guess); + if (float_guess == double_guess) { + // This shortcut triggers for integer values. + return float_guess; + } + + // We must catch double-rounding. Say the double has been rounded up, and is + // now a boundary of a float, and rounds up again. This is why we have to + // look at previous too. + // Example (in decimal numbers): + // input: 12349 + // high-precision (4 digits): 1235 + // low-precision (3 digits): + // when read from input: 123 + // when rounded from high precision: 124. + // To do this we simply look at the neigbors of the correct result and see + // if they would round to the same float. If the guess is not correct we have + // to look at four values (since two different doubles could be the correct + // double). + + double double_next = Double(double_guess).NextDouble(); + double double_previous = Double(double_guess).PreviousDouble(); + + float f1 = static_cast(double_previous); + float f2 = float_guess; + float f3 = static_cast(double_next); + float f4; + if (is_correct) { + f4 = f3; + } else { + double double_next2 = Double(double_next).NextDouble(); + f4 = static_cast(double_next2); + } + ASSERT(f1 <= f2 && f2 <= f3 && f3 <= f4); + + // If the guess doesn't lie near a single-precision boundary we can simply + // return its float-value. + if (f1 == f4) { + return float_guess; + } + + ASSERT((f1 != f2 && f2 == f3 && f3 == f4) || + (f1 == f2 && f2 != f3 && f3 == f4) || + (f1 == f2 && f2 == f3 && f3 != f4)); + + // guess and next are the two possible canditates (in the same way that + // double_guess was the lower candidate for a double-precision guess). + float guess = f1; + float next = f4; + DiyFp upper_boundary; + if (guess == 0.0f) { + float min_float = 1e-45f; + upper_boundary = Double(static_cast(min_float) / 2).AsDiyFp(); + } else { + upper_boundary = Single(guess).UpperBoundary(); + } + int comparison = CompareBufferWithDiyFp(trimmed, exponent, upper_boundary); + if (comparison < 0) { + return guess; + } else if (comparison > 0) { + return next; + } else if ((Single(guess).Significand() & 1) == 0) { + // Round towards even. + return guess; + } else { + return next; + } +} + +} // namespace double_conversion diff --git a/Foundation/src/strtod.h b/Foundation/src/strtod.h new file mode 100644 index 000000000..ed0293b8f --- /dev/null +++ b/Foundation/src/strtod.h @@ -0,0 +1,45 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef DOUBLE_CONVERSION_STRTOD_H_ +#define DOUBLE_CONVERSION_STRTOD_H_ + +#include "utils.h" + +namespace double_conversion { + +// The buffer must only contain digits in the range [0-9]. It must not +// contain a dot or a sign. It must not start with '0', and must not be empty. +double Strtod(Vector buffer, int exponent); + +// The buffer must only contain digits in the range [0-9]. It must not +// contain a dot or a sign. It must not start with '0', and must not be empty. +float Strtof(Vector buffer, int exponent); + +} // namespace double_conversion + +#endif // DOUBLE_CONVERSION_STRTOD_H_ diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h new file mode 100644 index 000000000..767094b8b --- /dev/null +++ b/Foundation/src/utils.h @@ -0,0 +1,313 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef DOUBLE_CONVERSION_UTILS_H_ +#define DOUBLE_CONVERSION_UTILS_H_ + +#include +#include + +#include +#ifndef ASSERT +#define ASSERT(condition) (assert(condition)) +#endif +#ifndef UNIMPLEMENTED +#define UNIMPLEMENTED() (abort()) +#endif +#ifndef UNREACHABLE +#define UNREACHABLE() (abort()) +#endif + +// Double operations detection based on target architecture. +// Linux uses a 80bit wide floating point stack on x86. This induces double +// rounding, which in turn leads to wrong results. +// An easy way to test if the floating-point operations are correct is to +// evaluate: 89255.0/1e22. If the floating-point stack is 64 bits wide then +// the result is equal to 89255e-22. +// The best way to test this, is to create a division-function and to compare +// the output of the division with the expected result. (Inlining must be +// disabled.) +// On Linux,x86 89255e-22 != Div_double(89255.0/1e22) +#if defined(_M_X64) || defined(__x86_64__) || \ + defined(__ARMEL__) || defined(__avr32__) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || defined(__powerpc__) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) +#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +#elif defined(_M_IX86) || defined(__i386__) || defined(__i386) +#if defined(_WIN32) +// Windows uses a 64bit wide floating point stack. +#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +#else +#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS +#endif // _WIN32 +#else +#error Target architecture was not detected as supported by Double-Conversion. +#endif + + +#if defined(_WIN32) && !defined(__MINGW32__) + +typedef signed char int8_t; +typedef unsigned char uint8_t; +typedef short int16_t; // NOLINT +typedef unsigned short uint16_t; // NOLINT +typedef int int32_t; +typedef unsigned int uint32_t; +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; +// intptr_t and friends are defined in crtdefs.h through stdio.h. + +#else + +#include + +#endif + +// The following macro works on both 32 and 64-bit platforms. +// Usage: instead of writing 0x1234567890123456 +// write UINT64_2PART_C(0x12345678,90123456); +#define UINT64_2PART_C(a, b) (((static_cast(a) << 32) + 0x##b##u)) + + +// The expression ARRAY_SIZE(a) is a compile-time constant of type +// size_t which represents the number of elements of the given +// array. You should only use ARRAY_SIZE on statically allocated +// arrays. +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(a) \ + ((sizeof(a) / sizeof(*(a))) / \ + static_cast(!(sizeof(a) % sizeof(*(a))))) +#endif + +// A macro to disallow the evil copy constructor and operator= functions +// This should be used in the private: declarations for a class +#ifndef DISALLOW_COPY_AND_ASSIGN +#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ + TypeName(const TypeName&); \ + void operator=(const TypeName&) +#endif + +// A macro to disallow all the implicit constructors, namely the +// default constructor, copy constructor and operator= functions. +// +// This should be used in the private: declarations for a class +// that wants to prevent anyone from instantiating it. This is +// especially useful for classes containing only static methods. +#ifndef DISALLOW_IMPLICIT_CONSTRUCTORS +#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ + TypeName(); \ + DISALLOW_COPY_AND_ASSIGN(TypeName) +#endif + +namespace double_conversion { + +static const int kCharSize = sizeof(char); + +// Returns the maximum of the two parameters. +template +static T Max(T a, T b) { + return a < b ? b : a; +} + + +// Returns the minimum of the two parameters. +template +static T Min(T a, T b) { + return a < b ? a : b; +} + + +inline int StrLength(const char* string) { + size_t length = strlen(string); + ASSERT(length == static_cast(static_cast(length))); + return static_cast(length); +} + +// This is a simplified version of V8's Vector class. +template +class Vector { + public: + Vector() : start_(NULL), length_(0) {} + Vector(T* data, int length) : start_(data), length_(length) { + ASSERT(length == 0 || (length > 0 && data != NULL)); + } + + // Returns a vector using the same backing storage as this one, + // spanning from and including 'from', to but not including 'to'. + Vector SubVector(int from, int to) { + ASSERT(to <= length_); + ASSERT(from < to); + ASSERT(0 <= from); + return Vector(start() + from, to - from); + } + + // Returns the length of the vector. + int length() const { return length_; } + + // Returns whether or not the vector is empty. + bool is_empty() const { return length_ == 0; } + + // Returns the pointer to the start of the data in the vector. + T* start() const { return start_; } + + // Access individual vector elements - checks bounds in debug mode. + T& operator[](int index) const { + ASSERT(0 <= index && index < length_); + return start_[index]; + } + + T& first() { return start_[0]; } + + T& last() { return start_[length_ - 1]; } + + private: + T* start_; + int length_; +}; + + +// Helper class for building result strings in a character buffer. The +// purpose of the class is to use safe operations that checks the +// buffer bounds on all operations in debug mode. +class StringBuilder { + public: + StringBuilder(char* buffer, int size) + : buffer_(buffer, size), position_(0) { } + + ~StringBuilder() { if (!is_finalized()) Finalize(); } + + int size() const { return buffer_.length(); } + + // Get the current position in the builder. + int position() const { + ASSERT(!is_finalized()); + return position_; + } + + // Reset the position. + void Reset() { position_ = 0; } + + // Add a single character to the builder. It is not allowed to add + // 0-characters; use the Finalize() method to terminate the string + // instead. + void AddCharacter(char c) { + ASSERT(c != '\0'); + ASSERT(!is_finalized() && position_ < buffer_.length()); + buffer_[position_++] = c; + } + + // Add an entire string to the builder. Uses strlen() internally to + // compute the length of the input string. + void AddString(const char* s) { + AddSubstring(s, StrLength(s)); + } + + // Add the first 'n' characters of the given string 's' to the + // builder. The input string must have enough characters. + void AddSubstring(const char* s, int n) { + ASSERT(!is_finalized() && position_ + n < buffer_.length()); + ASSERT(static_cast(n) <= strlen(s)); + memmove(&buffer_[position_], s, n * kCharSize); + position_ += n; + } + + + // Add character padding to the builder. If count is non-positive, + // nothing is added to the builder. + void AddPadding(char c, int count) { + for (int i = 0; i < count; i++) { + AddCharacter(c); + } + } + + // Finalize the string by 0-terminating it and returning the buffer. + char* Finalize() { + ASSERT(!is_finalized() && position_ < buffer_.length()); + buffer_[position_] = '\0'; + // Make sure nobody managed to add a 0-character to the + // buffer while building the string. + ASSERT(strlen(buffer_.start()) == static_cast(position_)); + position_ = -1; + ASSERT(is_finalized()); + return buffer_.start(); + } + + private: + Vector buffer_; + int position_; + + bool is_finalized() const { return position_ < 0; } + + DISALLOW_IMPLICIT_CONSTRUCTORS(StringBuilder); +}; + +// The type-based aliasing rule allows the compiler to assume that pointers of +// different types (for some definition of different) never alias each other. +// Thus the following code does not work: +// +// float f = foo(); +// int fbits = *(int*)(&f); +// +// The compiler 'knows' that the int pointer can't refer to f since the types +// don't match, so the compiler may cache f in a register, leaving random data +// in fbits. Using C++ style casts makes no difference, however a pointer to +// char data is assumed to alias any other pointer. This is the 'memcpy +// exception'. +// +// Bit_cast uses the memcpy exception to move the bits from a variable of one +// type of a variable of another type. Of course the end result is likely to +// be implementation dependent. Most compilers (gcc-4.2 and MSVC 2005) +// will completely optimize BitCast away. +// +// There is an additional use for BitCast. +// Recent gccs will warn when they see casts that may result in breakage due to +// the type-based aliasing rule. If you have checked that there is no breakage +// you can use BitCast to cast one pointer type to another. This confuses gcc +// enough that it can no longer see that you have cast one pointer type to +// another thus avoiding the warning. +template +inline Dest BitCast(const Source& source) { + // Compile time assertion: sizeof(Dest) == sizeof(Source) + // A compile error here means your Dest and Source have different sizes. + typedef char VerifySizesAreEqual[sizeof(Dest) == sizeof(Source) ? 1 : -1]; + + Dest dest; + memmove(&dest, &source, sizeof(dest)); + return dest; +} + +template +inline Dest BitCast(Source* source) { + return BitCast(reinterpret_cast(source)); +} + +} // namespace double_conversion + +#endif // DOUBLE_CONVERSION_UTILS_H_ diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj b/Foundation/testsuite/TestSuite_vs100.vcxproj index c4b37bbdc..f7717fca4 100644 --- a/Foundation/testsuite/TestSuite_vs100.vcxproj +++ b/Foundation/testsuite/TestSuite_vs100.vcxproj @@ -127,6 +127,7 @@ Level3 EditAndContinue + Precise CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies) diff --git a/Foundation/testsuite/src/NumberFormatterTest.cpp b/Foundation/testsuite/src/NumberFormatterTest.cpp index 08ef18433..16e69b8fa 100644 --- a/Foundation/testsuite/src/NumberFormatterTest.cpp +++ b/Foundation/testsuite/src/NumberFormatterTest.cpp @@ -34,7 +34,7 @@ #include "CppUnit/TestCaller.h" #include "CppUnit/TestSuite.h" #include "Poco/NumberFormatter.h" - +#include using Poco::NumberFormatter; using Poco::Int64; @@ -89,17 +89,6 @@ void NumberFormatterTest::testFormat() { assert (NumberFormatter::format((void*) 0x12345678) == "0000000012345678"); } - - assert(NumberFormatter::format(12.25) == "12.25"); - assert(NumberFormatter::format(12.25, 4) == "12.2500"); - assert(NumberFormatter::format(12.25, 8, 4) == " 12.2500"); - - assert(NumberFormatter::format(true, NumberFormatter::FMT_TRUE_FALSE) == "true"); - assert(NumberFormatter::format(false, NumberFormatter::FMT_TRUE_FALSE) == "false"); - assert(NumberFormatter::format(true, NumberFormatter::FMT_YES_NO) == "yes"); - assert(NumberFormatter::format(false, NumberFormatter::FMT_YES_NO) == "no"); - assert(NumberFormatter::format(true, NumberFormatter::FMT_ON_OFF) == "on"); - assert(NumberFormatter::format(false, NumberFormatter::FMT_ON_OFF) == "off"); } @@ -119,6 +108,17 @@ void NumberFormatterTest::testFormat0() } +void NumberFormatterTest::testFormatBool() +{ + assert(NumberFormatter::format(true, NumberFormatter::FMT_TRUE_FALSE) == "true"); + assert(NumberFormatter::format(false, NumberFormatter::FMT_TRUE_FALSE) == "false"); + assert(NumberFormatter::format(true, NumberFormatter::FMT_YES_NO) == "yes"); + assert(NumberFormatter::format(false, NumberFormatter::FMT_YES_NO) == "no"); + assert(NumberFormatter::format(true, NumberFormatter::FMT_ON_OFF) == "on"); + assert(NumberFormatter::format(false, NumberFormatter::FMT_ON_OFF) == "off"); +} + + void NumberFormatterTest::testFormatHex() { assert (NumberFormatter::formatHex(0x12) == "12"); @@ -201,15 +201,37 @@ void NumberFormatterTest::testFormatHex() void NumberFormatterTest::testFormatFloat() { - std::string s(NumberFormatter::format(1.0f)); - assert(s == "1"); - s = NumberFormatter::format(0.1f); - assert(s == "0.1"); + assert (NumberFormatter::format(1.0f) == "1"); + assert (NumberFormatter::format(1.23f) == "1.23"); + assert (NumberFormatter::format(-1.23f) == "-1.23"); + assert (NumberFormatter::format(0.1f) == "0.1"); + assert (NumberFormatter::format(-0.1f) == "-0.1"); + assert (NumberFormatter::format(1.23) == "1.23"); + assert (NumberFormatter::format(-1.23) == "-1.23"); + assert (NumberFormatter::format(1.0) == "1"); + assert (NumberFormatter::format(-1.0) == "-1"); + assert (NumberFormatter::format(0.1) == "0.1"); + assert (NumberFormatter::format(-0.1) == "-0.1"); - s = NumberFormatter::format(1.0); - assert(s == "1"); - s = NumberFormatter::format(0.1); - assert(s == "0.1"); + int decDigits = std::numeric_limits::digits10; + std::ostringstream ostr; + ostr << "0." << std::string(decDigits - 1, '0') << '1'; + assert(NumberFormatter::format(1 / std::pow(10., decDigits)) == ostr.str()); + + ostr.str(""); + ostr << "1e-" << decDigits + 1; + std::string str (ostr.str()); + std::string str1 (NumberFormatter::format(1 / std::pow(10., decDigits + 1))); + assert(NumberFormatter::format(1 / std::pow(10., decDigits + 1)) == ostr.str()); + + assert(NumberFormatter::format(12.25) == "12.25"); + assert(NumberFormatter::format(12.25, 4) == "12.2500"); + assert(NumberFormatter::format(12.25, 8, 4) == " 12.2500"); + + assert(NumberFormatter::format(-12.25) == "-12.25"); + assert(NumberFormatter::format(-12.25, 4) == "-12.2500"); + assert(NumberFormatter::format(-12.25, 10, 4) == " -12.2500"); + assert(NumberFormatter::format(-12.25, 10, 2) == " -12.25"); } @@ -229,6 +251,7 @@ CppUnit::Test* NumberFormatterTest::suite() CppUnit_addTest(pSuite, NumberFormatterTest, testFormat); CppUnit_addTest(pSuite, NumberFormatterTest, testFormat0); + CppUnit_addTest(pSuite, NumberFormatterTest, testFormatBool); CppUnit_addTest(pSuite, NumberFormatterTest, testFormatHex); CppUnit_addTest(pSuite, NumberFormatterTest, testFormatFloat); diff --git a/Foundation/testsuite/src/NumberFormatterTest.h b/Foundation/testsuite/src/NumberFormatterTest.h index 8a6f23cb0..eb58cd6a8 100644 --- a/Foundation/testsuite/src/NumberFormatterTest.h +++ b/Foundation/testsuite/src/NumberFormatterTest.h @@ -48,6 +48,7 @@ public: void testFormat(); void testFormat0(); + void testFormatBool(); void testFormatHex(); void testFormatFloat(); diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index 48598df0d..1d41b0ba1 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -62,6 +62,9 @@ using Poco::cat; using Poco::strToInt; using Poco::strToFloat; using Poco::intToStr; +using Poco::strToDoubleDC; +using Poco::floatToStr; +using Poco::doubleToStr; using Poco::thousandSeparator; using Poco::decimalSeparator; using Poco::format; @@ -554,12 +557,16 @@ void StringTest::testNumericLocale() #if !defined(POCO_NO_LOCALE) && POCO_OS == POCO_OS_WINDOWS_NT try { + char buffer[POCO_MAX_FLT_STRING_LEN]; + char dp = decimalSeparator(); char ts = thousandSeparator(); std::locale loc; std::cout << "Original locale: '" << loc.name() << '\'' << std::endl; std::cout << "Decimal point: '" << decimalSeparator() << '\'' << std::endl; std::cout << "Thousand separator: '" << ts << '\'' << std::endl; + doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, 1.23); + std::cout << "1.23 == '" << buffer << '\'' << std::endl; std::locale::global(std::locale("German")); std::locale locGerman; @@ -568,6 +575,8 @@ void StringTest::testNumericLocale() std::cout << "New locale: '" << locGerman.name() << '\'' << std::endl; std::cout << "Decimal point: '" << decimalSeparator() << '\'' << std::endl; std::cout << "Thousand separator: '" << thousandSeparator() << '\'' << std::endl; + doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, 1.23); + std::cout << "1.23 == '" << buffer << '\'' << std::endl; std::locale::global(std::locale("US")); std::locale locUS; @@ -576,6 +585,8 @@ void StringTest::testNumericLocale() std::cout << "New locale: '" << locUS.name() << '\'' << std::endl; std::cout << "Decimal point: '" << decimalSeparator() << '\'' << std::endl; std::cout << "Thousand separator: '" << thousandSeparator() << '\'' << std::endl; + doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, 1.23); + std::cout << "1.23 == '" << buffer << '\'' << std::endl; std::locale::global(loc); dp = decimalSeparator(); @@ -583,6 +594,9 @@ void StringTest::testNumericLocale() std::cout << "Final locale: '" << loc.name() << '\'' << std::endl; std::cout << "Decimal point: '" << decimalSeparator() << '\'' << std::endl; std::cout << "Thousand separator: '" << thousandSeparator() << '\'' << std::endl; + doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, 1.23); + std::cout << "1.23 == '" << buffer << '\'' << std::endl; + assert (dp == decimalSeparator()); assert (ts == thousandSeparator()); } catch (std::runtime_error& ex) @@ -646,21 +660,24 @@ void StringTest::benchmarkStrToInt() void StringTest::benchmarkStrToFloat() { Poco::Stopwatch sw; - std::string num = "1.23456e-123"; + std::string num = "1.0372157551632929e-112"; + std::cout << "The Number: " << num << std::endl; double res; sw.start(); for (int i = 0; i < 1000000; ++i) parseStream(num, res); sw.stop(); - std::cout << "parseStream Number: " << res << std::endl; + std::cout << "parseStream Number: " << std::setprecision(std::numeric_limits::digits10) << res << std::endl; double timeStream = sw.elapsed() / 1000.0; + // standard strtod char* pC = 0; sw.restart(); for (int i = 0; i < 1000000; ++i) res = std::strtod(num.c_str(), &pC); sw.stop(); std::cout << "std::strtod Number: " << res << std::endl; - double timeStrtod = sw.elapsed() / 1000.0; + double timeStdStrtod = sw.elapsed() / 1000.0; + // POCO Way sw.restart(); char ou = 0; for (int i = 0; i < 1000000; ++i) strToFloat(num.c_str(), res, ou); @@ -668,19 +685,27 @@ void StringTest::benchmarkStrToFloat() std::cout << "strToFloat Number: " << res << std::endl; double timeStrToFloat = sw.elapsed() / 1000.0; + // standard sscanf sw.restart(); for (int i = 0; i < 1000000; ++i) std::sscanf(num.c_str(), "%lf", &res); sw.stop(); std::cout << "sscanf Number: " << res << std::endl; double timeScanf = sw.elapsed() / 1000.0; + // double-conversion Strtod + sw.restart(); + for (int i = 0; i < 1000000; ++i) strToDoubleDC(num.c_str()); + sw.stop(); + std::cout << "Strtod Number: " << res << std::endl; + double timeStrtod = sw.elapsed() / 1000.0; + int graph; std::cout << std::endl << "Timing and speedup relative to I/O stream:" << std::endl << std::endl; - std::cout << std::setw(14) << "Stream:\t" << std::setw(10) << std::setfill(' ') << timeStream << "[ms]" << std::endl; + std::cout << std::setw(14) << "Stream:\t" << std::setw(10) << std::setfill(' ') << std::setprecision(4) << timeStream << "[ms]" << std::endl; - std::cout << std::setw(14) << "std::strtod:\t" << std::setw(10) << std::setfill(' ') << timeStrtod << "[ms]" << - std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeStrtod) << '\t' ; - graph = (int) (timeStream / timeStrtod); for (int i = 0; i < graph; ++i) std::cout << '#'; + std::cout << std::setw(14) << "std::strtod:\t" << std::setw(10) << std::setfill(' ') << timeStdStrtod << "[ms]" << + std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeStdStrtod) << '\t' ; + graph = (int) (timeStream / timeStdStrtod); for (int i = 0; i < graph; ++i) std::cout << '#'; std::cout << std::endl << std::setw(14) << "strToFloat:\t" << std::setw(10) << std::setfill(' ') << timeStrToFloat << "[ms]" << std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeStrToFloat) << '\t' ; @@ -689,6 +714,11 @@ void StringTest::benchmarkStrToFloat() std::cout << std::endl << std::setw(14) << "std::sscanf:\t" << std::setw(10) << std::setfill(' ') << timeScanf << "[ms]" << std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeScanf) << '\t' ; graph = (int) (timeStream / timeScanf); for (int i = 0; i < graph; ++i) std::cout << '#'; + + std::cout << std::endl << std::setw(14) << "StrtoD:\t" << std::setw(10) << std::setfill(' ') << timeScanf << "[ms]" << + std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeStrtod) << '\t' ; + graph = (int) (timeStream / timeStrtod); for (int i = 0; i < graph; ++i) std::cout << '#'; + std::cout << std::endl; } @@ -785,14 +815,111 @@ void StringTest::testIntToString() try { - char pResult[POCO_MAX_NUM_STRING_LEN]; - unsigned sz = POCO_MAX_NUM_STRING_LEN; + char pResult[POCO_MAX_INT_STRING_LEN]; + unsigned sz = POCO_MAX_INT_STRING_LEN; intToStr(0, 10, pResult, sz, false, sz + 1, ' '); fail ("must throw RangeException"); } catch (RangeException&) { } } +void StringTest::testFloatToString() +{ + double val = 1.03721575516329e-112; + std::string str; + + assert (doubleToStr(str, val, 15, 21) == "1.03721575516329e-112"); + assert (doubleToStr(str, val, 15, 22) == " 1.03721575516329e-112"); + val = -val; + assert (doubleToStr(str, val, 15, 22) == "-1.03721575516329e-112"); + assert (doubleToStr(str, val, 15, 23) == " -1.03721575516329e-112"); + + val = -10372157551632.9; + assert (doubleToStr(str, val, 1, 21, ',') == "-10,372,157,551,632.9"); + assert (doubleToStr(str, val, 1, 22, ',') == " -10,372,157,551,632.9"); + assert (doubleToStr(str, val, 2, 22, ',') == "-10,372,157,551,632.90"); + assert (doubleToStr(str, val, 2, 22, '.', ',') == "-10.372.157.551.632,90"); + assert (doubleToStr(str, val, 2, 22, ' ', ',') == "-10 372 157 551 632,90"); +} + + +void formatStream(double value, std::string& str) +{ + char buffer[128]; + Poco::MemoryOutputStream ostr(buffer, sizeof(buffer)); +#if !defined(POCO_NO_LOCALE) + ostr.imbue(std::locale::classic()); +#endif + ostr << std::setprecision(16) << value; + str.assign(buffer, static_cast(ostr.charsWritten())); +} + + +void formatSprintf(double value, std::string& str) +{ + char buffer[128]; + std::sprintf(buffer, "%.*g", 16, value); + str = buffer; +} + + +void StringTest::benchmarkFloatToStr() +{ + Poco::Stopwatch sw; + double val = 1.0372157551632929e-112; + std::cout << "The Number: " << std::setprecision(std::numeric_limits::digits10) << val << std::endl; + std::string str; + sw.start(); + for (int i = 0; i < 1000000; ++i) formatStream(val, str); + sw.stop(); + std::cout << "formatStream Number: " << str << std::endl; + double timeStream = sw.elapsed() / 1000.0; + + // standard sprintf + str = ""; + sw.restart(); + for (int i = 0; i < 1000000; ++i) formatSprintf(val, str); + sw.stop(); + std::cout << "std::sprintf Number: " << str << std::endl; + double timeSprintf = sw.elapsed() / 1000.0; + + // POCO Way (via double-conversion) + // no padding + sw.restart(); + char buffer[POCO_MAX_FLT_STRING_LEN]; + for (int i = 0; i < 1000000; ++i) doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, val); + sw.stop(); + std::cout << "doubleToStr(char) Number: " << buffer << std::endl; + double timeDoubleToStrChar = sw.elapsed() / 1000.0; + + // with padding + str = ""; + sw.restart(); + for (int i = 0; i < 1000000; ++i) doubleToStr(str, val); + sw.stop(); + std::cout << "doubleToStr(std::string) Number: " << str << std::endl; + double timeDoubleToStrString = sw.elapsed() / 1000.0; + + int graph; + std::cout << std::endl << "Timing and speedup relative to I/O stream:" << std::endl << std::endl; + std::cout << std::setw(14) << "Stream:\t" << std::setw(10) << std::setfill(' ') << std::setprecision(4) << timeStream << "[ms]" << std::endl; + + std::cout << std::setw(14) << "sprintf:\t" << std::setw(10) << std::setfill(' ') << timeSprintf << "[ms]" << + std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeSprintf) << '\t' ; + graph = (int) (timeStream / timeSprintf); for (int i = 0; i < graph; ++i) std::cout << '#'; + + std::cout << std::endl << std::setw(14) << "doubleToChar:\t" << std::setw(10) << std::setfill(' ') << timeDoubleToStrChar << "[ms]" << + std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeDoubleToStrChar) << '\t' ; + graph = (int) (timeStream / timeDoubleToStrChar); for (int i = 0; i < graph; ++i) std::cout << '#'; + + std::cout << std::endl << std::setw(14) << "doubleToString:\t" << std::setw(10) << std::setfill(' ') << timeDoubleToStrString << "[ms]" << + std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeDoubleToStrString) << '\t' ; + graph = (int) (timeStream / timeDoubleToStrString); for (int i = 0; i < graph; ++i) std::cout << '#'; + + std::cout << std::endl; +} + + void StringTest::setUp() { } @@ -825,9 +952,11 @@ CppUnit::Test* StringTest::suite() CppUnit_addTest(pSuite, StringTest, testStringToFloat); CppUnit_addTest(pSuite, StringTest, testStringToFloatError); CppUnit_addTest(pSuite, StringTest, testNumericLocale); - //CppUnit_addTest(pSuite, StringTest, benchmarkStrToFloat); + CppUnit_addTest(pSuite, StringTest, benchmarkStrToFloat); //CppUnit_addTest(pSuite, StringTest, benchmarkStrToInt); CppUnit_addTest(pSuite, StringTest, testIntToString); + CppUnit_addTest(pSuite, StringTest, testFloatToString); + CppUnit_addTest(pSuite, StringTest, benchmarkFloatToStr); return pSuite; } diff --git a/Foundation/testsuite/src/StringTest.h b/Foundation/testsuite/src/StringTest.h index f0c8f3416..d3cc7048c 100644 --- a/Foundation/testsuite/src/StringTest.h +++ b/Foundation/testsuite/src/StringTest.h @@ -71,6 +71,8 @@ public: void benchmarkStrToInt(); void testIntToString(); + void testFloatToString(); + void benchmarkFloatToStr(); void setUp(); void tearDown(); @@ -132,7 +134,6 @@ private: istr >> value; return istr.eof() && !istr.fail(); } - }; diff --git a/XML/testsuite/rss.xml b/XML/testsuite/rss.xml deleted file mode 100644 index 5aee14795..000000000 --- a/XML/testsuite/rss.xml +++ /dev/null @@ -1,829 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -> - - - - - - - - XML.com - - http://www.xml.com/ - - XML.com features a rich mix of information and services for the XML community. - - hourly - - 2 - - 2000-01-01T12:00+00:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Meerkat Powered! - - http://meerkat.oreillynet.com/icons/meerkat-powered.jpg - - http://meerkat.oreillynet.com - - - - - - Features: Top 10 XForms Engines - - http://www.xml.com/pub/a/2005/02/09/xforms.html - - - Micah Dubinko, one of the gurus of XForms, offers a rundown on the state of XForms engines for 2005. - - - XML.com - - Micah Dubinko - - Web, Applications - - O'Reilly Media, Inc. - - 2005-02-09 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Features: Comparing CSS and XSL: A Reply from Norm Walsh - - http://www.xml.com/pub/a/2005/02/09/cssorxsl.html - - - Norm Walsh responds to a recent article about CSS and XSL, explaining how and when and why you'd want to use XSLFO or CSS or XSLT. - - - XML.com - - Norman Walsh - - Style - - O'Reilly Media, Inc. - - 2005-02-09 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Features: Very Dynamic Web Interfaces - - http://www.xml.com/pub/a/2005/02/09/xml-http-request.html - - - Drew McLellan explains how to use XMLHTTPRequest and Javascript to create web applications with very dynamic, smooth interfaces. - - - XML.com - - Drew McLellan - - Web Development, Instruction - - O'Reilly Media, Inc. - - 2005-02-09 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Transforming XML: The XPath 2.0 Data Model - - http://www.xml.com/pub/a/2005/02/02/xpath2.html - - - Bob DuCharme, in his latest Transforming XML column, examines the XPath 2.0, hence the XSLT 2.0, data model. - - - XML.com - - Bob DuCharme - - Style, Style - - O'Reilly Media, Inc. - - 2005-02-02 - - Transforming XML - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - XML Tourist: The Silent Soundtrack - - http://www.xml.com/pub/a/2005/02/02/silent.html - - - In this installation of XML Tourist, John E. Simpson presents an overview of the types of sound-to-text captioning available. Pinpointing closed captioning as the most suitable for use with computerized multimedia, he then explains how XML-based solutions address synchronization issues. - - - XML.com - - John E. Simpson - - Graphics, Vertical Industries - - O'Reilly Media, Inc. - - 2005-02-02 - - XML Tourist - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Transforming XML: The XML 2.0 Data Model - - http://www.xml.com/pub/a/2005/02/02/xpath2.html - - - Bob DuCharme, in his latest Transforming XML column, examines the XPath 2.0, hence the XSLT 2.0, data model. - - - XML.com - - Bob DuCharme - - Style, Style - - O'Reilly Media, Inc. - - 2005-02-02 - - Transforming XML - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Features: An Introduction to TMAPI - - http://www.xml.com/pub/a/2005/02/02/tmapi.html - - - TMAPI, a Java Topic Map API, is the standard way to interact with XML Topic Maps programmatically from Java. This article provides a tutorial for TMAPI. - - - XML.com - - Robert Barta, Oliver Leimig - - Metadata, Metadata - - O'Reilly Media, Inc. - - 2005-02-02 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Features: Formal Taxonomies for the U.S. Government - - http://www.xml.com/pub/a/2005/01/26/formtax.html - - - Mike Daconta, Metadata Program Manager at the Department of Homeland Security, introduces the notion of a formal taxonomy in the context of the Federal Enteriprise Architecture's Data Reference Model. - - - XML.com - - Michael Daconta - - Metadata, Metadata - - O'Reilly Media, Inc. - - 2005-01-26 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Features: Hacking Open Office - - http://www.xml.com/pub/a/2005/01/26/hacking-ooo.html - - - Peter Sefton shows us how to use XML tools to hack Open Office file formats. - - - XML.com - - Peter Sefton - - Programming, Tools, Publishing - - O'Reilly Media, Inc. - - 2005-01-26 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Features: SIMILE: Practical Metadata for the Semantic Web - - http://www.xml.com/pub/a/2005/01/26/simile.html - - - Digital libraries and generic metadata form part of the background assumptions and forward-looking goals of the Semantic Web. SIMILE is an interesting project aimed at realizing some of those goals. - - - XML.com - - Stephen Garland, Ryan Lee, Stefano Mazzocchi - - Semantic Web, Metadata - - O'Reilly Media, Inc. - - 2005-01-26 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Python and XML: Introducing the Amara XML Toolkit - - http://www.xml.com/pub/a/2005/01/19/amara.html - - - Uche Ogbuji introduces Amara, his new collection of XML tools for Python. - - - XML.com - - Uche Ogbuji - - Programming, Programming - - O'Reilly Media, Inc. - - 2005-01-19 - - Python and XML - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Features: Printing XML: Why CSS Is Better than XSL - - http://www.xml.com/pub/a/2005/01/19/print.html - - - One of the old school debates among XML developers is &quot;CSS versus XSLT.&quot; H&aring;kun Wium Lie and Michael Day revive that debate with a shot across XSL's bow. - - - XML.com - - Michael Day, H&aring;kon Wium Lie - - Style, Publishing - - O'Reilly Media, Inc. - - 2005-01-19 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Features: Reviewing the Architecture of the World Wide Web - - http://www.xml.com/pub/a/2005/01/19/review.html - - - Harry Halpin reviews the final published edition of the W3C TAG's Architecture of the World Wide Web document. - - - XML.com - - Harry Halpin - - Web, Perspectives - - O'Reilly Media, Inc. - - 2005-01-19 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Features: SAML 2: The Building Blocks of Federated Identity - - http://www.xml.com/pub/a/2005/01/12/saml2.html - - - Paul Madsen reports on the developments in web services security, including a new major release of SAML, which provides the basis for building federated identity. - - - XML.com - - Paul Madsen - - Web Services, Specifications - - O'Reilly Media, Inc. - - 2005-01-12 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Features: Introducing Comega - - http://www.xml.com/pub/a/2005/01/12/comega.html - - - Dare Obasanjo explains some of the ways in which C&omega;--a new language from Microsoft Research--makes XML processing easier and more natural. - - - XML.com - - Dare Obasanjo - - Programming, Instruction - - O'Reilly Media, Inc. - - 2005-01-12 - - Features - - text/html - - en-us - - Copyright 2005, O'Reilly Media, Inc. - - - - - - Search - - Search Meerkat... - - s - - http://meerkat.oreillynet.com/ - - - - - diff --git a/doc/Acknowledgements.html b/doc/Acknowledgements.html index dfb28c4ce..2bd4efa42 100644 --- a/doc/Acknowledgements.html +++ b/doc/Acknowledgements.html @@ -198,5 +198,35 @@ for any purpose, commercial or non-commercial, and by any means.

+

double-conversion

+

Copyright 2010 the V8 project authors. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

+ + From b0ae034a94821e77b73c447351a28f857128d26f Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 25 Nov 2012 22:47:59 -0600 Subject: [PATCH 054/165] a couple of minor changes --- Foundation/include/Poco/NumericString.h | 1 - Foundation/src/NumericString.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h index b496a2aa3..c16d63998 100644 --- a/Foundation/include/Poco/NumericString.h +++ b/Foundation/include/Poco/NumericString.h @@ -250,7 +250,6 @@ bool strToFloat (const char* pStr, F& result, char& eu = Impl::DUMMY_EXP_UNDERFL char numSign = 1, expSign = 1; char state = STATE_LEADING_SPACES; F mantissa = 0.0, exponent = 0.0, pow10 = 1.0; - int powCnt = 0; result = 0.0; eu = 0; diff --git a/Foundation/src/NumericString.cpp b/Foundation/src/NumericString.cpp index 13e0088cd..f11398ccb 100644 --- a/Foundation/src/NumericString.cpp +++ b/Foundation/src/NumericString.cpp @@ -1,5 +1,5 @@ // -// String.h +// NumericString.h // // $Id: //poco/1.4/Foundation/src/NumericString.cpp#1 $ // From dd2e677f8a637f28a417ffc624f54d6d0e403519 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 26 Nov 2012 19:01:44 -0600 Subject: [PATCH 055/165] separate function for unsigned to string conversion Separated unsigned integer conversion to eliminate warnings (and slightly improve performance). Added Darwin-clang warning suppression for unused functions/variables --- Foundation/include/Poco/NumberFormatter.h | 42 ++++----- Foundation/include/Poco/NumericString.h | 104 ++++++++++++++++++++-- Foundation/src/NumberFormatter.cpp | 42 ++++----- Foundation/testsuite/src/StringTest.cpp | 53 +++++------ build/config/Darwin-clang | 2 +- 5 files changed, 166 insertions(+), 77 deletions(-) diff --git a/Foundation/include/Poco/NumberFormatter.h b/Foundation/include/Poco/NumberFormatter.h index 5adfd94fd..cc77e3bab 100644 --- a/Foundation/include/Poco/NumberFormatter.h +++ b/Foundation/include/Poco/NumberFormatter.h @@ -441,7 +441,7 @@ inline std::string NumberFormatter::format0(int value, int width) inline std::string NumberFormatter::formatHex(int value, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix); + uIntToStr(static_cast(value), 0x10, result, prefix); return result; } @@ -449,7 +449,7 @@ inline std::string NumberFormatter::formatHex(int value, bool prefix) inline std::string NumberFormatter::formatHex(int value, int width, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix, width, '0'); + uIntToStr(static_cast(value), 0x10, result, prefix, width, '0'); return result; } @@ -457,7 +457,7 @@ inline std::string NumberFormatter::formatHex(int value, int width, bool prefix) inline std::string NumberFormatter::format(unsigned value) { std::string result; - intToStr(value, 10, result); + uIntToStr(value, 10, result); return result; } @@ -465,7 +465,7 @@ inline std::string NumberFormatter::format(unsigned value) inline std::string NumberFormatter::format(unsigned value, int width) { std::string result; - intToStr(value, 10, result, false, width, ' '); + uIntToStr(value, 10, result, false, width, ' '); return result; } @@ -473,7 +473,7 @@ inline std::string NumberFormatter::format(unsigned value, int width) inline std::string NumberFormatter::format0(unsigned int value, int width) { std::string result; - intToStr(value, 10, result, false, width, '0'); + uIntToStr(value, 10, result, false, width, '0'); return result; } @@ -481,7 +481,7 @@ inline std::string NumberFormatter::format0(unsigned int value, int width) inline std::string NumberFormatter::formatHex(unsigned value, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix); + uIntToStr(value, 0x10, result, prefix); return result; } @@ -489,7 +489,7 @@ inline std::string NumberFormatter::formatHex(unsigned value, bool prefix) inline std::string NumberFormatter::formatHex(unsigned value, int width, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix, width, '0'); + uIntToStr(value, 0x10, result, prefix, width, '0'); return result; } @@ -521,7 +521,7 @@ inline std::string NumberFormatter::format0(long value, int width) inline std::string NumberFormatter::formatHex(long value, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix); + uIntToStr(static_cast(value), 0x10, result, prefix); return result; } @@ -529,7 +529,7 @@ inline std::string NumberFormatter::formatHex(long value, bool prefix) inline std::string NumberFormatter::formatHex(long value, int width, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix, width, '0'); + uIntToStr(static_cast(value), 0x10, result, prefix, width, '0'); return result; } @@ -537,7 +537,7 @@ inline std::string NumberFormatter::formatHex(long value, int width, bool prefix inline std::string NumberFormatter::format(unsigned long value) { std::string result; - intToStr(value, 10, result); + uIntToStr(value, 10, result); return result; } @@ -545,7 +545,7 @@ inline std::string NumberFormatter::format(unsigned long value) inline std::string NumberFormatter::format(unsigned long value, int width) { std::string result; - intToStr(value, 10, result, false, width, ' '); + uIntToStr(value, 10, result, false, width, ' '); return result; } @@ -553,7 +553,7 @@ inline std::string NumberFormatter::format(unsigned long value, int width) inline std::string NumberFormatter::format0(unsigned long value, int width) { std::string result; - intToStr(value, 10, result, false, width, '0'); + uIntToStr(value, 10, result, false, width, '0'); return result; } @@ -561,7 +561,7 @@ inline std::string NumberFormatter::format0(unsigned long value, int width) inline std::string NumberFormatter::formatHex(unsigned long value, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix); + uIntToStr(value, 0x10, result, prefix); return result; } @@ -569,7 +569,7 @@ inline std::string NumberFormatter::formatHex(unsigned long value, bool prefix) inline std::string NumberFormatter::formatHex(unsigned long value, int width, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix, width, '0'); + uIntToStr(value, 0x10, result, prefix, width, '0'); return result; } @@ -604,7 +604,7 @@ inline std::string NumberFormatter::format0(Int64 value, int width) inline std::string NumberFormatter::formatHex(Int64 value, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix); + uIntToStr(static_cast(value), 0x10, result, prefix); return result; } @@ -612,7 +612,7 @@ inline std::string NumberFormatter::formatHex(Int64 value, bool prefix) inline std::string NumberFormatter::formatHex(Int64 value, int width, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix, width, '0'); + uIntToStr(static_cast(value), 0x10, result, prefix, width, '0'); return result; } @@ -620,7 +620,7 @@ inline std::string NumberFormatter::formatHex(Int64 value, int width, bool prefi inline std::string NumberFormatter::format(UInt64 value) { std::string result; - intToStr(value, 10, result); + uIntToStr(value, 10, result); return result; } @@ -628,7 +628,7 @@ inline std::string NumberFormatter::format(UInt64 value) inline std::string NumberFormatter::format(UInt64 value, int width) { std::string result; - intToStr(value, 10, result, false, width, ' '); + uIntToStr(value, 10, result, false, width, ' '); return result; } @@ -636,7 +636,7 @@ inline std::string NumberFormatter::format(UInt64 value, int width) inline std::string NumberFormatter::format0(UInt64 value, int width) { std::string result; - intToStr(value, 10, result, false, width, '0'); + uIntToStr(value, 10, result, false, width, '0'); return result; } @@ -644,7 +644,7 @@ inline std::string NumberFormatter::format0(UInt64 value, int width) inline std::string NumberFormatter::formatHex(UInt64 value, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix); + uIntToStr(value, 0x10, result, prefix); return result; } @@ -652,7 +652,7 @@ inline std::string NumberFormatter::formatHex(UInt64 value, bool prefix) inline std::string NumberFormatter::formatHex(UInt64 value, int width, bool prefix) { std::string result; - intToStr(value, 0x10, result, prefix, width, '0'); + uIntToStr(value, 0x10, result, prefix, width, '0'); return result; } diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h index c16d63998..5103ad4f5 100644 --- a/Foundation/include/Poco/NumericString.h +++ b/Foundation/include/Poco/NumericString.h @@ -68,13 +68,6 @@ namespace Poco { -namespace Impl { - -static char DUMMY_EXP_UNDERFLOW = 0; // dummy default val - -} - - inline char decimalSeparator() /// Returns decimal separator from global locale or /// default '.' for platforms where locale is unavailable. @@ -217,6 +210,13 @@ bool strToInt(const std::string& str, I& result, short base, char thSep = ',') { return strToInt(str.c_str(), result, base, thSep); } + + +namespace Impl { + +static char DUMMY_EXP_UNDERFLOW; // dummy default val + +} template @@ -451,7 +451,7 @@ namespace Impl { const char* _beg; char* _cur; const char* _end; -}; +}; } // namespace Impl @@ -534,6 +534,81 @@ bool intToStr(T value, } +template +bool uIntToStr(T value, + unsigned short base, + char* result, + unsigned& size, + bool prefix = false, + int width = -1, + char fill = ' ', + char thSep = 0) + /// Converts unsigned integer to string. Numeric bases from binary to hexadecimal are supported. + /// If width is non-zero, it pads the return value with fill character to the specified width. + /// When padding is zero character ('0'), it is prepended to the number itself; all other + /// paddings are prepended to the formatted result with minus sign or base prefix included + /// If prefix is true and base is octal or hexadecimal, respective prefix ('0' for octal, + /// "0x" for hexadecimal) is prepended. For all other bases, prefix argument is ignored. + /// Formatted string has at least [width] total length. +{ + if (base < 2 || base > 0x10) + { + *result = '\0'; + return false; + } + + Impl::Ptr ptr(result, size); + int thCount = 0; + T tmpVal; + do + { + tmpVal = value; + value /= base; + *ptr++ = "FEDCBA9876543210123456789ABCDEF"[15 + (tmpVal - value * base)]; + if (thSep && (base == 10) && (++thCount == 3)) + { + *ptr++ = thSep; + thCount = 0; + } + } while (value); + + if ('0' == fill) + { + if (prefix && base == 010) --width; + if (prefix && base == 0x10) width -= 2; + while ((ptr - result) < width) *ptr++ = fill; + } + + if (prefix && base == 010) *ptr++ = '0'; + else if (prefix && base == 0x10) + { + *ptr++ = 'x'; + *ptr++ = '0'; + } + + if ('0' != fill) + { + while ((ptr - result) < width) *ptr++ = fill; + } + + size = ptr - result; + poco_assert_dbg (size <= ptr.span()); + poco_assert_dbg ((-1 == width) || (size >= width)); + *ptr-- = '\0'; + + char* ptrr = result; + char tmp; + while(ptrr < ptr) + { + tmp = *ptr; + *ptr-- = *ptrr; + *ptrr++ = tmp; + } + + return true; +} + + template bool intToStr (T number, unsigned short base, std::string& result, bool prefix = false, int width = -1, char fill = ' ', char thSep = 0) /// Converts integer to string; This is a wrapper function, for details see see the @@ -545,6 +620,19 @@ bool intToStr (T number, unsigned short base, std::string& result, bool prefix = result.assign(res, size); return ret; } + + +template +bool uIntToStr (T number, unsigned short base, std::string& result, bool prefix = false, int width = -1, char fill = ' ', char thSep = 0) + /// Converts unsigned integer to string; This is a wrapper function, for details see see the + /// bool uIntToStr(T, unsigned short, char*, int, int, char, char) implementation. +{ + char res[POCO_MAX_INT_STRING_LEN] = {0}; + unsigned size = POCO_MAX_INT_STRING_LEN; + bool ret = uIntToStr(number, base, res, size, prefix, width, fill, thSep); + result.assign(res, size); + return ret; +} // diff --git a/Foundation/src/NumberFormatter.cpp b/Foundation/src/NumberFormatter.cpp index ac4556dd1..d736adfc0 100644 --- a/Foundation/src/NumberFormatter.cpp +++ b/Foundation/src/NumberFormatter.cpp @@ -107,7 +107,7 @@ void NumberFormatter::appendHex(std::string& str, int value) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz); + uIntToStr(static_cast(value), 0x10, result, sz); str.append(result, sz); } @@ -116,7 +116,7 @@ void NumberFormatter::appendHex(std::string& str, int value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz, false, width, '0'); + uIntToStr(static_cast(value), 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -125,7 +125,7 @@ void NumberFormatter::append(std::string& str, unsigned value) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 10, result, sz); + uIntToStr(value, 10, result, sz); str.append(result, sz); } @@ -134,7 +134,7 @@ void NumberFormatter::append(std::string& str, unsigned value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 10, result, sz, false, width); + uIntToStr(value, 10, result, sz, false, width); str.append(result, sz); } @@ -143,7 +143,7 @@ void NumberFormatter::append0(std::string& str, unsigned int value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 10, result, sz, false, width, '0'); + uIntToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -152,7 +152,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned value) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz); + uIntToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -161,7 +161,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz, false, width, '0'); + uIntToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -197,7 +197,7 @@ void NumberFormatter::appendHex(std::string& str, long value) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz); + uIntToStr(static_cast(value), 0x10, result, sz); str.append(result, sz); } @@ -206,7 +206,7 @@ void NumberFormatter::appendHex(std::string& str, long value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz, false, width, '0'); + uIntToStr(static_cast(value), 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -215,7 +215,7 @@ void NumberFormatter::append(std::string& str, unsigned long value) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 10, result, sz); + uIntToStr(value, 10, result, sz); str.append(result, sz); } @@ -224,7 +224,7 @@ void NumberFormatter::append(std::string& str, unsigned long value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 10, result, sz, false, width, '0'); + uIntToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -233,7 +233,7 @@ void NumberFormatter::append0(std::string& str, unsigned long value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 10, result, sz, false, width, '0'); + uIntToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -242,7 +242,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned long value) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz); + uIntToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -251,7 +251,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned long value, int width { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz, false, width, '0'); + uIntToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -290,7 +290,7 @@ void NumberFormatter::appendHex(std::string& str, Int64 value) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz); + uIntToStr(static_cast(value), 0x10, result, sz); str.append(result, sz); } @@ -299,7 +299,7 @@ void NumberFormatter::appendHex(std::string& str, Int64 value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz, false, width, '0'); + uIntToStr(static_cast(value), 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -308,7 +308,7 @@ void NumberFormatter::append(std::string& str, UInt64 value) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 10, result, sz); + uIntToStr(value, 10, result, sz); str.append(result, sz); } @@ -317,7 +317,7 @@ void NumberFormatter::append(std::string& str, UInt64 value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 10, result, sz, false, width, '0'); + uIntToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -326,7 +326,7 @@ void NumberFormatter::append0(std::string& str, UInt64 value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 10, result, sz, false, width, '0'); + uIntToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -335,7 +335,7 @@ void NumberFormatter::appendHex(std::string& str, UInt64 value) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz); + uIntToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -344,7 +344,7 @@ void NumberFormatter::appendHex(std::string& str, UInt64 value, int width) { char result[NF_MAX_INT_STRING_LEN]; unsigned sz = NF_MAX_INT_STRING_LEN; - intToStr(value, 0x10, result, sz, false, width, '0'); + uIntToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index 1d41b0ba1..3182cc42b 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -62,6 +62,7 @@ using Poco::cat; using Poco::strToInt; using Poco::strToFloat; using Poco::intToStr; +using Poco::uIntToStr; using Poco::strToDoubleDC; using Poco::floatToStr; using Poco::doubleToStr; @@ -751,65 +752,65 @@ void StringTest::testIntToString() assert (result == "1001001100101100000001011010010"); assert (intToStr(1234567890, 2, result, true, 35, '0')); assert (result == "00001001001100101100000001011010010"); - assert (intToStr(0xFF, 2, result)); + assert (uIntToStr(0xFF, 2, result)); assert (result == "11111111"); - assert (intToStr(0x0F, 2, result, false, 8, '0')); + assert (uIntToStr(0x0F, 2, result, false, 8, '0')); assert (result == "00001111"); - assert (intToStr(0x0F, 2, result)); + assert (uIntToStr(0x0F, 2, result)); assert (result == "1111"); - assert (intToStr(0xF0, 2, result)); + assert (uIntToStr(0xF0, 2, result)); assert (result == "11110000"); - assert (intToStr(0xFFFF, 2, result)); + assert (uIntToStr(0xFFFF, 2, result)); assert (result == "1111111111111111"); - assert (intToStr(0xFF00, 2, result)); + assert (uIntToStr(0xFF00, 2, result)); assert (result == "1111111100000000"); - assert (intToStr(0xFFFFFFFF, 2, result)); + assert (uIntToStr(0xFFFFFFFF, 2, result)); assert (result == "11111111111111111111111111111111"); - assert (intToStr(0xFF00FF00, 2, result)); + assert (uIntToStr(0xFF00FF00, 2, result)); assert (result == "11111111000000001111111100000000"); - assert (intToStr(0xF0F0F0F0, 2, result)); + assert (uIntToStr(0xF0F0F0F0, 2, result)); assert (result == "11110000111100001111000011110000"); #if defined(POCO_HAVE_INT64) - assert (intToStr(0xFFFFFFFFFFFFFFFF, 2, result)); + assert (uIntToStr(0xFFFFFFFFFFFFFFFF, 2, result)); std::cout << 0xFFFFFFFFFFFFFFFF << std::endl; assert (result == "1111111111111111111111111111111111111111111111111111111111111111"); - assert (intToStr(0xFF00000FF00000FF, 2, result)); + assert (uIntToStr(0xFF00000FF00000FF, 2, result)); assert (result == "1111111100000000000000000000111111110000000000000000000011111111"); #endif // octal - assert (intToStr(1234567890, 010, result)); + assert (uIntToStr(1234567890, 010, result)); assert (result == "11145401322"); - assert (intToStr(1234567890, 010, result, true)); + assert (uIntToStr(1234567890, 010, result, true)); assert (result == "011145401322"); - assert (intToStr(1234567890, 010, result, true, 15, '0')); + assert (uIntToStr(1234567890, 010, result, true, 15, '0')); assert (result == "000011145401322"); - assert (intToStr(012345670, 010, result, true)); + assert (uIntToStr(012345670, 010, result, true)); assert (result == "012345670"); - assert (intToStr(012345670, 010, result)); + assert (uIntToStr(012345670, 010, result)); assert (result == "12345670"); // hexadecimal - assert (intToStr(0, 0x10, result, true)); + assert (uIntToStr(0, 0x10, result, true)); assert (result == "0x0"); - assert (intToStr(0, 0x10, result, true, 4, '0')); + assert (uIntToStr(0, 0x10, result, true, 4, '0')); assert (result == "0x00"); - assert (intToStr(0, 0x10, result, false, 4, '0')); + assert (uIntToStr(0, 0x10, result, false, 4, '0')); assert (result == "0000"); - assert (intToStr(1234567890, 0x10, result)); + assert (uIntToStr(1234567890, 0x10, result)); assert (result == "499602D2"); - assert (intToStr(1234567890, 0x10, result, true)); + assert (uIntToStr(1234567890, 0x10, result, true)); assert (result == "0x499602D2"); - assert (intToStr(1234567890, 0x10, result, true, 15, '0')); + assert (uIntToStr(1234567890, 0x10, result, true, 15, '0')); assert (result == "0x00000499602D2"); - assert (intToStr(0x1234567890ABCDEF, 0x10, result, true)); + assert (uIntToStr(0x1234567890ABCDEF, 0x10, result, true)); assert (result == "0x1234567890ABCDEF"); - assert (intToStr(0xDEADBEEF, 0x10, result)); + assert (uIntToStr(0xDEADBEEF, 0x10, result)); assert (result == "DEADBEEF"); #if defined(POCO_HAVE_INT64) - assert (intToStr(0xFFFFFFFFFFFFFFFF, 0x10, result)); + assert (uIntToStr(0xFFFFFFFFFFFFFFFF, 0x10, result)); assert (result == "FFFFFFFFFFFFFFFF"); - assert (intToStr(0xFFFFFFFFFFFFFFFF, 0x10, result, true)); + assert (uIntToStr(0xFFFFFFFFFFFFFFFF, 0x10, result, true)); assert (result == "0xFFFFFFFFFFFFFFFF"); #endif diff --git a/build/config/Darwin-clang b/build/config/Darwin-clang index 6c2be5086..e9db158e4 100644 --- a/build/config/Darwin-clang +++ b/build/config/Darwin-clang @@ -49,7 +49,7 @@ SHAREDLIBLINKEXT = .dylib # Compiler and Linker Flags # CFLAGS = $(ARCHFLAGS) -CXXFLAGS = $(ARCHFLAGS) -Wall -Wno-sign-compare +CXXFLAGS = $(ARCHFLAGS) -Wall -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-unneeded-internal-declaration LINKFLAGS = $(ARCHFLAGS) SHLIBFLAGS = $(ARCHFLAGS) DYLIBFLAGS = $(ARCHFLAGS) From 9dd1482a0280552bcd7081ea6a3a405b6d7f44eb Mon Sep 17 00:00:00 2001 From: aleks-f Date: Mon, 26 Nov 2012 20:25:19 -0600 Subject: [PATCH 056/165] add locale tests to ensure point is enforced tests ensuring that default number to string conversion retains point being decimal separator regardless of locale --- Foundation/testsuite/src/StringTest.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index 3182cc42b..41b27bc07 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -567,6 +567,7 @@ void StringTest::testNumericLocale() std::cout << "Decimal point: '" << decimalSeparator() << '\'' << std::endl; std::cout << "Thousand separator: '" << ts << '\'' << std::endl; doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, 1.23); + assert (std::strncmp(buffer, "1.23", 4) == 0); std::cout << "1.23 == '" << buffer << '\'' << std::endl; std::locale::global(std::locale("German")); @@ -577,6 +578,7 @@ void StringTest::testNumericLocale() std::cout << "Decimal point: '" << decimalSeparator() << '\'' << std::endl; std::cout << "Thousand separator: '" << thousandSeparator() << '\'' << std::endl; doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, 1.23); + assert (std::strncmp(buffer, "1.23", 4) == 0); std::cout << "1.23 == '" << buffer << '\'' << std::endl; std::locale::global(std::locale("US")); @@ -587,6 +589,7 @@ void StringTest::testNumericLocale() std::cout << "Decimal point: '" << decimalSeparator() << '\'' << std::endl; std::cout << "Thousand separator: '" << thousandSeparator() << '\'' << std::endl; doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, 1.23); + assert (std::strncmp(buffer, "1.23", 4) == 0); std::cout << "1.23 == '" << buffer << '\'' << std::endl; std::locale::global(loc); @@ -596,6 +599,7 @@ void StringTest::testNumericLocale() std::cout << "Decimal point: '" << decimalSeparator() << '\'' << std::endl; std::cout << "Thousand separator: '" << thousandSeparator() << '\'' << std::endl; doubleToStr(buffer, POCO_MAX_FLT_STRING_LEN, 1.23); + assert (std::strncmp(buffer, "1.23", 4) == 0); std::cout << "1.23 == '" << buffer << '\'' << std::endl; assert (dp == decimalSeparator()); From 134558f926fadcd446a397f3440ff7f687138ccc Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sat, 1 Dec 2012 14:02:51 -0600 Subject: [PATCH 057/165] double-conversion floating-point conversions - using double-conversion library for floating-point numeric/string conversions - added string replace[InPlace], remove[InPlace] - reverted overwritten FileChannel purge age and count features - file size value checks in SMTPClient --- .gitignore | 3 +- CHANGELOG | 3 + Foundation/include/Poco/Config.h | 2 +- Foundation/include/Poco/FileChannel.h | 8 +- Foundation/include/Poco/NumericString.h | 210 +++----------------- Foundation/include/Poco/String.h | 47 ++++- Foundation/src/FileChannel.cpp | 23 ++- Foundation/src/NumberParser.cpp | 3 +- Foundation/src/NumericString.cpp | 58 ++++-- Foundation/src/String.cpp | 41 ++++ Foundation/testsuite/src/StringTest.cpp | 252 ++++++++++++++++-------- Foundation/testsuite/src/StringTest.h | 1 + Net/src/SMTPChannel.cpp | 14 +- 13 files changed, 372 insertions(+), 293 deletions(-) diff --git a/.gitignore b/.gitignore index 6f906e7ff..caf247df3 100644 --- a/.gitignore +++ b/.gitignore @@ -43,10 +43,11 @@ CPackSourceConfig.cmake # Logs and databases # ###################### -*.log +*.log* *.sqlite *.db test*.txt +XML/testsuite/rss.xml # OS generated files # ###################### diff --git a/CHANGELOG b/CHANGELOG index d7cebde54..a3d15c1c4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ This is the changelog file for the POCO C++ Libraries. +Release 1.5.0 (2012-12-17) +========================== +- using double-conversion library for floating-point numeric/string conversions Release 1.5.0 (2012-10-14) ========================== diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h index 1973ca20e..0079ee0c3 100644 --- a/Foundation/include/Poco/Config.h +++ b/Foundation/include/Poco/Config.h @@ -139,7 +139,7 @@ // Windows CE has no locale support #if defined(_WIN32_WCE) -#define POCO_NO_LOCALE + #define POCO_NO_LOCALE #endif diff --git a/Foundation/include/Poco/FileChannel.h b/Foundation/include/Poco/FileChannel.h index 37a2e6de4..47953f01a 100644 --- a/Foundation/include/Poco/FileChannel.h +++ b/Foundation/include/Poco/FileChannel.h @@ -161,10 +161,10 @@ class Foundation_API FileChannel: public Channel /// * weeks: the maximum age is weeks. /// * months: the maximum age is months, where a month has 30 days. /// - /// The purgeCount property has an integer value that - /// specifies the maximum number of archived log files. - /// If the number is exceeded, archived log files are - /// deleted, starting with the oldest. + /// The purgeCount property has an integer value that specifies the maximum number + /// of archived log files. If the number is exceeded, archived log files are + /// deleted, starting with the oldest. When "none" or empty string are + /// supplied, they reset purgeCount to none (no purging). /// /// The flush property specifies whether each log message is flushed /// immediately to the log file (which may hurt application performance, diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h index 5103ad4f5..ddc006718 100644 --- a/Foundation/include/Poco/NumericString.h +++ b/Foundation/include/Poco/NumericString.h @@ -55,14 +55,12 @@ #include #endif -// TODO: -// POCO version is fast but simplistic, hence less accurate, undef this for -// double-conversion library use in string => float/double conversions (T.B.D.) -// (double-conversion library is always used for float/double => string) -#define POCO_STR_TO_FLOAT_FAST #define POCO_MAX_INT_STRING_LEN 65 #define POCO_MAX_FLT_STRING_LEN 128 +#define POCO_FLT_INF "inf" +#define POCO_FLT_NAN "nan" +#define POCO_FLT_EXP 'e' namespace Poco { @@ -210,173 +208,6 @@ bool strToInt(const std::string& str, I& result, short base, char thSep = ',') { return strToInt(str.c_str(), result, base, thSep); } - - -namespace Impl { - -static char DUMMY_EXP_UNDERFLOW; // dummy default val - -} - - -template -bool strToFloat (const char* pStr, F& result, char& eu = Impl::DUMMY_EXP_UNDERFLOW, char decSep = '.', char thSep = ',') - /// Converts zero-terminated array to floating-point number; - /// Returns true if succesful. Exponent underflow (i.e. loss of precision due to exponent value) - /// is signalled in eu. Thousand separators are recognized for the locale - /// and silently skipped but not verified for correct positioning. - /// - /// If parsing was unsuccesful, the return value is false with - /// result and eu values undetermined. - /// This function will perform fast but significant rounding errors may occur after - /// the platform precision is exceeded. - /// For better precision conversion, use double-conversion wrappers (strToFloatDC and strToDoubleDC). -{ -#ifndef POCO_STR_TO_FLOAT_FAST - // TODO: for high-precision, use double-conversion here -#else - poco_assert (decSep != thSep); - - if (pStr == 0 || *pStr == '\0') return false; - - // parser states: - const char STATE_LEADING_SPACES = 0; - const char STATE_DIGITS_BEFORE_DEC_POINT = 1; - const char STATE_DIGITS_AFTER_DEC_POINT = 2; - const char STATE_EXP_CHAR = 3; - const char STATE_EXP_DIGITS = 4; - const char STATE_SUFFIX = 5; // 'f' suffix - - char numSign = 1, expSign = 1; - char state = STATE_LEADING_SPACES; - F mantissa = 0.0, exponent = 0.0, pow10 = 1.0; - - result = 0.0; - eu = 0; - for (; *pStr != '\0'; ++pStr) - { - switch (*pStr) - { - case '.': - if (decSep == '.') - { - if (state >= STATE_DIGITS_AFTER_DEC_POINT) return false; - state = STATE_DIGITS_AFTER_DEC_POINT; - break; - } - else if ((thSep == '.') && (state == STATE_DIGITS_BEFORE_DEC_POINT)) - break; - else - return false; - - case ',': - if (decSep == ',') - { - if (state >= STATE_DIGITS_AFTER_DEC_POINT) return false; - state = STATE_DIGITS_AFTER_DEC_POINT; - break; - } - else if ((thSep == ',') && (state == STATE_DIGITS_BEFORE_DEC_POINT)) - break; - else - return false; - - case ' ': // space (SPC) - if ((thSep == ' ') && (state == STATE_DIGITS_BEFORE_DEC_POINT)) break; - case '\t': // horizontal tab (TAB) - case '\n': // line feed (LF) - case '\v': // vertical tab (VT) - case '\f': // form feed (FF) - case '\r': // carriage return (CR) - if ((state >= STATE_DIGITS_AFTER_DEC_POINT) || (state >= STATE_EXP_DIGITS)) - break; - else if ((state > STATE_LEADING_SPACES) && (state < STATE_DIGITS_AFTER_DEC_POINT)) - return false; - break; - - case '-': - if (state == STATE_LEADING_SPACES) - numSign = -1; - else if (state == STATE_EXP_CHAR) // exponential char - expSign = -1; - else return false; - case '+': - break; - - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (state >= STATE_SUFFIX) return false; // constant suffix - if (state <= STATE_DIGITS_BEFORE_DEC_POINT) // integral part digits - { - result = result * 10 + (*pStr - '0'); - state = STATE_DIGITS_BEFORE_DEC_POINT; - } - else if (state <= STATE_DIGITS_AFTER_DEC_POINT) // fractional part digits - { - mantissa += F(*pStr - '0') / (pow10 *= 10.); - state = STATE_DIGITS_AFTER_DEC_POINT; - } - else if (state <= STATE_EXP_DIGITS) // exponent digits - { - exponent = exponent * 10. + (*pStr - '0'); - state = STATE_EXP_DIGITS; - } - else return false; - break; - - case 'E': - case 'e': - if (state > STATE_DIGITS_AFTER_DEC_POINT) return false; - state = STATE_EXP_CHAR; - break; - - case 'F': - case 'f': - state = STATE_SUFFIX; - break; - - default: - return false; - } - } - - if (exponent > std::numeric_limits::max_exponent10) - { - eu = expSign; - exponent = std::numeric_limits::max_exponent10; - } - - result += mantissa; - if (numSign != 1) result *= numSign; - if (exponent > 1.0) - { - F scale = std::pow(10., exponent); - result = (expSign < 0) ? (result / scale) : (result * scale); - } - - return (state != STATE_LEADING_SPACES) && // empty/zero-length string - !FPEnvironment::isInfinite(result) && - !FPEnvironment::isNaN(result); -#endif // POCO_STR_TO_FLOAT_FAST -} - - -template -bool strToFloat (const std::string& s, F& result, char& eu = Impl::DUMMY_EXP_UNDERFLOW, char decSep = '.', char thSep = ',') - /// Converts string to floating-point number; - /// This is a wrapper function, for details see see the - /// bool strToFloat(const char*, F&, char&, char, char) implementation. -{ - return strToFloat(s.c_str(), result, eu, decSep, thSep); -} // @@ -636,12 +467,10 @@ bool uIntToStr (T number, unsigned short base, std::string& result, bool prefix // -// Functions using double-conversion library (http://code.google.com/p/double-conversion/). -// Library is the implementation of the Grisu algorithm as described in Florian Loitsch's paper: -// http://florian.loitsch.com/publications/dtoa-pldi2010.pdf +// Wrappers for double-conversion library (http://code.google.com/p/double-conversion/). // -// For a complete (and simpler) story on floating-point numbers rendering accuracy and performance, see: -// http://www.serpentine.com/blog/2011/06/29/here-be-dragons-advances-in-problems-you-didnt-even-know-you-had/ +// Library is the implementation of the algorithm described in Florian Loitsch's paper: +// http://florian.loitsch.com/publications/dtoa-pldi2010.pdf // Foundation_API void floatToStr(char* buffer, @@ -688,12 +517,31 @@ Foundation_API std::string& doubleToStr(std::string& str, /// precision (total number of digits after the decimal point) and width (total length of formatted string). -Foundation_API float strToFloatDC(const char* str); - /// For testing and performance comparison purposes only. +Foundation_API float strToFloat(const char* str); + /// Converts the string of characters into single-precision floating point number. + /// Function uses double_convesrion::DoubleToStringConverter to do the conversion. -Foundation_API double strToDoubleDC(const char* str); - /// For testing and performance comparison purposes only. +Foundation_API bool strToFloat(const std::string&, float& result, char decSep = '.', char thSep = ','); + /// Converts the string of characters into single-precision floating point number. + /// The conversion result is assigned to the result parameter. + /// If decimal separator and/or thousand separator are different from defaults, they should be + /// supplied to ensure proper conversion. + /// + /// Returns true if succesful, false otherwise. + + +Foundation_API double strToDouble(const char* str); + /// Converts the string of characters into double-precision floating point number. + + +Foundation_API bool strToDouble(const std::string& str, double& result, char decSep = '.', char thSep = ','); + /// Converts the string of characters into double-precision floating point number. + /// The conversion result is assigned to the result parameter. + /// If decimal separator and/or thousand separator are different from defaults, they should be + /// supplied to ensure proper conversion. + /// + /// Returns true if succesful, false otherwise. // // end double-conversion functions declarations diff --git a/Foundation/include/Poco/String.h b/Foundation/include/Poco/String.h index f8e2b41ff..228dc946e 100644 --- a/Foundation/include/Poco/String.h +++ b/Foundation/include/Poco/String.h @@ -482,7 +482,7 @@ S& replaceInPlace(S& str, const typename S::value_type* from, const typename S:: template -S& replaceInPlace(S& str, const typename S::value_type from, const typename S::value_type to, typename S::size_type start = 0) +S& replaceInPlace(S& str, const typename S::value_type from, const typename S::value_type to = 0, typename S::size_type start = 0) { if (from == to) return str; @@ -490,13 +490,24 @@ S& replaceInPlace(S& str, const typename S::value_type from, const typename S::v do { pos = str.find(from, start); - if (pos != S::npos) str[pos] = to; + if (pos != S::npos) + { + if (to) str[pos] = to; + else str.erase(pos, 1); + } } while (pos != S::npos); return str; } +template +S& removeInPlace(S& str, const typename S::value_type ch, typename S::size_type start = 0) +{ + return replaceInPlace(str, ch, 0, start); +} + + template S replace(const S& str, const S& from, const S& to, typename S::size_type start = 0) /// Replace all occurences of from (which must not be the empty string) @@ -517,14 +528,36 @@ S replace(const S& str, const typename S::value_type* from, const typename S::va } +template +S replace(const S& str, const typename S::value_type from, const typename S::value_type to = 0, typename S::size_type start = 0) +{ + S result(str); + replaceInPlace(result, from, to, start); + return result; +} + + +template +S remove(const S& str, const typename S::value_type ch, typename S::size_type start = 0) +{ + S result(str); + replaceInPlace(result, ch, 0, start); + return result; +} + + #else -std::string Foundation_API replace(const std::string& str, const std::string& from, const std::string& to, std::string::size_type start = 0); -std::string Foundation_API replace(const std::string& str, const std::string::value_type* from, const std::string::value_type* to, std::string::size_type start = 0); -std::string& Foundation_API replaceInPlace(std::string& str, const std::string& from, const std::string& to, std::string::size_type start = 0); -std::string& Foundation_API replaceInPlace(std::string& str, const std::string::value_type* from, const std::string::value_type* to, std::string::size_type start = 0); - +Foundation_API std::string replace(const std::string& str, const std::string& from, const std::string& to, std::string::size_type start = 0); +Foundation_API std::string replace(const std::string& str, const std::string::value_type* from, const std::string::value_type* to, std::string::size_type start = 0); +Foundation_API std::string replace(const std::string& str, const std::string::value_type from, const std::string::value_type to = 0, std::string::size_type start = 0); +Foundation_API std::string remove(const std::string& str, const std::string::value_type ch, std::string::size_type start = 0); +Foundation_API std::string& replaceInPlace(std::string& str, const std::string& from, const std::string& to, std::string::size_type start = 0); +Foundation_API std::string& replaceInPlace(std::string& str, const std::string::value_type* from, const std::string::value_type* to, std::string::size_type start = 0); +Foundation_API std::string& replaceInPlace(std::string& str, const std::string::value_type from, const std::string::value_type to = 0, std::string::size_type start = 0); +Foundation_API std::string& removeInPlace(std::string& str, const std::string::value_type ch, std::string::size_type start = 0); + #endif diff --git a/Foundation/src/FileChannel.cpp b/Foundation/src/FileChannel.cpp index b5a37c347..ba28b3ddd 100644 --- a/Foundation/src/FileChannel.cpp +++ b/Foundation/src/FileChannel.cpp @@ -327,12 +327,23 @@ void FileChannel::setCompress(const std::string& compress) void FileChannel::setPurgeAge(const std::string& age) { + delete _pPurgeStrategy; + _pPurgeStrategy = 0; + _purgeAge = "none"; + + if (age.empty() || 0 == icompare(age, "none")) + return; + std::string::const_iterator it = age.begin(); std::string::const_iterator end = age.end(); int n = 0; while (it != end && Ascii::isSpace(*it)) ++it; while (it != end && Ascii::isDigit(*it)) { n *= 10; n += *it++ - '0'; } + if (0 == n) + throw InvalidArgumentException("Zero is not valid purge age."); + while (it != end && Ascii::isSpace(*it)) ++it; + std::string unit; while (it != end && Ascii::isAlpha(*it)) unit += *it++; @@ -349,8 +360,7 @@ void FileChannel::setPurgeAge(const std::string& age) factor = 30*Timespan::DAYS; else if (unit != "seconds") throw InvalidArgumentException("purgeAge", age); - - delete _pPurgeStrategy; + _pPurgeStrategy = new PurgeByAgeStrategy(Timespan(factor*n)); _purgeAge = age; } @@ -358,11 +368,20 @@ void FileChannel::setPurgeAge(const std::string& age) void FileChannel::setPurgeCount(const std::string& count) { + delete _pPurgeStrategy; + _pPurgeStrategy = 0; + _purgeAge = "none"; + + if (count.empty() || 0 == icompare(count, "none")) + return; + std::string::const_iterator it = count.begin(); std::string::const_iterator end = count.end(); int n = 0; while (it != end && Ascii::isSpace(*it)) ++it; while (it != end && Ascii::isDigit(*it)) { n *= 10; n += *it++ - '0'; } + if (0 == n) + throw InvalidArgumentException("Zero is not valid purge count."); while (it != end && Ascii::isSpace(*it)) ++it; delete _pPurgeStrategy; diff --git a/Foundation/src/NumberParser.cpp b/Foundation/src/NumberParser.cpp index c2c713bfd..386f0f965 100644 --- a/Foundation/src/NumberParser.cpp +++ b/Foundation/src/NumberParser.cpp @@ -206,8 +206,7 @@ double NumberParser::parseFloat(const std::string& s, char decSep, char thSep) bool NumberParser::tryParseFloat(const std::string& s, double& value, char decSep, char thSep) { - char eu; - return strToFloat(s.c_str(), value, eu, decSep, thSep); + return strToDouble(s.c_str(), value, decSep, thSep); } diff --git a/Foundation/src/NumericString.cpp b/Foundation/src/NumericString.cpp index f11398ccb..ca72260f8 100644 --- a/Foundation/src/NumericString.cpp +++ b/Foundation/src/NumericString.cpp @@ -33,21 +33,22 @@ // DEALINGS IN THE SOFTWARE. // - +// +++ double conversion +++ +#include "diy-fp.cc" +#include "cached-powers.cc" #include "bignum-dtoa.cc" #include "bignum.cc" -#include "cached-powers.cc" -#include "diy-fp.cc" -#include "double-conversion.cc" #include "fast-dtoa.cc" #include "fixed-dtoa.cc" #include "strtod.cc" - +#include "double-conversion.cc" +// --- double conversion --- #include "Poco/NumericString.h" #include "Poco/String.h" #include + namespace { @@ -78,7 +79,7 @@ void insertThousandSep(std::string& str, char thSep, char decSep = '.') while (it != begin) { --it; - if (*it == 'e') break; + if ((*it == 'e') || (*it == 'E')) break; } } if (decPos != std::string::npos) @@ -115,7 +116,7 @@ void floatToStr(char* buffer, int bufferSize, float value, int lowDec, int highD StringBuilder builder(buffer, bufferSize); int flags = DoubleToStringConverter::UNIQUE_ZERO | DoubleToStringConverter::EMIT_POSITIVE_EXPONENT_SIGN; - DoubleToStringConverter dc(flags, "inf", "nan", 'e', lowDec, highDec, 0, 0); + DoubleToStringConverter dc(flags, POCO_FLT_INF, POCO_FLT_NAN, POCO_FLT_EXP, lowDec, highDec, 0, 0); dc.ToShortestSingle(value, &builder); builder.Finalize(); } @@ -143,7 +144,7 @@ void doubleToStr(char* buffer, int bufferSize, double value, int lowDec, int hig StringBuilder builder(buffer, bufferSize); int flags = DoubleToStringConverter::UNIQUE_ZERO | DoubleToStringConverter::EMIT_POSITIVE_EXPONENT_SIGN; - DoubleToStringConverter dc(flags, "inf", "nan", 'e', lowDec, highDec, 0, 0); + DoubleToStringConverter dc(flags, POCO_FLT_INF, POCO_FLT_NAN, POCO_FLT_EXP, lowDec, highDec, 0, 0); dc.ToShortest(value, &builder); builder.Finalize(); } @@ -166,32 +167,59 @@ std::string& doubleToStr(std::string& str, double value, int precision, int widt } -float strToFloatDC(const char* str) +float strToFloat(const char* str) { using namespace double_conversion; - double empty_string_value = 0.0; int processed; int flags = StringToDoubleConverter::ALLOW_LEADING_SPACES | StringToDoubleConverter::ALLOW_TRAILING_SPACES; - StringToDoubleConverter converter(flags, empty_string_value, Single::NaN(), 0, 0); + StringToDoubleConverter converter(flags, 0.0, Single::NaN(), POCO_FLT_INF, POCO_FLT_NAN); float result = converter.StringToFloat(str, strlen(str), &processed); return result; } -double strToDoubleDC(const char* str) +double strToDouble(const char* str) { using namespace double_conversion; - - double empty_string_value = 0.0; int processed; int flags = StringToDoubleConverter::ALLOW_LEADING_SPACES | StringToDoubleConverter::ALLOW_TRAILING_SPACES; - StringToDoubleConverter converter(flags, empty_string_value, Double::NaN(), 0, 0); + StringToDoubleConverter converter(flags, 0.0, Double::NaN(), POCO_FLT_INF, POCO_FLT_NAN); double result = converter.StringToDouble(str, strlen(str), &processed); return result; } +bool strToFloat(const std::string& str, float& result, char decSep, char thSep) +{ + using namespace double_conversion; + + std::string tmp(str); + removeInPlace(tmp, thSep); + removeInPlace(tmp, 'f'); + replaceInPlace(tmp, decSep, '.'); + result = strToFloat(tmp.c_str()); + return !FPEnvironment::isInfinite(result) && + !FPEnvironment::isNaN(result); +} + + +bool strToDouble(const std::string& str, double& result, char decSep, char thSep) +{ + if (str.empty()) return false; + + using namespace double_conversion; + + std::string tmp(str); + removeInPlace(tmp, thSep); + replaceInPlace(tmp, decSep, '.'); + removeInPlace(tmp, 'f'); + result = strToDouble(tmp.c_str()); + return !FPEnvironment::isInfinite(result) && + !FPEnvironment::isNaN(result); +} + + } // namespace Poco diff --git a/Foundation/src/String.cpp b/Foundation/src/String.cpp index 2f30b4ed1..f46b08fc0 100644 --- a/Foundation/src/String.cpp +++ b/Foundation/src/String.cpp @@ -165,6 +165,22 @@ std::string replace(const std::string& str, const std::string::value_type* from, return result; } + +std::string replace(const std::string& str, const std::string::value_type from, const std::string::value_type to, std::string::size_type start) +{ + std::string result(str); + replaceInPlace(result, from, to, start); + return result; +} + + +std::string remove(const std::string& str, const std::string::value_type ch, std::string::size_type start) +{ + std::string result(str); + replaceInPlace(result, ch, 0, start); + return result; +} + std::string& replaceInPlace(std::string& str, const std::string& from, const std::string& to, std::string::size_type start) { @@ -215,6 +231,31 @@ std::string& replaceInPlace(std::string& str, const std::string::value_type* fro } +std::string& replaceInPlace(std::string& str, const std::string::value_type from, const std::string::value_type to, std::string::size_type start) +{ + if (from == to) return str; + + std::string::size_type pos = 0; + do + { + pos = str.find(from, start); + if (pos != std::string::npos) + { + if (to) str[pos] = to; + else str.erase(pos, 1); + } + } while (pos != std::string::npos); + + return str; +} + + +std::string& removeInPlace(std::string& str, const std::string::value_type ch, std::string::size_type start) +{ + return replaceInPlace(str, ch, 0, start); +} + + #endif diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index 41b27bc07..3257b3e40 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -58,12 +58,14 @@ using Poco::translate; using Poco::translateInPlace; using Poco::replace; using Poco::replaceInPlace; +using Poco::remove; +using Poco::removeInPlace; using Poco::cat; using Poco::strToInt; using Poco::strToFloat; +using Poco::strToDouble; using Poco::intToStr; using Poco::uIntToStr; -using Poco::strToDoubleDC; using Poco::floatToStr; using Poco::doubleToStr; using Poco::thousandSeparator; @@ -329,6 +331,10 @@ void StringTest::testReplace() assert (replace(s, "aa", "xxx") == "xxxbbxxxbb"); assert (replace(s, "aa", "xx", 2) == "aabbxxbb"); + assert (replace(s, 'a', 'x', 2) == "aabbxxbb"); + assert (remove(s, 'a', 2) == "aabbbb"); + assert (remove(s, 'a') == "bbbb"); + assert (remove(s, 'b', 2) == "aaaa"); } @@ -336,7 +342,18 @@ void StringTest::testReplaceInPlace() { std::string s("aabbccdd"); - assert (replaceInPlace(s, std::string("aa"), std::string("xx")) == "xxbbccdd"); + replaceInPlace(s, std::string("aa"), std::string("xx")); + assert (s == "xxbbccdd"); + + s = "aabbccdd"; + replaceInPlace(s, 'a', 'x'); + assert (s == "xxbbccdd"); + replaceInPlace(s, 'x'); + assert (s == "bbccdd"); + removeInPlace(s, 'b', 1); + assert (s == "bccdd"); + removeInPlace(s, 'd'); + assert (s == "bcc"); } @@ -387,10 +404,7 @@ void StringTest::testStringToInt() void StringTest::testStringToFloat() { -#ifndef POCO_NO_FPENVIRONMENT - - double result; - char eu; + float result; std::string sep(".,"); for (int i = 0; i < 2; ++i) @@ -401,58 +415,148 @@ void StringTest::testStringToFloat() char ts = sep[j]; if (ts == ds) continue; - assert(strToFloat("1", result, eu, ds, ts)); + assert(strToFloat("1", result, ds, ts)); assertEqualDelta(1.0, result, 0.01); - assert(strToFloat(format("%c1", ds), result, eu, ds, ts)); + assert(strToFloat(format("%c1", ds), result, ds, ts)); assertEqualDelta(.1, result, 0.01); - assert(strToFloat(format("1%c", ds), result, eu, ds, ts)); + assert(strToFloat(format("1%c", ds), result, ds, ts)); assertEqualDelta(1., result, 0.01); - assert(strToFloat("0", result, eu, ds, ts)); + assert(strToFloat("0", result, ds, ts)); assertEqualDelta(0.0, result, 0.01); - assert(strToFloat(format("0%c", ds), result, eu, ds, ts)); + assert(strToFloat(format("0%c", ds), result, ds, ts)); assertEqualDelta(0.0, result, 0.01); - assert(strToFloat(format("%c0", ds), result, eu, ds, ts)); + assert(strToFloat(format("%c0", ds), result, ds, ts)); assertEqualDelta(0.0, result, 0.01); - assert(strToFloat(format("0%c0", ds), result, eu, ds, ts)); + assert(strToFloat(format("0%c0", ds), result, ds, ts)); assertEqualDelta(0.0, result, 0.01); - assert(strToFloat(format("0%c0", ds), result, eu, ds, ts)); + assert(strToFloat(format("0%c0", ds), result, ds, ts)); assertEqualDelta(0., result, 0.01); - assert(strToFloat(format("0%c0", ds), result, eu, ds, ts)); + assert(strToFloat(format("0%c0", ds), result, ds, ts)); assertEqualDelta(.0, result, 0.01); - assert(strToFloat(format("12%c34", ds), result, eu, ds, ts)); + assert(strToFloat(format("12%c34", ds), result, ds, ts)); assertEqualDelta(12.34, result, 0.01); - assert(strToFloat(format("12%c34f", ds), result, eu, ds, ts)); + assert(strToFloat(format("12%c34", ds), result, ds, ts)); assertEqualDelta(12.34, result, 0.01); - assert(strToFloat(format("12%c34", ds), result, eu, ds, ts)); - assertEqualDelta(12.34, result, 0.01); - assert(strToFloat(format("-12%c34", ds), result, eu, ds, ts)); + assert(strToFloat(format("-12%c34", ds), result, ds, ts)); assertEqualDelta(-12.34, result, 0.01); - assert(strToFloat(format("%c34", ds), result, eu, ds, ts)); + assert(strToFloat(format("%c34", ds), result, ds, ts)); assertEqualDelta(.34, result, 0.01); - assert(strToFloat(format("-%c34", ds), result, eu, ds, ts)); + assert(strToFloat(format("-%c34", ds), result, ds, ts)); assertEqualDelta(-.34, result, 0.01); - assert(strToFloat(format("12%c", ds), result, eu, ds, ts)); + assert(strToFloat(format("12%c", ds), result, ds, ts)); assertEqualDelta(12., result, 0.01); - assert(strToFloat(format("-12%c", ds), result, eu, ds, ts)); + assert(strToFloat(format("-12%c", ds), result, ds, ts)); assertEqualDelta(-12., result, 0.01); - assert(strToFloat("12", result, eu, ds, ts)); + assert(strToFloat("12", result, ds, ts)); assertEqualDelta(12, result, 0.01); - assert(strToFloat("-12", result, eu, ds, ts)); + assert(strToFloat("-12", result, ds, ts)); assertEqualDelta(-12, result, 0.01); - assert(strToFloat(format("12%c3456789012345678901234567890", ds), result, eu, ds, ts)); + assert(strToFloat(format("12%c34", ds), result, ds, ts)); assertEqualDelta(12.34, result, 0.01); - assert(strToFloat(format("1%c234%c3456789012345678901234567890", ts, ds), result, eu, ds, ts)); + assert(strToFloat(format("1%c234%c34", ts, ds), result, ds, ts)); + assertEqualDelta(1234.34, result, 0.01); + assert(strToFloat(format("12%c345%c34", ts, ds), result, ds, ts)); + assertEqualDelta(12345.34, result, 0.01); + assert(strToFloat(format("123%c456%c34", ts, ds), result, ds, ts)); + assertEqualDelta(123456.34, result, 0.01); + assert(strToFloat(format("1%c234%c567%c34", ts, ts, ds), result, ds, ts)); + + if ((std::numeric_limits::max() / 10) < 1.23456e10) + fail ("test value larger than max value for this platform"); + else + { + float d = 12e34f; + assert(strToFloat(format("12e34", ds), result, ds, ts)); + assertEqualDelta(d, result, 0.01e34); + + d = 1.234e30f; + assert(strToFloat(format("1%c234e30", ds), result, ds, ts)); + assertEqualDelta(d, result, 0.01); + assert(strToFloat(format("1%c234E+30", ds), result, ds, ts)); + assertEqualDelta(d, result, 0.01); + } + + float d = 12.34e-10f; + assert(strToFloat(format("12%c34e-10", ds), result, ds, ts)); + assertEqualDelta(d, result, 0.01); + assert(strToFloat(format("-12%c34", ds), result, ds, ts)); + assertEqualDelta(-12.34, result, 0.01); + + assert(strToFloat(format(" 12%c34", ds), result, ds, ts)); + assertEqualDelta(12.34, result, 0.01); + assert(strToFloat(format("12%c34 ", ds), result, ds, ts)); + assertEqualDelta(12.34, result, 0.01); + assert(strToFloat(format(" 12%c34 ", ds), result, ds, ts)); + assertEqualDelta(12.34, result, 0.01); + } + } +} + + +void StringTest::testStringToDouble() +{ + double result; + std::string sep(".,"); + + for (int i = 0; i < 2; ++i) + { + char ds = sep[i]; + for (int j = 0; j < 2; ++j) + { + char ts = sep[j]; + if (ts == ds) continue; + + assert(strToDouble("1", result, ds, ts)); + assertEqualDelta(1.0, result, 0.01); + assert(strToDouble(format("%c1", ds), result, ds, ts)); + assertEqualDelta(.1, result, 0.01); + assert(strToDouble(format("1%c", ds), result, ds, ts)); + assertEqualDelta(1., result, 0.01); + assert(strToDouble("0", result, ds, ts)); + assertEqualDelta(0.0, result, 0.01); + assert(strToDouble(format("0%c", ds), result, ds, ts)); + assertEqualDelta(0.0, result, 0.01); + assert(strToDouble(format("%c0", ds), result, ds, ts)); + assertEqualDelta(0.0, result, 0.01); + assert(strToDouble(format("0%c0", ds), result, ds, ts)); + assertEqualDelta(0.0, result, 0.01); + assert(strToDouble(format("0%c0", ds), result, ds, ts)); + assertEqualDelta(0., result, 0.01); + assert(strToDouble(format("0%c0", ds), result, ds, ts)); + assertEqualDelta(.0, result, 0.01); + assert(strToDouble(format("12%c34", ds), result, ds, ts)); + assertEqualDelta(12.34, result, 0.01); + assert(strToDouble(format("12%c34", ds), result, ds, ts)); + assertEqualDelta(12.34, result, 0.01); + assert(strToDouble(format("-12%c34", ds), result, ds, ts)); + assertEqualDelta(-12.34, result, 0.01); + assert(strToDouble(format("%c34", ds), result, ds, ts)); + assertEqualDelta(.34, result, 0.01); + assert(strToDouble(format("-%c34", ds), result, ds, ts)); + assertEqualDelta(-.34, result, 0.01); + assert(strToDouble(format("12%c", ds), result, ds, ts)); + assertEqualDelta(12., result, 0.01); + assert(strToDouble(format("-12%c", ds), result, ds, ts)); + assertEqualDelta(-12., result, 0.01); + assert(strToDouble("12", result, ds, ts)); + assertEqualDelta(12, result, 0.01); + assert(strToDouble("-12", result, ds, ts)); + assertEqualDelta(-12, result, 0.01); + assert(strToDouble(format("12%c3456789012345678901234567890", ds), result, ds, ts)); + assertEqualDelta(12.34, result, 0.01); + + assert(strToDouble(format("1%c234%c3456789012345678901234567890", ts, ds), result, ds, ts)); assertEqualDelta(1234.3456789, result, 0.00000001); - assert(strToFloat(format("12%c345%c3456789012345678901234567890", ts, ds), result, eu, ds, ts)); + assert(strToDouble(format("12%c345%c3456789012345678901234567890", ts, ds), result, ds, ts)); assertEqualDelta(12345.3456789, result, 0.00000001); - assert(strToFloat(format("123%c456%c3456789012345678901234567890", ts, ds), result, eu, ds, ts)); + assert(strToDouble(format("123%c456%c3456789012345678901234567890", ts, ds), result, ds, ts)); assertEqualDelta(123456.3456789, result, 0.00000001); - assert(strToFloat(format("1%c234%c567%c3456789012345678901234567890", ts, ts, ds), result, eu, ds, ts)); + assert(strToDouble(format("1%c234%c567%c3456789012345678901234567890", ts, ts, ds), result, ds, ts)); assertEqualDelta(1234567.3456789, result, 0.00000001); - assert(strToFloat(format("12%c345%c678%c3456789012345678901234567890", ts, ts, ds), result, eu, ds, ts)); + assert(strToDouble(format("12%c345%c678%c3456789012345678901234567890", ts, ts, ds), result, ds, ts)); assertEqualDelta(12345678.3456789, result, 0.00000001); - assert(strToFloat(format("123%c456%c789%c3456789012345678901234567890", ts, ts, ds), result, eu, ds, ts)); + assert(strToDouble(format("123%c456%c789%c3456789012345678901234567890", ts, ts, ds), result, ds, ts)); assertEqualDelta(123456789.3456789, result, 0.00000001); if ((std::numeric_limits::max() / 10) < 1.23456e10) @@ -460,96 +564,89 @@ void StringTest::testStringToFloat() else { double d = 12e34; - assert(strToFloat(format("12e34", ds), result, eu, ds, ts)); + assert(strToDouble(format("12e34", ds), result, ds, ts)); assertEqualDelta(d, result, 0.01e34); d = 1.234e100; - assert(strToFloat(format("1%c234e100", ds), result, eu, ds, ts)); + assert(strToDouble(format("1%c234e100", ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); - assert(strToFloat(format("1%c234E+100", ds), result, eu, ds, ts)); + assert(strToDouble(format("1%c234E+100", ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); d = 1.234e-100; - assert(strToFloat(format("1%c234E-100", ds), result, eu, ds, ts)); + assert(strToDouble(format("1%c234E-100", ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); d = -1.234e100; - assert(strToFloat(format("-1%c234e+100", ds), result, eu, ds, ts)); + assert(strToDouble(format("-1%c234e+100", ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); - assert(strToFloat(format("-1%c234E100", ds), result, eu, ds, ts)); + assert(strToDouble(format("-1%c234E100", ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); d = 1.234e-100; - assert(strToFloat(format(" 1%c234e-100 ", ds), result, eu, ds, ts)); + assert(strToDouble(format(" 1%c234e-100 ", ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); - assert(strToFloat(format(" 1%c234e-100 ", ds), result, eu, ds, ts)); + assert(strToDouble(format(" 1%c234e-100 ", ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); - assert(strToFloat(format(" 1%c234e-100 ", ds), result, eu, ds, ts)); + assert(strToDouble(format(" 1%c234e-100 ", ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); d = 1234.234e-100; - assert(strToFloat(format(" 1%c234%c234e-100 ", ts, ds), result, eu, ds, ts)); + assert(strToDouble(format(" 1%c234%c234e-100 ", ts, ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); d = 12345.234e-100; - assert(strToFloat(format(" 12%c345%c234e-100 ", ts, ds), result, eu, ds, ts)); + assert(strToDouble(format(" 12%c345%c234e-100 ", ts, ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); d = 123456.234e-100; - assert(strToFloat(format(" 123%c456%c234e-100 ", ts, ds), result, eu, ds, ts)); + assert(strToDouble(format(" 123%c456%c234e-100 ", ts, ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); d = -1234.234e-100; - assert(strToFloat(format(" -1%c234%c234e-100 ", ts, ds), result, eu, ds, ts)); + assert(strToDouble(format(" -1%c234%c234e-100 ", ts, ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); d = -12345.234e-100; - assert(strToFloat(format(" -12%c345%c234e-100 ", ts, ds), result, eu, ds, ts)); + assert(strToDouble(format(" -12%c345%c234e-100 ", ts, ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); d = -123456.234e-100; char ou = 0; - assert(strToFloat(format(" -123%c456%c234e-100 ", ts, ds), result, eu, ds, ts)); + assert(strToDouble(format(" -123%c456%c234e-100 ", ts, ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); assert (ou == 0); } double d = 12.34e-10; - assert(strToFloat(format("12%c34e-10", ds), result, eu, ds, ts)); + assert(strToDouble(format("12%c34e-10", ds), result, ds, ts)); assertEqualDelta(d, result, 0.01); - assert(strToFloat(format("-12%c34", ds), result, eu, ds, ts)); + assert(strToDouble(format("-12%c34", ds), result, ds, ts)); assertEqualDelta(-12.34, result, 0.01); - assert(strToFloat(format(" 12%c34", ds), result, eu, ds, ts)); + assert(strToDouble(format(" 12%c34", ds), result, ds, ts)); assertEqualDelta(12.34, result, 0.01); - assert(strToFloat(format("12%c34 ", ds), result, eu, ds, ts)); + assert(strToDouble(format("12%c34 ", ds), result, ds, ts)); assertEqualDelta(12.34, result, 0.01); - assert(strToFloat(format(" 12%c34 ", ds), result, eu, ds, ts)); + assert(strToDouble(format(" 12%c34 ", ds), result, ds, ts)); assertEqualDelta(12.34, result, 0.01); } } -#endif // POCO_NO_FPENVIRONMENT } void StringTest::testStringToFloatError() { -#if !defined(POCO_NO_FPENVIRONMENT) && !defined(POCO_NO_LOCALE) const char ds = decimalSeparator(); const char ts = thousandSeparator(); double result = 0.0; - char ou; - assert (!strToFloat(format("a12%c3", ds), result, ou)); - assert (!strToFloat(format("1b2%c3", ds), result, ou)); - assert (!strToFloat(format("12c%c3", ds), result, ou)); - assert (!strToFloat(format("12%cx3", ds), result, ou)); + assert (!strToDouble(format("a12%c3", ds), result)); + assert (!strToDouble(format("1b2%c3", ds), result)); + assert (!strToDouble(format("12c%c3", ds), result)); + assert (!strToDouble(format("12%cx3", ds), result)); double d = -123456.234e-100; - assert(strToFloat(format("123%c456%c234e-1000000", ts, ds), result, ou)); - assert (ou < 0); // loss of precision - assertEqualDelta(d, result, 0.01); // value still good - assert(!strToFloat(format("123%c456%c234e1000000", ts, ds), result, ou)); - assert(!strToFloat(format("123%c456%c234e+1000000", ts, ds), result, ou)); - assert(!strToFloat(0, result, ou)); // strToFloat is resilient to null pointers - assert(!strToFloat("", result, ou)); -#endif + assert(!strToDouble(format("123%c456%c234e1000000", ts, ds), result)); + assert(!strToDouble(format("123%c456%c234e+1000000", ts, ds), result)); + //assert(!strToDouble(0, result, ou)); // strToDouble is resilient to null pointers + assert(!strToDouble("", result)); } @@ -685,10 +782,10 @@ void StringTest::benchmarkStrToFloat() // POCO Way sw.restart(); char ou = 0; - for (int i = 0; i < 1000000; ++i) strToFloat(num.c_str(), res, ou); + for (int i = 0; i < 1000000; ++i) strToDouble(num, res, ou); sw.stop(); - std::cout << "strToFloat Number: " << res << std::endl; - double timeStrToFloat = sw.elapsed() / 1000.0; + std::cout << "strToDouble Number: " << res << std::endl; + double timeStrToDouble = sw.elapsed() / 1000.0; // standard sscanf sw.restart(); @@ -699,7 +796,7 @@ void StringTest::benchmarkStrToFloat() // double-conversion Strtod sw.restart(); - for (int i = 0; i < 1000000; ++i) strToDoubleDC(num.c_str()); + for (int i = 0; i < 1000000; ++i) strToDouble(num.c_str()); sw.stop(); std::cout << "Strtod Number: " << res << std::endl; double timeStrtod = sw.elapsed() / 1000.0; @@ -712,9 +809,9 @@ void StringTest::benchmarkStrToFloat() std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeStdStrtod) << '\t' ; graph = (int) (timeStream / timeStdStrtod); for (int i = 0; i < graph; ++i) std::cout << '#'; - std::cout << std::endl << std::setw(14) << "strToFloat:\t" << std::setw(10) << std::setfill(' ') << timeStrToFloat << "[ms]" << - std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeStrToFloat) << '\t' ; - graph = (int) (timeStream / timeStrToFloat); for (int i = 0; i < graph; ++i) std::cout << '#'; + std::cout << std::endl << std::setw(14) << "strToDouble:\t" << std::setw(10) << std::setfill(' ') << timeStrToDouble << "[ms]" << + std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeStrToDouble) << '\t' ; + graph = (int) (timeStream / timeStrToDouble); for (int i = 0; i < graph; ++i) std::cout << '#'; std::cout << std::endl << std::setw(14) << "std::sscanf:\t" << std::setw(10) << std::setfill(' ') << timeScanf << "[ms]" << std::setw(10) << std::setfill(' ') << "Speedup: " << (timeStream / timeScanf) << '\t' ; @@ -955,13 +1052,14 @@ CppUnit::Test* StringTest::suite() CppUnit_addTest(pSuite, StringTest, testCat); CppUnit_addTest(pSuite, StringTest, testStringToInt); CppUnit_addTest(pSuite, StringTest, testStringToFloat); + CppUnit_addTest(pSuite, StringTest, testStringToDouble); CppUnit_addTest(pSuite, StringTest, testStringToFloatError); CppUnit_addTest(pSuite, StringTest, testNumericLocale); - CppUnit_addTest(pSuite, StringTest, benchmarkStrToFloat); + //CppUnit_addTest(pSuite, StringTest, benchmarkStrToFloat); //CppUnit_addTest(pSuite, StringTest, benchmarkStrToInt); CppUnit_addTest(pSuite, StringTest, testIntToString); CppUnit_addTest(pSuite, StringTest, testFloatToString); - CppUnit_addTest(pSuite, StringTest, benchmarkFloatToStr); + //CppUnit_addTest(pSuite, StringTest, benchmarkFloatToStr); return pSuite; } diff --git a/Foundation/testsuite/src/StringTest.h b/Foundation/testsuite/src/StringTest.h index d3cc7048c..54dadde89 100644 --- a/Foundation/testsuite/src/StringTest.h +++ b/Foundation/testsuite/src/StringTest.h @@ -65,6 +65,7 @@ public: void testStringToInt(); void testStringToFloat(); + void testStringToDouble(); void testStringToFloatError(); void testNumericLocale(); void benchmarkStrToFloat(); diff --git a/Net/src/SMTPChannel.cpp b/Net/src/SMTPChannel.cpp index 1a5b6266a..96df210df 100644 --- a/Net/src/SMTPChannel.cpp +++ b/Net/src/SMTPChannel.cpp @@ -138,11 +138,19 @@ void SMTPChannel::log(const Message& msg) Poco::FileInputStream fis(_attachment, std::ios::in | std::ios::binary | std::ios::ate); if (fis.good()) { - int size = fis.tellg(); - char* pMem = new char [size]; + typedef std::allocator::size_type SST; + + std::streamoff size = fis.tellg(); + poco_assert (std::numeric_limits::max() >= size); + poco_assert (std::numeric_limits::max() >= size); + char* pMem = new char [static_cast(size)]; fis.seekg(std::ios::beg); fis.read(pMem, size); - message.addAttachment(_attachment, new StringPartSource(std::string(pMem, size), _type, _attachment)); + message.addAttachment(_attachment, + new StringPartSource(std::string(pMem, static_cast(size)), + _type, + _attachment)); + delete [] pMem; } } From a54c34e7d0746bba6cf8b8a53ea7845d3cf5fee6 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 2 Dec 2012 20:53:27 -0600 Subject: [PATCH 058/165] SF patch 120 SF #120 The ExpireLRUCache does not compile with a tuple as key on Visual Studio 2010 https://sourceforge.net/p/poco/patches/120/ --- Foundation/include/Poco/ExpireStrategy.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Foundation/include/Poco/ExpireStrategy.h b/Foundation/include/Poco/ExpireStrategy.h index 121a4a459..4a5f3ef9b 100644 --- a/Foundation/include/Poco/ExpireStrategy.h +++ b/Foundation/include/Poco/ExpireStrategy.h @@ -82,8 +82,10 @@ public: void onAdd(const void*, const KeyValueArgs & args) { Timestamp now; - IndexIterator it = _keyIndex.insert(typename TimeIndex::value_type(now, args.key())); - std::pair stat = _keys.insert(typename Keys::value_type(args.key(), it)); + typename TimeIndex::value_type tiValue(now, args.key()); + IndexIterator it = _keyIndex.insert(tiValue); + typename Keys::value_type kValue(args.key(), it); + std::pair stat = _keys.insert(kValue); if (!stat.second) { _keyIndex.erase(stat.first->second); From cdd17f5203aa183c60474537f62bb329bad70c93 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 2 Dec 2012 21:26:34 -0600 Subject: [PATCH 059/165] SF Bug 599 SF Bug #599 JSON::Array and JSON::Object size() member can implicitly lose precision https://sourceforge.net/p/poco/patches/120/ --- JSON/include/Poco/JSON/Array.h | 16 ++++++++-------- JSON/include/Poco/JSON/Object.h | 4 ++-- JSON/src/Array.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/JSON/include/Poco/JSON/Array.h b/JSON/include/Poco/JSON/Array.h index d1836c52d..fb833b30f 100644 --- a/JSON/include/Poco/JSON/Array.h +++ b/JSON/include/Poco/JSON/Array.h @@ -57,7 +57,7 @@ class Object; class JSON_API Array { public: - typedef std::vector ValueVector; + typedef std::vector ValueVec; typedef SharedPtr Ptr; Array(); @@ -69,10 +69,10 @@ public: virtual ~Array(); /// Destructor - ValueVector::const_iterator begin() const; + ValueVec::const_iterator begin() const; /// Returns iterator - ValueVector::const_iterator end() const; + ValueVec::const_iterator end() const; /// Returns iterator Dynamic::Var get(unsigned int index) const; @@ -148,26 +148,26 @@ public: /// Removes the element on the given index. private: - ValueVector _values; + ValueVec _values; }; -inline Array::ValueVector::const_iterator Array::begin() const +inline Array::ValueVec::const_iterator Array::begin() const { return _values.begin(); } -inline Array::ValueVector::const_iterator Array::end() const +inline Array::ValueVec::const_iterator Array::end() const { return _values.end(); } -inline unsigned int Array::size() const +inline std::size_t Array::size() const { - return _values.size(); + return static_cast(_values.size()); } diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h index 37288e1cf..2de10f0c3 100644 --- a/JSON/include/Poco/JSON/Object.h +++ b/JSON/include/Poco/JSON/Object.h @@ -186,9 +186,9 @@ inline void Object::set(const std::string& key, const Dynamic::Var& value) } -inline unsigned int Object::size() const +inline std::size_t Object::size() const { - return _values.size(); + return static_cast(_values.size()); } diff --git a/JSON/src/Array.cpp b/JSON/src/Array.cpp index 434ab80e5..b58fbf8d8 100644 --- a/JSON/src/Array.cpp +++ b/JSON/src/Array.cpp @@ -115,7 +115,7 @@ void Array::stringify(std::ostream& out, unsigned int indent) const if ( indent > 0 ) out << std::endl; - for(ValueVector::const_iterator it = _values.begin(); it != _values.end();) + for(ValueVec::const_iterator it = _values.begin(); it != _values.end();) { for(int i = 0; i < indent; i++) { From 0c4d2590f75d93721adb7fab14be215adb6b230b Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 2 Dec 2012 21:43:16 -0600 Subject: [PATCH 060/165] SF Bug 603 SF Bug #603 count() is missing in HashMap https://sourceforge.net/p/poco/bugs/603/ --- Foundation/include/Poco/HashMap.h | 6 ++++++ Foundation/testsuite/src/HashMapTest.cpp | 1 + 2 files changed, 7 insertions(+) diff --git a/Foundation/include/Poco/HashMap.h b/Foundation/include/Poco/HashMap.h index 3684c211c..65cd15443 100644 --- a/Foundation/include/Poco/HashMap.h +++ b/Foundation/include/Poco/HashMap.h @@ -180,6 +180,12 @@ public: return _table.find(value); } + std::size_t count(const KeyType& key) const + { + ValueType value(key); + return _table.find(value) != _table.end() ? 1 : 0; + } + std::pair insert(const PairType& pair) { ValueType value(pair.first, pair.second); diff --git a/Foundation/testsuite/src/HashMapTest.cpp b/Foundation/testsuite/src/HashMapTest.cpp index 7927af935..0e3e94bad 100644 --- a/Foundation/testsuite/src/HashMapTest.cpp +++ b/Foundation/testsuite/src/HashMapTest.cpp @@ -70,6 +70,7 @@ void HashMapTest::testInsert() assert (it != hm.end()); assert (it->first == i); assert (it->second == i*2); + assert (hm.count(i) == 1); assert (hm.size() == i + 1); } From 42d963a7d5ac1805b454b976ec0301fcff7b32eb Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 2 Dec 2012 22:12:06 -0600 Subject: [PATCH 061/165] GH 23: JSON::Object::stringify throw BadCastException GH issue #23 : JSON::Object::stringify throw BadCastException --- JSON/src/Stringifier.cpp | 12 +++++++++++- JSON/testsuite/src/JSONTest.cpp | 17 +++++++++++++++++ JSON/testsuite/src/JSONTest.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/JSON/src/Stringifier.cpp b/JSON/src/Stringifier.cpp index e65cd2953..46842e4c8 100644 --- a/JSON/src/Stringifier.cpp +++ b/JSON/src/Stringifier.cpp @@ -49,7 +49,17 @@ namespace JSON { void Stringifier::stringify(const Var& any, std::ostream& out, unsigned int indent) { - if ( any.type() == typeid(Object::Ptr) ) + if ( any.type() == typeid(Object) ) + { + const Object& o = any.extract(); + o.stringify(out, indent == 0 ? 0 : indent + 2); + } + else if ( any.type() == typeid(Array) ) + { + const Array& a = any.extract(); + a.stringify(out, indent == 0 ? 0 : indent + 2); + } + else if ( any.type() == typeid(Object::Ptr) ) { const Object::Ptr& o = any.extract(); o->stringify(out, indent == 0 ? 0 : indent + 2); diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp index 6b6d9e998..5fe906b73 100644 --- a/JSON/testsuite/src/JSONTest.cpp +++ b/JSON/testsuite/src/JSONTest.cpp @@ -74,6 +74,22 @@ void JSONTest::tearDown() } +void JSONTest::testStringifier() +{ + Object obj; + + Array arr; + Object obj2; + + obj.set("array", arr); + obj.set("obj2", obj2); + + std::ostringstream ostr; + obj.stringify(ostr); + assert (ostr.str() == "{\"array\":[],\"obj2\":{}}"); +} + + void JSONTest::testNullProperty() { std::string json = "{ \"test\" : null }"; @@ -806,6 +822,7 @@ CppUnit::Test* JSONTest::suite() { CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("JSONTest"); + CppUnit_addTest(pSuite, JSONTest, testStringifier); CppUnit_addTest(pSuite, JSONTest, testNullProperty); CppUnit_addTest(pSuite, JSONTest, testTrueProperty); CppUnit_addTest(pSuite, JSONTest, testFalseProperty); diff --git a/JSON/testsuite/src/JSONTest.h b/JSON/testsuite/src/JSONTest.h index b651cbf65..858197ae2 100644 --- a/JSON/testsuite/src/JSONTest.h +++ b/JSON/testsuite/src/JSONTest.h @@ -46,6 +46,7 @@ public: JSONTest(const std::string& name); ~JSONTest(); + void testStringifier(); void testNullProperty(); void testTrueProperty(); void testFalseProperty(); From 49a0b4116ed4178ea9aa319046bb93dcae997093 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 2 Dec 2012 22:20:12 -0600 Subject: [PATCH 062/165] Document NetworkInterface::firstAddress() throw Documented NetworkInterface::firstAddress() throwing NotFoundException; see the pull request for details: https://github.com/pocoproject/poco/pull/16 --- Net/include/Poco/Net/NetworkInterface.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Net/include/Poco/Net/NetworkInterface.h b/Net/include/Poco/Net/NetworkInterface.h index 17b31b68e..afa8a43b5 100644 --- a/Net/include/Poco/Net/NetworkInterface.h +++ b/Net/include/Poco/Net/NetworkInterface.h @@ -152,6 +152,8 @@ public: const IPAddress& firstAddress(IPAddress::Family family) const; /// Returns the first IP address bound to the interface. + /// Throws NotFoundException if the address family is not + /// configured on the interface. const IPAddress& address(unsigned index = 0) const; /// Returns the IP address bound to the interface at index position. From 401415773f6e6b56bf147c88a3e21123058b0861 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 2 Dec 2012 22:37:02 -0600 Subject: [PATCH 063/165] Moved GCC ifdefs to Platform_POSIX Moved GCC ifdefs added for Android fron SocketDefs.h to Platform_POSIX.h --- Foundation/include/Poco/Platform.h | 14 ++------------ Foundation/include/Poco/Platform_POSIX.h | 24 ++++++++++++++++++++++++ Net/include/Poco/Net/SocketDefs.h | 10 ---------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h index ce36ad099..a9faf2e16 100644 --- a/Foundation/include/Poco/Platform.h +++ b/Foundation/include/Poco/Platform.h @@ -201,8 +201,8 @@ #define POCO_ARCH_BIG_ENDIAN 1 #endif #elif defined (nios2) || defined(__nios2) || defined(__nios2__) - #define POCO_ARCH POCO_ARCH_NIOS2 - #if defined(__nios2_little_endian) || defined(nios2_little_endian) || defined(__nios2_little_endian__) + #define POCO_ARCH POCO_ARCH_NIOS2 + #if defined(__nios2_little_endian) || defined(nios2_little_endian) || defined(__nios2_little_endian__) #define POCO_ARCH_LITTLE_ENDIAN 1 #else #define POCO_ARCH_BIG_ENDIAN 1 @@ -216,14 +216,4 @@ #endif -// -// Thread-safety of local static initialization -// -#if __cplusplus >= 201103L || __GNUC__ >= 4 || defined(__clang__) -#ifndef POCO_LOCAL_STATIC_INIT_IS_THREADSAFE -#define POCO_LOCAL_STATIC_INIT_IS_THREADSAFE 1 -#endif -#endif - - #endif // Foundation_Platform_INCLUDED diff --git a/Foundation/include/Poco/Platform_POSIX.h b/Foundation/include/Poco/Platform_POSIX.h index ff1e6c83a..4440fb562 100644 --- a/Foundation/include/Poco/Platform_POSIX.h +++ b/Foundation/include/Poco/Platform_POSIX.h @@ -54,4 +54,28 @@ #endif +// +// Thread-safety of local static initialization +// +#if __cplusplus >= 201103L || __GNUC__ >= 4 || defined(__clang__) + #ifndef POCO_LOCAL_STATIC_INIT_IS_THREADSAFE + #define POCO_LOCAL_STATIC_INIT_IS_THREADSAFE 1 + #endif +#endif + + +#ifdef __GNUC__ + #ifndef __THROW + #ifndef __GNUC_PREREQ + #define __GNUC_PREREQ(maj, min) (0) + #endif + #if defined __cplusplus && __GNUC_PREREQ (2,8) + #define __THROW throw () + #else + #define __THROW + #endif + #endif +#endif // __GNUC__ + + #endif // Foundation_Platform_POSIX_INCLUDED diff --git a/Net/include/Poco/Net/SocketDefs.h b/Net/include/Poco/Net/SocketDefs.h index efb212dba..dcb49eef7 100644 --- a/Net/include/Poco/Net/SocketDefs.h +++ b/Net/include/Poco/Net/SocketDefs.h @@ -39,16 +39,6 @@ #ifndef Net_SocketDefs_INCLUDED #define Net_SocketDefs_INCLUDED -#ifndef __THROW -# ifndef __GNUC_PREREQ -# define __GNUC_PREREQ(maj, min) (0) -# endif -# if defined __cplusplus && __GNUC_PREREQ (2,8) -# define __THROW throw () -# else -# define __THROW -# endif -#endif #if defined(POCO_OS_FAMILY_WINDOWS) #include "Poco/UnWindows.h" From 52243b5d259fecc0c2b1bec1d0dbf0da9d73a3e2 Mon Sep 17 00:00:00 2001 From: Fabrizio Duhem Date: Mon, 3 Dec 2012 20:07:36 +0100 Subject: [PATCH 064/165] SF Bug 599 --- JSON/include/Poco/JSON/Array.h | 2 +- JSON/include/Poco/JSON/Object.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/JSON/include/Poco/JSON/Array.h b/JSON/include/Poco/JSON/Array.h index fb833b30f..44a8c77e3 100644 --- a/JSON/include/Poco/JSON/Array.h +++ b/JSON/include/Poco/JSON/Array.h @@ -99,7 +99,7 @@ public: /// Retrieves an object. When the element is not /// an object or doesn't exist, an empty SharedPtr is returned. - unsigned int size() const; + std::size_t size() const; /// Returns the size of the array bool isArray(unsigned int index) const; diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h index 2de10f0c3..097d16cd0 100644 --- a/JSON/include/Poco/JSON/Object.h +++ b/JSON/include/Poco/JSON/Object.h @@ -133,7 +133,7 @@ public: return value; } - unsigned int size() const; + std::size_t size() const; /// Returns the number of properties void set(const std::string& key, const Dynamic::Var& value); From 1138f439afea21cc067de6523c09c59bf44af0c5 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Mon, 3 Dec 2012 20:35:49 -0600 Subject: [PATCH 065/165] few cosmetic changes --- JSON/include/Poco/JSON/Array.h | 14 +++----------- JSON/include/Poco/JSON/Object.h | 3 +-- JSON/src/Array.cpp | 11 +++++++++++ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/JSON/include/Poco/JSON/Array.h b/JSON/include/Poco/JSON/Array.h index 44a8c77e3..413e9001f 100644 --- a/JSON/include/Poco/JSON/Array.h +++ b/JSON/include/Poco/JSON/Array.h @@ -134,11 +134,8 @@ public: return value; } - void add(const Dynamic::Var& value) + void add(const Dynamic::Var& value); /// Add the given value to the array - { - _values.push_back(value); - } void stringify(std::ostream& out, unsigned int indent) const; /// Prints the array to out. When indent is 0, the array @@ -178,14 +175,9 @@ inline bool Array::isArray(unsigned int index) const } -inline bool Array::isNull(unsigned int index) const +inline void Array::add(const Dynamic::Var& value) { - if ( index < _values.size() ) - { - Dynamic::Var value = _values[index]; - return value.isEmpty(); - } - return true; + _values.push_back(value); } diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h index 097d16cd0..3e62bfec7 100644 --- a/JSON/include/Poco/JSON/Object.h +++ b/JSON/include/Poco/JSON/Object.h @@ -118,8 +118,7 @@ public: { T value = def; ValueMap::const_iterator it = _values.find(key); - if ( it != _values.end() - && ! it->second.isEmpty() ) + if (it != _values.end() && ! it->second.isEmpty() ) { try { diff --git a/JSON/src/Array.cpp b/JSON/src/Array.cpp index b58fbf8d8..05e922c48 100644 --- a/JSON/src/Array.cpp +++ b/JSON/src/Array.cpp @@ -102,6 +102,17 @@ Object::Ptr Array::getObject(unsigned int index) const } +bool Array::isNull(unsigned int index) const +{ + if ( index < _values.size() ) + { + Dynamic::Var value = _values[index]; + return value.isEmpty(); + } + return true; +} + + bool Array::isObject(unsigned int index) const { Var value = get(index); From eaa74307a6937b73fd927712af5309f8eb4a9532 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Tue, 4 Dec 2012 23:33:44 -0600 Subject: [PATCH 066/165] see CHANGELOG - added Poco::istring (case-insensitive string) and Poco::isubstr (case-insensitive substring search) - improved SQLite execute() return (affected rows) value - added SQLite sys.dual (in-memory system table) - applied SF Patch #120: The ExpireLRUCache does not compile with a tuple as key on Visual Studio 2010 - fixed SF Bug #599: JSON::Array and JSON::Object size() member can implicitly lose precision - fixed SF Bug #602: iterating database table rows not correct if no data in table - fixed SF Bug #603: count() is missing in HashMap - fixed GH #23: JSON::Object::stringify throw BadCastException - fixed GH #16: NetworkInterface::firstAddress() should not throw on unconfigured interfaces - Android compile/build support (by Rangel Reale) - TypeHandler::prepare() now takes const-reference --- CHANGELOG | 11 + CONTRIBUTORS | 4 + Data/MySQL/testsuite/src/SQLExecutor.cpp | 2 +- Data/ODBC/testsuite/src/SQLExecutor.cpp | 2 +- .../Poco/Data/SQLite/SQLiteStatementImpl.h | 2 + .../include/Poco/Data/SQLite/SessionImpl.h | 11 + Data/SQLite/src/SQLiteStatementImpl.cpp | 35 +- Data/SQLite/src/SessionImpl.cpp | 10 +- Data/SQLite/testsuite/src/SQLiteTest.cpp | 40 +- Data/SQLite/testsuite/src/SQLiteTest.h | 1 + Data/include/Poco/Data/Extraction.h | 2 +- Data/include/Poco/Data/TypeHandler.h | 483 +++++++++--------- Data/samples/TypeHandler/src/TypeHandler.cpp | 2 +- Foundation/include/Poco/String.h | 59 +++ Foundation/testsuite/src/StringTest.cpp | 35 +- Foundation/testsuite/src/StringTest.h | 1 + Net/include/Poco/Net/NetworkInterface.h | 5 + Net/src/NetworkInterface.cpp | 13 + Net/testsuite/src/NetworkInterfaceTest.cpp | 10 + 19 files changed, 473 insertions(+), 255 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a3d15c1c4..018314324 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,17 @@ This is the changelog file for the POCO C++ Libraries. Release 1.5.0 (2012-12-17) ========================== - using double-conversion library for floating-point numeric/string conversions +- added Poco::istring (case-insensitive string) and Poco::isubstr +- improved SQLite execute() return (affected rows) value +- added SQLite sys.dual (in-memory system table) +- applied SF Patch #120: The ExpireLRUCache does not compile with a tuple as key on Visual Studio 2010 +- fixed SF Bug #599: JSON::Array and JSON::Object size() member can implicitly lose precision +- fixed SF Bug #602: iterating database table rows not correct if no data in table +- fixed SF Bug #603: count() is missing in HashMap +- fixed GH #23: JSON::Object::stringify throw BadCastException +- fixed GH #16: NetworkInterface::firstAddress() should not throw on unconfigured interfaces +- Android compile/build support (by Rangel Reale) +- TypeHandler::prepare() now takes const-reference Release 1.5.0 (2012-10-14) ========================== diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 4d91419d0..c40d556c6 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -24,6 +24,10 @@ Marian Krivos Franky Braem Philip Prindeville Anton Yabchinskiy +Rangel Reale +Fabrizio Duhem +Patrick White +Mike Naquin -- $Id$ diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index 93afc39e4..c4a4f150b 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -119,7 +119,7 @@ public: pBinder->bind(pos++, obj.age, dir); } - static void prepare(std::size_t pos, Person& obj, AbstractPreparator* pPrepare) + static void prepare(std::size_t pos, const Person& obj, AbstractPreparator* pPrepare) { // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Address VARCHAR, Age INTEGER(3)) poco_assert_dbg (pPrepare != 0); diff --git a/Data/ODBC/testsuite/src/SQLExecutor.cpp b/Data/ODBC/testsuite/src/SQLExecutor.cpp index a23be912c..3202f395a 100644 --- a/Data/ODBC/testsuite/src/SQLExecutor.cpp +++ b/Data/ODBC/testsuite/src/SQLExecutor.cpp @@ -211,7 +211,7 @@ public: pBinder->bind(pos++, obj.age, dir); } - static void prepare(std::size_t pos, Person& obj, AbstractPreparator* pPrepare) + static void prepare(std::size_t pos, const Person& obj, AbstractPreparator* pPrepare) { // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Address VARCHAR, Age INTEGER(3)) poco_assert_dbg (pPrepare != 0); diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h index 2dbdc076c..1bb5bb5d0 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h +++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h @@ -141,6 +141,8 @@ private: bool _canBind; bool _isExtracted; bool _canCompile; + + static const std::size_t POCO_SQLITE_INV_ROW_CNT; }; diff --git a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h index a6f83a0f3..912c74c57 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h +++ b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h @@ -71,6 +71,17 @@ public: void open(const std::string& connect = ""); /// Opens a connection to the Database. + /// + /// An in-memory system database (sys), with a single table (dual) + /// containing single field (dummy) is attached to the database. + /// The in-memory system database is used to force change count + /// to be reset to zero on every new query (or batch of queries) + /// execution. Without this functionality, select statements + /// executions that do not return any rows return the count of + /// changes effected by the most recent insert, update or delete. + /// In-memory system database can be queried and updated but can not + /// be dropped. It may be used for other purposes + /// in the future. void close(); /// Closes the session. diff --git a/Data/SQLite/src/SQLiteStatementImpl.cpp b/Data/SQLite/src/SQLiteStatementImpl.cpp index 56b83b7ac..f9b2897b4 100644 --- a/Data/SQLite/src/SQLiteStatementImpl.cpp +++ b/Data/SQLite/src/SQLiteStatementImpl.cpp @@ -52,13 +52,16 @@ namespace Data { namespace SQLite { +const std::size_t SQLiteStatementImpl::POCO_SQLITE_INV_ROW_CNT = std::numeric_limits::max(); + + SQLiteStatementImpl::SQLiteStatementImpl(Poco::Data::SessionImpl& rSession, sqlite3* pDB): StatementImpl(rSession), _pDB(pDB), _pStmt(0), _stepCalled(false), _nextResponse(0), - _affectedRowCount(0), + _affectedRowCount(POCO_SQLITE_INV_ROW_CNT), _canBind(false), _isExtracted(false), _canCompile(true) @@ -75,9 +78,29 @@ SQLiteStatementImpl::~SQLiteStatementImpl() void SQLiteStatementImpl::compileImpl() { - if (!_pLeftover) _bindBegin = bindings().begin(); + if (!_pLeftover) + { + // Executed to force reset of previous changes count to zero. + // Without this, execute() will not return accurate (zero) count if select + // statement returns no results previous [insert|update|delete] affected rows. + if (sqlite3_changes(_pDB)) + { + if (SQLITE_OK != sqlite3_exec(_pDB, "delete from sys.dual where 1 <> 1;", 0, 0, 0)) + throw ExecutionException("Error updating system database."); + } + + _bindBegin = bindings().begin(); + } std::string statement(toString()); + + if (isubstr(statement, std::string("drop")) != istring::npos && + isubstr(statement, std::string("table")) != istring::npos && + isubstr(statement, std::string("dual")) != istring::npos) + { + throw InvalidAccessException("Cannot drop system table!"); + } + sqlite3_stmt* pStmt = 0; const char* pSql = _pLeftover ? _pLeftover->c_str() : statement.c_str(); @@ -194,12 +217,12 @@ void SQLiteStatementImpl::bindImpl() if (_bindBegin != bindings().end()) { - std::size_t boundRowCount = (*_bindBegin)->numOfRowsHandled(); + _affectedRowCount = (*_bindBegin)->numOfRowsHandled(); Bindings::iterator oldBegin = _bindBegin; for (std::size_t pos = 1; _bindBegin != bindEnd && (*_bindBegin)->canBind(); ++_bindBegin) { - if (boundRowCount != (*_bindBegin)->numOfRowsHandled()) + if (_affectedRowCount != (*_bindBegin)->numOfRowsHandled()) throw BindingException("Size mismatch in Bindings. All Bindings MUST have the same size"); (*_bindBegin)->bind(pos); @@ -220,7 +243,7 @@ void SQLiteStatementImpl::bindImpl() void SQLiteStatementImpl::clear() { _columns[currentDataSet()].clear(); - _affectedRowCount = 0; + _affectedRowCount = POCO_SQLITE_INV_ROW_CNT; if (_pStmt) { @@ -304,7 +327,7 @@ const MetaColumn& SQLiteStatementImpl::metaColumn(std::size_t pos) const std::size_t SQLiteStatementImpl::affectedRowCount() const { - return _affectedRowCount ? _affectedRowCount : sqlite3_changes(_pDB); + return _affectedRowCount != POCO_SQLITE_INV_ROW_CNT ? _affectedRowCount : sqlite3_changes(_pDB); } diff --git a/Data/SQLite/src/SessionImpl.cpp b/Data/SQLite/src/SessionImpl.cpp index a84883186..07252d0cf 100644 --- a/Data/SQLite/src/SessionImpl.cpp +++ b/Data/SQLite/src/SessionImpl.cpp @@ -43,7 +43,7 @@ #include "Poco/ActiveMethod.h" #include "Poco/ActiveResult.h" #include "Poco/String.h" -#include "Poco/Exception.h" +#include "Poco/Data/DataException.h" #include "sqlite3.h" #include @@ -195,6 +195,14 @@ void SessionImpl::open(const std::string& connect) throw ConnectionFailedException(ex.displayText()); } + if (SQLITE_OK != sqlite3_exec(_pDB, + "attach database ':memory:' as sys;" + "create table sys.dual (dummy);", + 0, 0, 0)) + { + throw ExecutionException("Cannot create system database."); + } + _connected = true; } diff --git a/Data/SQLite/testsuite/src/SQLiteTest.cpp b/Data/SQLite/testsuite/src/SQLiteTest.cpp index 018012c19..2ed2157a4 100644 --- a/Data/SQLite/testsuite/src/SQLiteTest.cpp +++ b/Data/SQLite/testsuite/src/SQLiteTest.cpp @@ -193,7 +193,7 @@ public: pBinder->bind(pos++, obj.getAge(), dir); } - static void prepare(std::size_t pos, Person& obj, AbstractPreparator* pPrepare) + static void prepare(std::size_t pos, const Person& obj, AbstractPreparator* pPrepare) { // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Address VARCHAR, Age INTEGER(3)) poco_assert_dbg (pPrepare != 0); @@ -674,6 +674,11 @@ void SQLiteTest::testAffectedRows() tmp << "DROP TABLE IF EXISTS Strings", now; tmp << "CREATE TABLE IF NOT EXISTS Strings (str VARCHAR(30))", now; + Statement stmt((tmp << "SELECT * FROM Strings")); + tmp << "SELECT COUNT(*) FROM Strings", into(count), now; + assert (count == 0); + assert (0 == stmt.execute()); + Statement stmt1((tmp << "INSERT INTO Strings VALUES(:str)", use(str))); tmp << "SELECT COUNT(*) FROM Strings", into(count), now; assert (count == 0); @@ -1242,6 +1247,12 @@ void SQLiteTest::testCombinedLimits() tmp << "DROP TABLE IF EXISTS Person", now; tmp << "CREATE TABLE IF NOT EXISTS Person (LastName VARCHAR(30), FirstName VARCHAR, Address VARCHAR, Age INTEGER(3))", now; tmp << "INSERT INTO PERSON VALUES(:ln, :fn, :ad, :age)", use(people), now; + + std::string a, b, c; + Statement stmt = (tmp << "SELECT LastName, FirstName, Address FROM Person WHERE Address = 'invalid value'", + into(a), into(b), into(c), limit(1)); + assert (!stmt.done() && stmt.execute() == 0); + int count = 0; tmp << "SELECT COUNT(*) FROM PERSON", into(count), now; assert (count == 2); @@ -2543,6 +2554,32 @@ void SQLiteTest::testReconnect() } +void SQLiteTest::testSystemTable() +{ + Session session (Poco::Data::SQLite::Connector::KEY, "dummy.db"); + + int cnt = -1; + session << "SELECT count(*) FROM sys.dual", into(cnt), now; + assert (0 == cnt); + + session << "INSERT INTO sys.dual VALUES ('test')", now; + session << "SELECT count(*) FROM sys.dual", into(cnt), now; + assert (1 == cnt); + + session << "DELETE FROM sys.dual", now; + session << "SELECT count(*) FROM sys.dual", into(cnt), now; + assert (0 == cnt); + + try + { + session << "DROP TABLE sys.dual", now; + fail ("must throw"); + } + catch (InvalidAccessException&) { } + +} + + void SQLiteTest::setUp() { } @@ -2633,6 +2670,7 @@ CppUnit::Test* SQLiteTest::suite() CppUnit_addTest(pSuite, SQLiteTest, testMultipleResults); CppUnit_addTest(pSuite, SQLiteTest, testPair); CppUnit_addTest(pSuite, SQLiteTest, testReconnect); + CppUnit_addTest(pSuite, SQLiteTest, testSystemTable); return pSuite; } diff --git a/Data/SQLite/testsuite/src/SQLiteTest.h b/Data/SQLite/testsuite/src/SQLiteTest.h index c948aec1e..0c533d1d8 100644 --- a/Data/SQLite/testsuite/src/SQLiteTest.h +++ b/Data/SQLite/testsuite/src/SQLiteTest.h @@ -132,6 +132,7 @@ public: void testMultipleResults(); void testReconnect(); + void testSystemTable(); void setUp(); void tearDown(); diff --git a/Data/include/Poco/Data/Extraction.h b/Data/include/Poco/Data/Extraction.h index 8a33d3e09..990de1191 100644 --- a/Data/include/Poco/Data/Extraction.h +++ b/Data/include/Poco/Data/Extraction.h @@ -96,7 +96,7 @@ public: std::size_t numOfRowsHandled() const { - return 1u; + return 0; } std::size_t numOfRowsAllowed() const diff --git a/Data/include/Poco/Data/TypeHandler.h b/Data/include/Poco/Data/TypeHandler.h index c7161cf95..1674aabb6 100644 --- a/Data/include/Poco/Data/TypeHandler.h +++ b/Data/include/Poco/Data/TypeHandler.h @@ -106,7 +106,7 @@ class TypeHandler: public AbstractTypeHandler /// TypeHandler::bind(pos++, obj.getAge(), pBinder); /// } /// - /// static void prepare(std::size_t pos, Person& obj, AbstractPreparator* pPreparator) + /// static void prepare(std::size_t pos, const Person& obj, AbstractPreparator* pPreparator) /// { /// // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3)) /// poco_assert_dbg (pPreparator != 0); @@ -154,7 +154,7 @@ public: if (!pExt->extract(pos, obj)) obj = defVal; } - static void prepare(std::size_t pos, T& obj, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, const T& obj, AbstractPreparator* pPreparator) { poco_assert_dbg (pPreparator != 0); pPreparator->prepare(pos, obj); @@ -189,7 +189,7 @@ public: obj.assign(obj.size(), defVal); } - static void prepare(std::size_t pos, std::deque& obj, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, const std::deque& obj, AbstractPreparator* pPreparator) { poco_assert_dbg (pPreparator != 0); pPreparator->prepare(pos, obj); @@ -224,7 +224,7 @@ public: obj.assign(obj.size(), defVal); } - static void prepare(std::size_t pos, std::vector& obj, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, const std::vector& obj, AbstractPreparator* pPreparator) { poco_assert_dbg (pPreparator != 0); pPreparator->prepare(pos, obj); @@ -259,7 +259,7 @@ public: obj.assign(obj.size(), defVal); } - static void prepare(std::size_t pos, std::list& obj, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, const std::list& obj, AbstractPreparator* pPreparator) { poco_assert_dbg (pPreparator != 0); pPreparator->prepare(pos, obj); @@ -281,7 +281,7 @@ public: poco_assert_dbg (pBinder != 0); if (obj.isNull()) { - pBinder->bind(pos++, Poco::Data::Keywords::null, dir); + pBinder->bind(pos++, Poco::Data::Keywords::null, dir); } else { @@ -289,7 +289,7 @@ public: } } - static void prepare(std::size_t pos, Nullable& obj, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, const Nullable& obj, AbstractPreparator* pPreparator) { poco_assert_dbg (pPreparator != 0); if (obj.isNull()) @@ -416,29 +416,29 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -545,28 +545,28 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -669,27 +669,27 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - TypeHandler::prepare(pos++, tuple.template get<0>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<1>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<2>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<3>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<4>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<5>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<6>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<7>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<8>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<9>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<10>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<11>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<12>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<13>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<14>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<15>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<16>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<17>(), pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -791,23 +791,23 @@ public: static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -902,25 +902,25 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1011,24 +1011,24 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - TypeHandler::prepare(pos++, tuple.template get<0>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<1>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<2>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<3>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<4>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<5>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<6>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<7>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<8>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<9>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<10>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<11>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<12>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<13>(), pPreparator); - TypeHandler::prepare(pos++, tuple.template get<14>(), pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1115,23 +1115,23 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1214,22 +1214,22 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1308,21 +1308,21 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1397,20 +1397,20 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1472,19 +1472,19 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1543,18 +1543,18 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1610,17 +1610,17 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1673,16 +1673,16 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1732,15 +1732,15 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1787,14 +1787,14 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1838,13 +1838,13 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1885,12 +1885,12 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1928,11 +1928,11 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -1967,10 +1967,10 @@ public: tupleBind(pos, tuple, pBinder, dir); } - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) { poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); } static std::size_t size() @@ -2015,7 +2015,7 @@ public: TypeHandler::extract(pos, obj.second, defVal.second, pExt); } - static void prepare(std::size_t pos, std::pair& obj, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, const std::pair& obj, AbstractPreparator* pPreparator) { TypeHandler::prepare(pos, obj.first, pPreparator); pos += TypeHandler::size(); @@ -2055,7 +2055,7 @@ public: TypeHandler::extract(pos, *obj, *obj, pExt); } - static void prepare(std::size_t pos, Poco::AutoPtr& obj, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, const Poco::AutoPtr& obj, AbstractPreparator* pPreparator) { poco_assert_dbg (pPreparator != 0); if (!obj) @@ -2077,7 +2077,7 @@ class TypeHandler >: public AbstractTypeHandler public: static void bind(std::size_t pos, const Poco::SharedPtr& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) { - // *obj will trigger a nullpointer exception if empty: this is on purpose + // *obj will trigger a nullpointer exception if empty TypeHandler::bind(pos, *obj, pBinder, dir); } @@ -2097,11 +2097,10 @@ public: TypeHandler::extract(pos, *obj, *obj, pExt); } - static void prepare(std::size_t pos, Poco::SharedPtr& obj, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, const Poco::SharedPtr& obj, AbstractPreparator* pPreparator) { poco_assert_dbg (pPreparator != 0); - if (!obj) - obj = new T(); + // *obj will trigger a nullpointer exception if empty TypeHandler::prepare(pos, *obj, pPreparator); } diff --git a/Data/samples/TypeHandler/src/TypeHandler.cpp b/Data/samples/TypeHandler/src/TypeHandler.cpp index 9ba51738d..41237bf10 100644 --- a/Data/samples/TypeHandler/src/TypeHandler.cpp +++ b/Data/samples/TypeHandler/src/TypeHandler.cpp @@ -82,7 +82,7 @@ public: TypeHandler::extract(pos++, person.age, deflt.age, pExtr); } - static void prepare(std::size_t pos, Person& person, AbstractPreparator* pPrep) + static void prepare(std::size_t pos, const Person& person, AbstractPreparator* pPrep) { TypeHandler::prepare(pos++, person.name, pPrep); TypeHandler::prepare(pos++, person.address, pPrep); diff --git a/Foundation/include/Poco/String.h b/Foundation/include/Poco/String.h index 228dc946e..f6b5dcaff 100644 --- a/Foundation/include/Poco/String.h +++ b/Foundation/include/Poco/String.h @@ -43,6 +43,7 @@ #include "Poco/Foundation.h" #include "Poco/Ascii.h" #include +#include namespace Poco { @@ -642,6 +643,64 @@ S cat(const S& delim, const It& begin, const It& end) } +// +// case-insensitive string equality +// + + +template +struct i_char_traits : public std::char_traits +{ + static bool eq(charT c1, charT c2) + { + return Ascii::toLower(c1) == Ascii::toLower(c2); + } + + static bool ne(charT c1, charT c2) + { + return !eq(c1, c2); + } + + static bool lt(charT c1, charT c2) + { + return Ascii::toLower(c1) < Ascii::toLower(c2); + } + + static int compare(const charT* s1, const charT* s2, size_t n) + { + for (int i = 0; i < n && s1 && s2; ++i, ++s1, ++s2) + { + if (Ascii::toLower(*s1) == Ascii::toLower(*s2)) continue; + else if (Ascii::toLower(*s1) < Ascii::toLower(*s2)) return -1; + else return 1; + } + + return 0; + } + + static const charT* find(const charT* s, int n, charT a) + { + while(n-- > 0 && Ascii::toLower(*s) != Ascii::toLower(a)) { ++s; } + return s; + } +}; + + +typedef std::basic_string > istring; + + +template +int isubstr(const T& str, const T& sought) +{ + typename T::const_iterator it = std::search(str.begin(), str.end(), + sought.begin(), sought.end(), + i_char_traits::eq); + + if (it != str.end()) return it - str.begin(); + else return T::npos; +} + + } // namespace Poco diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index 3257b3e40..0e61197ae 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -1,4 +1,4 @@ -// +// // StringTest.cpp // // $Id: //poco/1.4/Foundation/testsuite/src/StringTest.cpp#1 $ @@ -54,6 +54,8 @@ using Poco::toUpperInPlace; using Poco::toLower; using Poco::toLowerInPlace; using Poco::icompare; +using Poco::istring; +using Poco::isubstr; using Poco::translate; using Poco::translateInPlace; using Poco::replace; @@ -228,6 +230,36 @@ void StringTest::testToLower() } +void StringTest::testIstring() +{ + istring is1 = "AbC"; + istring is2 = "aBc"; + assert (is1 == is2); + + const char c1[] = { 'G', 0, (char) 0xFC, 'n', 't', 'e', 'r', '\0' }; + const char c2[] = { 'g', 0, (char) 0xDC, 'N', 'T', 'E', 'R', '\0' }; + is1 = c1; + is2 = c2; + assert (is1 == is2); + is1[0] = 'f'; + assert (is1 < is2); + is1[0] = 'F'; + assert (is1 < is2); + is1[0] = 'H'; + assert (is1 > is2); + is1[0] = 'h'; + assert (is1 > is2); + + is1 = "aAaBbBcCc"; + is2 = "bbb"; + assert (isubstr(is1, is2) == 3); + is2 = "bC"; + assert (isubstr(is1, is2) == 5); + is2 = "xxx"; + assert (isubstr(is1, is2) == istring::npos); +} + + void StringTest::testIcompare() { std::string s1 = "AAA"; @@ -1044,6 +1076,7 @@ CppUnit::Test* StringTest::suite() CppUnit_addTest(pSuite, StringTest, testTrimRightInPlace); CppUnit_addTest(pSuite, StringTest, testToUpper); CppUnit_addTest(pSuite, StringTest, testToLower); + CppUnit_addTest(pSuite, StringTest, testIstring); CppUnit_addTest(pSuite, StringTest, testIcompare); CppUnit_addTest(pSuite, StringTest, testTranslate); CppUnit_addTest(pSuite, StringTest, testTranslateInPlace); diff --git a/Foundation/testsuite/src/StringTest.h b/Foundation/testsuite/src/StringTest.h index 54dadde89..5a0e7d26c 100644 --- a/Foundation/testsuite/src/StringTest.h +++ b/Foundation/testsuite/src/StringTest.h @@ -56,6 +56,7 @@ public: void testTrimInPlace(); void testToUpper(); void testToLower(); + void testIstring(); void testIcompare(); void testTranslate(); void testTranslateInPlace(); diff --git a/Net/include/Poco/Net/NetworkInterface.h b/Net/include/Poco/Net/NetworkInterface.h index afa8a43b5..41d4f5526 100644 --- a/Net/include/Poco/Net/NetworkInterface.h +++ b/Net/include/Poco/Net/NetworkInterface.h @@ -155,6 +155,11 @@ public: /// Throws NotFoundException if the address family is not /// configured on the interface. + void firstAddress(IPAddress& addr, IPAddress::Family family = IPAddress::IPv4) const; + /// Returns the first IP address bound to the interface. + /// If the address family is not configured on the interface, + /// the address returned in addr will be unspecified (wildcard). + const IPAddress& address(unsigned index = 0) const; /// Returns the IP address bound to the interface at index position. diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp index 6a18dccd3..e4281b4fb 100644 --- a/Net/src/NetworkInterface.cpp +++ b/Net/src/NetworkInterface.cpp @@ -612,6 +612,19 @@ const IPAddress& NetworkInterface::firstAddress(IPAddress::Family family) const } +void NetworkInterface::firstAddress(IPAddress& addr, IPAddress::Family family) const +{ + try + { + addr = firstAddress(family); + } + catch (NotFoundException&) + { + addr = IPAddress(family); + } +} + + void NetworkInterface::addAddress(const IPAddress& address) { _pImpl->addAddress(AddressTuple(address, IPAddress(), IPAddress())); diff --git a/Net/testsuite/src/NetworkInterfaceTest.cpp b/Net/testsuite/src/NetworkInterfaceTest.cpp index b6d166fa7..6d39ffc20 100644 --- a/Net/testsuite/src/NetworkInterfaceTest.cpp +++ b/Net/testsuite/src/NetworkInterfaceTest.cpp @@ -150,6 +150,11 @@ void NetworkInterfaceTest::testForAddress() { NetworkInterface ifc = NetworkInterface::forAddress(it->second.firstAddress(IPAddress::IPv4)); assert (ifc.firstAddress(IPAddress::IPv4) == it->second.firstAddress(IPAddress::IPv4)); + + IPAddress addr(IPAddress::IPv4); + assert (addr.isWildcard()); + it->second.firstAddress(addr, IPAddress::IPv4); + assert (!addr.isWildcard()); } else { @@ -159,6 +164,11 @@ void NetworkInterfaceTest::testForAddress() fail ("must throw"); } catch (NotFoundException&) { } + + IPAddress addr(IPAddress::IPv4); + assert (addr.isWildcard()); + it->second.firstAddress(addr, IPAddress::IPv4); + assert (addr.isWildcard()); } } } From 569ea468178159e59207c5b614cd9daf945f5728 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 4 Dec 2012 23:49:29 -0600 Subject: [PATCH 067/165] Mac (clang) compile warning fix --- Foundation/include/Poco/String.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Foundation/include/Poco/String.h b/Foundation/include/Poco/String.h index f6b5dcaff..ea2e26093 100644 --- a/Foundation/include/Poco/String.h +++ b/Foundation/include/Poco/String.h @@ -690,14 +690,14 @@ typedef std::basic_string > istring; template -int isubstr(const T& str, const T& sought) +std::size_t isubstr(const T& str, const T& sought) { typename T::const_iterator it = std::search(str.begin(), str.end(), sought.begin(), sought.end(), i_char_traits::eq); if (it != str.end()) return it - str.begin(); - else return T::npos; + else return static_cast(T::npos); } From 7327be473574144f1dc01ad0e203885d0af6c5e2 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Wed, 5 Dec 2012 22:28:25 -0600 Subject: [PATCH 068/165] Poco::URI::decode() doesn't properly handle '+' GH #27: Poco::URI::decode() doesn't properly handle '+' --- Foundation/include/Poco/URI.h | 4 +++- Foundation/src/URI.cpp | 8 ++++++-- Foundation/testsuite/src/URITest.cpp | 21 +++++++++++++++++++++ Foundation/testsuite/src/URITest.h | 1 + 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Foundation/include/Poco/URI.h b/Foundation/include/Poco/URI.h index 944b84cc5..4aa36fde8 100644 --- a/Foundation/include/Poco/URI.h +++ b/Foundation/include/Poco/URI.h @@ -246,10 +246,12 @@ public: /// URI-encodes the given string by escaping reserved and non-ASCII /// characters. The encoded string is appended to encodedStr. - static void decode(const std::string& str, std::string& decodedStr); + static void decode(const std::string& str, std::string& decodedStr, bool plusAsSpace = false); /// URI-decodes the given string by replacing percent-encoded /// characters with the actual character. The decoded string /// is appended to decodedStr. + /// When plusAsSpace is true, non-encoded plus signs in the query are decoded as spaces. + /// (http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.1) protected: bool equals(const URI& uri) const; diff --git a/Foundation/src/URI.cpp b/Foundation/src/URI.cpp index cb30ca429..d0626f03a 100644 --- a/Foundation/src/URI.cpp +++ b/Foundation/src/URI.cpp @@ -595,14 +595,18 @@ void URI::encode(const std::string& str, const std::string& reserved, std::strin } -void URI::decode(const std::string& str, std::string& decodedStr) +void URI::decode(const std::string& str, std::string& decodedStr, bool plusAsSpace) { + bool inQuery = false; std::string::const_iterator it = str.begin(); std::string::const_iterator end = str.end(); while (it != end) { char c = *it++; - if (c == '%') + if (c == '?') inQuery = true; + // spaces may be encoded as plus signs in the query + if (inQuery && plusAsSpace && c == '+') c = ' '; + else if (c == '%') { if (it == end) throw SyntaxException("URI encoding: no hex digit following percent sign", str); char hi = *it++; diff --git a/Foundation/testsuite/src/URITest.cpp b/Foundation/testsuite/src/URITest.cpp index bcbfeff51..ca6433754 100644 --- a/Foundation/testsuite/src/URITest.cpp +++ b/Foundation/testsuite/src/URITest.cpp @@ -767,6 +767,26 @@ void URITest::testOther() } +void URITest::testEncodeDecode() +{ + std::string str; + URI::encode("http://google.com/search?q=hello+world#frag ment", "+#?", str); + assert (str == "http://google.com/search%3Fq=hello%2Bworld%23frag%20ment"); + + str = ""; + URI::encode("http://google.com/search?q=hello+world#frag ment", "", str); + assert (str == "http://google.com/search?q=hello+world#frag%20ment"); + + str = ""; + URI::decode("http://google.com/search?q=hello+world#frag%20ment", str, true); + assert (str == "http://google.com/search?q=hello world#frag ment"); + + str = ""; + URI::decode("http://google.com/search?q=hello%2Bworld#frag%20ment", str); + assert (str == "http://google.com/search?q=hello+world#frag ment"); +} + + void URITest::setUp() { } @@ -788,6 +808,7 @@ CppUnit::Test* URITest::suite() CppUnit_addTest(pSuite, URITest, testNormalize); CppUnit_addTest(pSuite, URITest, testResolve); CppUnit_addTest(pSuite, URITest, testSwap); + CppUnit_addTest(pSuite, URITest, testEncodeDecode); CppUnit_addTest(pSuite, URITest, testOther); return pSuite; diff --git a/Foundation/testsuite/src/URITest.h b/Foundation/testsuite/src/URITest.h index 0895403b8..fb5f63153 100644 --- a/Foundation/testsuite/src/URITest.h +++ b/Foundation/testsuite/src/URITest.h @@ -53,6 +53,7 @@ public: void testNormalize(); void testResolve(); void testSwap(); + void testEncodeDecode(); void testOther(); void setUp(); From ec84a9a8c6578fdd8ace8ab14cb3a3ca2c602058 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Thu, 6 Dec 2012 22:35:08 -0600 Subject: [PATCH 069/165] added DateTime to samples added DateTime to samples fixed TypeHandler::prepare for AutoPtr and SharedPtr --- CHANGELOG | 1 + Data/include/Poco/Data/TypeHandler.h | 12 ++---- Data/samples/RecordSet/src/RecordSet.cpp | 8 ++-- .../samples/RowFormatter/src/RowFormatter.cpp | 12 +++--- Data/samples/TypeHandler/src/TypeHandler.cpp | 41 +++++++++++++------ 5 files changed, 46 insertions(+), 28 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 018314324..c9598fda1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ Release 1.5.0 (2012-12-17) - fixed GH #16: NetworkInterface::firstAddress() should not throw on unconfigured interfaces - Android compile/build support (by Rangel Reale) - TypeHandler::prepare() now takes const-reference +- fixed GH #27: Poco::URI::decode() doesn't properly handle '+' Release 1.5.0 (2012-10-14) ========================== diff --git a/Data/include/Poco/Data/TypeHandler.h b/Data/include/Poco/Data/TypeHandler.h index 1674aabb6..e206d34c8 100644 --- a/Data/include/Poco/Data/TypeHandler.h +++ b/Data/include/Poco/Data/TypeHandler.h @@ -1991,7 +1991,6 @@ private: }; - template class TypeHandler >: public AbstractTypeHandler { @@ -2055,12 +2054,10 @@ public: TypeHandler::extract(pos, *obj, *obj, pExt); } - static void prepare(std::size_t pos, const Poco::AutoPtr& obj, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, const Poco::AutoPtr&, AbstractPreparator* pPreparator) { poco_assert_dbg (pPreparator != 0); - if (!obj) - obj = new T(); - TypeHandler::prepare(pos, *obj, pPreparator); + TypeHandler::prepare(pos, T(), pPreparator); } private: @@ -2097,11 +2094,10 @@ public: TypeHandler::extract(pos, *obj, *obj, pExt); } - static void prepare(std::size_t pos, const Poco::SharedPtr& obj, AbstractPreparator* pPreparator) + static void prepare(std::size_t pos, const Poco::SharedPtr&, AbstractPreparator* pPreparator) { poco_assert_dbg (pPreparator != 0); - // *obj will trigger a nullpointer exception if empty - TypeHandler::prepare(pos, *obj, pPreparator); + TypeHandler::prepare(pos, T(), pPreparator); } private: diff --git a/Data/samples/RecordSet/src/RecordSet.cpp b/Data/samples/RecordSet/src/RecordSet.cpp index 9b9dc4d5c..1d20d139a 100644 --- a/Data/samples/RecordSet/src/RecordSet.cpp +++ b/Data/samples/RecordSet/src/RecordSet.cpp @@ -32,6 +32,7 @@ #include "Poco/SharedPtr.h" +#include "Poco/DateTime.h" #include "Poco/Data/SessionFactory.h" #include "Poco/Data/Session.h" #include "Poco/Data/RecordSet.h" @@ -41,6 +42,7 @@ using namespace Poco::Data::Keywords; +using Poco::DateTime; using Poco::Data::Session; using Poco::Data::Statement; using Poco::Data::RecordSet; @@ -66,11 +68,11 @@ int main(int argc, char** argv) session << "DROP TABLE IF EXISTS Person", now; // (re)create table - session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3))", now; + session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now; // insert some rows - session << "INSERT INTO Person VALUES('Bart Simpson', 'Springfield', 12)", now; - session << "INSERT INTO Person VALUES('Lisa Simpson', 'Springfield', 10)", now; + session << "INSERT INTO Person VALUES('Bart Simpson', 'Springfield', 12, ?)", use(DateTime(1980, 4, 1)), now; + session << "INSERT INTO Person VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(DateTime(1982, 5, 9)), now; // a simple query Statement select(session); diff --git a/Data/samples/RowFormatter/src/RowFormatter.cpp b/Data/samples/RowFormatter/src/RowFormatter.cpp index 42c0496f9..3b9073393 100644 --- a/Data/samples/RowFormatter/src/RowFormatter.cpp +++ b/Data/samples/RowFormatter/src/RowFormatter.cpp @@ -33,6 +33,7 @@ #include "Poco/SharedPtr.h" +#include "Poco/DateTime.h" #include "Poco/Data/SessionFactory.h" #include "Poco/Data/Session.h" #include "Poco/Data/Statement.h" @@ -43,6 +44,7 @@ using namespace Poco::Data::Keywords; +using Poco::DateTime; using Poco::Data::Session; using Poco::Data::Statement; using Poco::Data::RecordSet; @@ -111,13 +113,13 @@ int main(int argc, char** argv) session << "DROP TABLE IF EXISTS Simpsons", now; // (re)create table - session << "CREATE TABLE Simpsons (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3))", now; + session << "CREATE TABLE Simpsons (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now; // insert some rows - session << "INSERT INTO Simpsons VALUES('Homer Simpson', 'Springfield', 42)", now; - session << "INSERT INTO Simpsons VALUES('Marge Simpson', 'Springfield', 38)", now; - session << "INSERT INTO Simpsons VALUES('Bart Simpson', 'Springfield', 12)", now; - session << "INSERT INTO Simpsons VALUES('Lisa Simpson', 'Springfield', 10)", now; + session << "INSERT INTO Simpsons VALUES('Homer Simpson', 'Springfield', 42, ?)", use(DateTime(1956, 3, 1)), now; + session << "INSERT INTO Simpsons VALUES('Marge Simpson', 'Springfield', 38, ?)", use(DateTime(1954, 10, 1)), now; + session << "INSERT INTO Simpsons VALUES('Bart Simpson', 'Springfield', 12, ?)", use(DateTime(1980, 4, 1)), now; + session << "INSERT INTO Simpsons VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(DateTime(1982, 5, 9)), now; // create a statement and print the column names and data as HTML table HTMLTableFormatter tf; diff --git a/Data/samples/TypeHandler/src/TypeHandler.cpp b/Data/samples/TypeHandler/src/TypeHandler.cpp index 41237bf10..52d8315f1 100644 --- a/Data/samples/TypeHandler/src/TypeHandler.cpp +++ b/Data/samples/TypeHandler/src/TypeHandler.cpp @@ -32,6 +32,7 @@ #include "Poco/SharedPtr.h" +#include "Poco/DateTimeFormatter.h" #include "Poco/Data/SessionFactory.h" #include "Poco/Data/Session.h" #include "Poco/Data/TypeHandler.h" @@ -41,15 +42,18 @@ using namespace Poco::Data::Keywords; +using Poco::DateTime; +using Poco::DateTimeFormatter; using Poco::Data::Session; using Poco::Data::Statement; struct Person { - std::string name; - std::string address; - int age; + std::string name; + std::string address; + int age; + DateTime birthday; }; @@ -73,6 +77,7 @@ public: TypeHandler::bind(pos++, person.name, pBinder, dir); TypeHandler::bind(pos++, person.address, pBinder, dir); TypeHandler::bind(pos++, person.age, pBinder, dir); + TypeHandler::bind(pos++, person.birthday, pBinder, dir); } static void extract(std::size_t pos, Person& person, const Person& deflt, AbstractExtractor* pExtr) @@ -80,6 +85,7 @@ public: TypeHandler::extract(pos++, person.name, deflt.name, pExtr); TypeHandler::extract(pos++, person.address, deflt.address, pExtr); TypeHandler::extract(pos++, person.age, deflt.age, pExtr); + TypeHandler::extract(pos++, person.birthday, deflt.birthday, pExtr); } static void prepare(std::size_t pos, const Person& person, AbstractPreparator* pPrep) @@ -87,6 +93,7 @@ public: TypeHandler::prepare(pos++, person.name, pPrep); TypeHandler::prepare(pos++, person.address, pPrep); TypeHandler::prepare(pos++, person.age, pPrep); + TypeHandler::prepare(pos++, person.birthday, pPrep); } }; @@ -106,49 +113,59 @@ int main(int argc, char** argv) session << "DROP TABLE IF EXISTS Person", now; // (re)create table - session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3))", now; + session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now; // insert some rows Person person = { "Bart Simpson", "Springfield", - 12 + 10, + DateTime(1980, 4, 1) }; Statement insert(session); - insert << "INSERT INTO Person VALUES(?, ?, ?)", + insert << "INSERT INTO Person VALUES(?, ?, ?, ?)", use(person); insert.execute(); person.name = "Lisa Simpson"; person.address = "Springfield"; - person.age = 10; - + person.age = 8; + person.birthday = DateTime(1982, 5, 9); + insert.execute(); // a simple query Statement select(session); - select << "SELECT Name, Address, Age FROM Person", + select << "SELECT Name, Address, Age, Birthday FROM Person", into(person), range(0, 1); // iterate over result set one row at a time while (!select.done()) { select.execute(); - std::cout << person.name << " " << person.address << " " << person.age << std::endl; + std::cout << person.name << "\t" + << person.address << "\t" + << person.age << "\t" + << DateTimeFormatter::format(person.birthday, "%b %d %Y") + << std::endl; } // another query - store the result in a container std::vector persons; - session << "SELECT Name, Address, Age FROM Person", + session << "SELECT Name, Address, Age, Birthday FROM Person", into(persons), now; for (std::vector::const_iterator it = persons.begin(); it != persons.end(); ++it) { - std::cout << it->name << " " << it->address << " " << it->age << std::endl; + std::cout << it->name << "\t" + << it->address << "\t" + << it->age << "\t" + << DateTimeFormatter::format(it->birthday, "%b %d %Y") + << std::endl; } return 0; From e3649153b8ce8925b635c32ad924a06f417bf352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Sat, 8 Dec 2012 15:54:38 -0200 Subject: [PATCH 070/165] Fixed build with CMake Used CMAKE_DEBUG_POSTFIX instead LIB_EXT for library name decoration on debug builds (less intrusive and more flexible) --- CMakeLists.txt | 4 ++-- Crypto/CMakeLists.txt | 7 +++---- Data/CMakeLists.txt | 3 +-- Data/MySQL/CMakeLists.txt | 3 +-- Data/ODBC/CMakeLists.txt | 3 +-- Data/SQLite/CMakeLists.txt | 5 ++--- Foundation/CMakeLists.txt | 4 +--- JSON/CMakeLists.txt | 3 +-- Net/CMakeLists.txt | 5 ++--- NetSSL_OpenSSL/CMakeLists.txt | 3 +-- PDF/CMakeLists.txt | 5 ++--- Util/CMakeLists.txt | 3 +-- XML/CMakeLists.txt | 3 +-- Zip/CMakeLists.txt | 3 +-- 14 files changed, 20 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66901e75a..1f1fdad1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,10 +50,10 @@ endif () # * MinSizeRel (CMAKE_C_FLAGS_MINSIZEREL or CMAKE_CXX_FLAGS_MINSIZEREL) if (CMAKE_BUILD_TYPE STREQUAL "Debug") message(STATUS "Debug output enabled") - set(LIB_EXT "d" CACHE STRING "Set debug library postfix" FORCE) + set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Set debug library postfix" FORCE) else () message(STATUS "Optimized output enabled") - set(LIB_EXT "" CACHE STRING "Set debug library postfix" FORCE) + set(CMAKE_DEBUG_POSTFIX "" CACHE STRING "Set debug library postfix" FORCE) endif () option(ENABLE_TESTS diff --git a/Crypto/CMakeLists.txt b/Crypto/CMakeLists.txt index 3ce1f7a99..1f1ea81e0 100644 --- a/Crypto/CMakeLists.txt +++ b/Crypto/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoCrypto") -set(LIBNAME "${LIBNAME}${LIB_EXT}") aux_source_directory(src SRCS) add_definitions(-D_USRDLL -DCrypto_EXPORTS) @@ -9,12 +8,12 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) #if(CMAKE_SYSTEM MATCHES "Windows") -# target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${LIB_EAY_RELEASE} ${OPENSSL_LIBRARIES} ) +# target_link_libraries( ${LIBNAME} PocoFoundation ${LIB_EAY_RELEASE} ${OPENSSL_LIBRARIES} ) #ELSE() -# target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ) +# target_link_libraries( ${LIBNAME} PocoFoundation ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ) #ENDIF() -target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${OPENSSL_LIBRARIES} ) +target_link_libraries( ${LIBNAME} PocoFoundation ${OPENSSL_LIBRARIES} ) install( DIRECTORY include/Poco diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt index 5769aa510..fdc952e90 100644 --- a/Data/CMakeLists.txt +++ b/Data/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoData") -set(LIBNAME "${LIBNAME}${LIB_EXT}") set(SRCS "") aux_source_directory(src SRCS) @@ -13,7 +12,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ) +target_link_libraries( ${LIBNAME} PocoFoundation) install( DIRECTORY include/Poco diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt index d460b650f..2681b095d 100644 --- a/Data/MySQL/CMakeLists.txt +++ b/Data/MySQL/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoDataMySQL") -set(LIBNAME "${LIBNAME}${LIB_EXT}") set(SRCS "") aux_source_directory(src SRCS) @@ -13,7 +12,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoData${LIB_EXT} PocoFoundation${LIB_EXT} ${MYSQL_LIB}) +target_link_libraries( ${LIBNAME} PocoData PocoFoundation ${MYSQL_LIB}) install( DIRECTORY include/Poco diff --git a/Data/ODBC/CMakeLists.txt b/Data/ODBC/CMakeLists.txt index 908e0a50b..85ea69cd5 100644 --- a/Data/ODBC/CMakeLists.txt +++ b/Data/ODBC/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoDataODBC") -set(LIBNAME "${LIBNAME}${LIB_EXT}") set(SRCS src/Binder.cpp @@ -26,7 +25,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoData${LIB_EXT} PocoFoundation${LIB_EXT} ${ODBC_LINK_FLAGS}) +target_link_libraries( ${LIBNAME} PocoData PocoFoundation ${ODBC_LINK_FLAGS}) install( DIRECTORY include/Poco diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt index 7c4c2d216..30f4ae0b0 100644 --- a/Data/SQLite/CMakeLists.txt +++ b/Data/SQLite/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoDataSQLite") -set(LIBNAME "${LIBNAME}${LIB_EXT}") include_directories( include src ) @@ -17,10 +16,10 @@ set(SRCS if (POCO_UNBUNDLED) - set(DATASQLITELIBS PocoData${LIB_EXT} PocoFoundatio ${LIB_EXT} sqlite3) + set(DATASQLITELIBS PocoData PocoFoundation sqlite3) else() set(SRCS ${SRCS} src/sqlite3.c) - set(DATASQLITELIBS PocoData${LIB_EXT} PocoFoundation${LIB_EXT}) + set(DATASQLITELIBS PocoData PocoFoundation) endif() add_definitions(-DSQLITE_THREADSAFE=1 -DSQLITE_DISABLE_LFS -DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_COMPLETE -DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_DEPRECATED) diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt index 1a69622ff..e0f215a7b 100644 --- a/Foundation/CMakeLists.txt +++ b/Foundation/CMakeLists.txt @@ -1,7 +1,4 @@ set(LIBNAME "PocoFoundation") -if (CMAKE_BUILD_TYPE MATCHES Debug) - set(LIBNAME "${LIBNAME}d") -endif() if (WIN32) # cmake has CMAKE_RC_COMPILER, but no message compiler @@ -54,6 +51,7 @@ set( BASE_SRCS src/DigestStream.cpp src/DirectoryIterator.cpp src/Environment.cpp + src/Error.cpp src/ErrorHandler.cpp src/Event.cpp src/EventArgs.cpp diff --git a/JSON/CMakeLists.txt b/JSON/CMakeLists.txt index 4d6b8cc36..87ea0bcf1 100644 --- a/JSON/CMakeLists.txt +++ b/JSON/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoJSON") -set(LIBNAME "${LIBNAME}${LIB_EXT}") aux_source_directory(src SRCS) @@ -11,7 +10,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT}) +target_link_libraries( ${LIBNAME} PocoFoundation) install( DIRECTORY include/Poco diff --git a/Net/CMakeLists.txt b/Net/CMakeLists.txt index 4926ef54a..38ac6587c 100644 --- a/Net/CMakeLists.txt +++ b/Net/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoNet") -set(LIBNAME "${LIBNAME}${LIB_EXT}") set( BASE_SRCS src/AbstractHTTPRequestHandler.cpp @@ -102,7 +101,7 @@ set( LIN_SRCS if(CMAKE_SYSTEM MATCHES "Windows") set(SRCS ${BASE_SRCS} ${WIN_SRCS}) - set(SYSLIBS ${SYSLIBS} ws2_32) + set(SYSLIBS ${SYSLIBS} "ws2_32.lib" "iphlpapi.lib") else (CMAKE_SYSTEM MATCHES "Windows") set(SRCS ${BASE_SRCS} ${LIN_SRCS}) endif(CMAKE_SYSTEM MATCHES "Windows") @@ -115,7 +114,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${SYSLIBS}) +target_link_libraries( ${LIBNAME} PocoFoundation ${SYSLIBS}) install( DIRECTORY include/Poco diff --git a/NetSSL_OpenSSL/CMakeLists.txt b/NetSSL_OpenSSL/CMakeLists.txt index 773619756..8c84a58bf 100644 --- a/NetSSL_OpenSSL/CMakeLists.txt +++ b/NetSSL_OpenSSL/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoNetSSL") -set(LIBNAME "${LIBNAME}${LIB_EXT}") aux_source_directory(src SRCS) include_directories( ${OPENSSL_INCLUDE_DIR} ) @@ -12,7 +11,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoCrypto${LIB_EXT} PocoNet${LIB_EXT} PocoUtil${LIB_EXT} PocoFoundation${LIB_EXT} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ) +target_link_libraries( ${LIBNAME} PocoCrypto PocoNet PocoUtil PocoFoundation ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ) install( DIRECTORY include/Poco diff --git a/PDF/CMakeLists.txt b/PDF/CMakeLists.txt index 38d7891f8..ad907ef2a 100644 --- a/PDF/CMakeLists.txt +++ b/PDF/CMakeLists.txt @@ -1,18 +1,17 @@ set(LIBNAME "PocoPDF") -set(LIBNAME "${LIBNAME}${LIB_EXT}") aux_source_directory(src SRCS) include_directories(include/Poco/PDF) # zip src if (NOT POCO_STATIC) - add_definitions(-DJSON_EXPORTS) + add_definitions(-DPDF_EXPORTS) endif (NOT POCO_STATIC) add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT}) +target_link_libraries( ${LIBNAME} PocoFoundation) install( DIRECTORY include/Poco diff --git a/Util/CMakeLists.txt b/Util/CMakeLists.txt index a019198c5..b1de5183f 100644 --- a/Util/CMakeLists.txt +++ b/Util/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoUtil") -set(LIBNAME "${LIBNAME}${LIB_EXT}") set( BASE_SRCS src/AbstractConfiguration.cpp @@ -48,7 +47,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoJSON${LIB_EXT} PocoXML${LIB_EXT} PocoFoundation${LIB_EXT}) +target_link_libraries( ${LIBNAME} PocoJSON PocoXML PocoFoundation) install( DIRECTORY include/Poco diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt index 04699c5e0..c76cf3eed 100644 --- a/XML/CMakeLists.txt +++ b/XML/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoXML") -set(LIBNAME "${LIBNAME}${LIB_EXT}") aux_source_directory(src SRCS) @@ -9,7 +8,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT}) +target_link_libraries( ${LIBNAME} PocoFoundation) install( DIRECTORY include/Poco diff --git a/Zip/CMakeLists.txt b/Zip/CMakeLists.txt index d3ff62798..9fed43ae8 100644 --- a/Zip/CMakeLists.txt +++ b/Zip/CMakeLists.txt @@ -1,5 +1,4 @@ set(LIBNAME "PocoZip") -set(LIBNAME "${LIBNAME}${LIB_EXT}") aux_source_directory(src SRCS) @@ -11,7 +10,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoUtil${LIB_EXT} PocoXML${LIB_EXT} PocoFoundation${LIB_EXT}) +target_link_libraries( ${LIBNAME} PocoUtil PocoXML PocoFoundation) install( DIRECTORY include/Poco From 3ffa2fe7814426ccca22b600c31dc251005f2579 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sat, 8 Dec 2012 20:52:20 -0600 Subject: [PATCH 071/165] Added Crypto VS 2012 solutions SF #600: No Crypto VS110 Solution File in 1.5 --- Crypto/Crypto_vs110.sln | 60 +++++++++++++++++++++++++++++++++++++ Crypto/Crypto_x64_vs110.sln | 60 +++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 Crypto/Crypto_vs110.sln create mode 100644 Crypto/Crypto_x64_vs110.sln diff --git a/Crypto/Crypto_vs110.sln b/Crypto/Crypto_vs110.sln new file mode 100644 index 000000000..32da32f1a --- /dev/null +++ b/Crypto/Crypto_vs110.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto_vs110.vcxproj", "{EEEE7259-32E9-4D56-B023-C733940AB2A0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}" + ProjectSection(ProjectDependencies) = postProject + {EEEE7259-32E9-4D56-B023-C733940AB2A0} = {EEEE7259-32E9-4D56-B023-C733940AB2A0} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|Win32.Build.0 = release_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|Win32.Build.0 = release_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Crypto/Crypto_x64_vs110.sln b/Crypto/Crypto_x64_vs110.sln new file mode 100644 index 000000000..8949b104b --- /dev/null +++ b/Crypto/Crypto_x64_vs110.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto_x64_vs110.vcxproj", "{EEEE7259-32E9-4D56-B023-C733940AB2A0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}" + ProjectSection(ProjectDependencies) = postProject + {EEEE7259-32E9-4D56-B023-C733940AB2A0} = {EEEE7259-32E9-4D56-B023-C733940AB2A0} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|x64.Build.0 = debug_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|x64.ActiveCfg = release_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|x64.Build.0 = release_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|x64.Deploy.0 = release_shared|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.Build.0 = release_static_md|x64 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.Build.0 = debug_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.ActiveCfg = release_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.Build.0 = release_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.Deploy.0 = release_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.Build.0 = release_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal From 245f3e756808c89e14674250e2b81d5c9ea95b36 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Sat, 8 Dec 2012 21:55:47 -0600 Subject: [PATCH 072/165] VS 2012 mods to proj/sln files VS 2012 modifications to project/solution files added WinTestRunner dependency on CppUnit --- CppUnit/CppUnit_vs110.sln | 3 + Crypto/Crypto_vs110.vcxproj | 211 +++++++++++++---------- Crypto/testsuite/TestSuite_vs110.vcxproj | 178 +++++++++++-------- 3 files changed, 227 insertions(+), 165 deletions(-) diff --git a/CppUnit/CppUnit_vs110.sln b/CppUnit/CppUnit_vs110.sln index 299cae3b9..5ae1ef9d7 100644 --- a/CppUnit/CppUnit_vs110.sln +++ b/CppUnit/CppUnit_vs110.sln @@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs110.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" + ProjectSection(ProjectDependencies) = postProject + {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Crypto/Crypto_vs110.vcxproj b/Crypto/Crypto_vs110.vcxproj index e1873768c..e3d87b553 100644 --- a/Crypto/Crypto_vs110.vcxproj +++ b/Crypto/Crypto_vs110.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,82 +32,111 @@ Crypto Win32Proj - - + + StaticLibrary MultiByte v110 - + StaticLibrary MultiByte v110 - + StaticLibrary MultiByte v110 - + StaticLibrary MultiByte v110 - + DynamicLibrary MultiByte v110 - + DynamicLibrary MultiByte v110 - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoCryptod - PocoCryptomdd - PocoCryptomtd - PocoCrypto - PocoCryptomd - PocoCryptomt + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoCryptod + PocoCryptomdd + PocoCryptomtd + PocoCrypto + PocoCryptomd + PocoCryptomt - + + C:\OpenSSL\include;$(IncludePath) + $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib + C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + + C:\OpenSSL\include;$(IncludePath) + $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib + C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + + C:\OpenSSL\include;$(IncludePath) + $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib + C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + + C:\OpenSSL\include;$(IncludePath) + C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + + C:\OpenSSL\include;$(IncludePath) + $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib + C:\OpenSSL\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + + C:\OpenSSL\include;$(IncludePath) + $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib + C:\OpenSSL\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) @@ -120,7 +149,7 @@ true true true - + Level3 EditAndContinue Default @@ -138,7 +167,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -153,9 +182,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -172,7 +201,7 @@ MachineX86 - + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) @@ -185,7 +214,7 @@ true true true - + ..\lib\PocoCryptomtd.pdb Level3 EditAndContinue @@ -196,7 +225,7 @@ ..\lib\PocoCryptomtd.lib - + Disabled OnlyExplicitInline @@ -211,9 +240,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -221,7 +250,7 @@ ..\lib\PocoCryptomt.lib - + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) @@ -234,7 +263,7 @@ true true true - + ..\lib\PocoCryptomdd.pdb Level3 EditAndContinue @@ -245,7 +274,7 @@ ..\lib\PocoCryptomdd.lib - + Disabled OnlyExplicitInline @@ -260,10 +289,10 @@ true true true - + ..\lib\PocoCryptomd.pdb Level3 - + Default %(DisableSpecificWarnings) @@ -273,41 +302,41 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - + + + \ No newline at end of file diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj b/Crypto/testsuite/TestSuite_vs110.vcxproj index 214b511c5..6bd4eb42e 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,92 +32,122 @@ TestSuite Win32Proj - - + + Application Dynamic MultiByte v110 - + Application Dynamic MultiByte v110 - + Application Static MultiByte v110 - + Application Static MultiByte v110 - + Application Dynamic MultiByte v110 - + Application Dynamic MultiByte v110 - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite - + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + Disabled ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) @@ -130,7 +160,7 @@ true true true - + Level3 EditAndContinue Default @@ -147,7 +177,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -162,9 +192,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -179,7 +209,7 @@ MachineX86 - + Disabled ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) @@ -192,7 +222,7 @@ true true true - + Level3 EditAndContinue Default @@ -210,7 +240,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -225,9 +255,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -243,7 +273,7 @@ MachineX86 - + Disabled ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) @@ -256,7 +286,7 @@ true true true - + Level3 EditAndContinue Default @@ -273,7 +303,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -288,9 +318,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -306,18 +336,18 @@ - - - - + + + + - - - - - + + + + + - - - + + + \ No newline at end of file From f0ad6127aba0e0436ae9b62c1806e1c0a9c3c5ab Mon Sep 17 00:00:00 2001 From: Patrick White Date: Mon, 10 Dec 2012 23:46:52 -0500 Subject: [PATCH 073/165] Add tests for the new message length functionality for messageSource. --- Foundation/testsuite/src/PatternFormatterTest.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Foundation/testsuite/src/PatternFormatterTest.cpp b/Foundation/testsuite/src/PatternFormatterTest.cpp index ece3b8802..3cfccf97a 100644 --- a/Foundation/testsuite/src/PatternFormatterTest.cpp +++ b/Foundation/testsuite/src/PatternFormatterTest.cpp @@ -98,6 +98,21 @@ void PatternFormatterTest::testPatternFormatter() fmt.setProperty("pattern", "%[testParam] %p"); fmt.format(msg, result); assert (result == "Test Parameter Error"); + + result.clear(); + fmt.setProperty("pattern", "start %v[10] end"); + fmt.format(msg, result); + assert (result == "start TestSource end"); + + result.clear(); + fmt.setProperty("pattern", "start %v[12] end"); + fmt.format(msg, result); + assert (result == "start TestSource end"); + + result.clear(); + fmt.setProperty("pattern", "start %v[8] end"); + fmt.format(msg, result); + assert (result == "start stSource end"); } From 1b173da71704d394062282e531a2286d33187b75 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Tue, 11 Dec 2012 10:59:51 -0600 Subject: [PATCH 074/165] write entire input FIFO remove length argument from _fifoOut.write(), defaulting to the entire _fifoIn content write attempt (including any previous call "leftovers") --- Net/samples/EchoServer/src/EchoServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Net/samples/EchoServer/src/EchoServer.cpp b/Net/samples/EchoServer/src/EchoServer.cpp index ab5a56a04..bdf3fa735 100644 --- a/Net/samples/EchoServer/src/EchoServer.cpp +++ b/Net/samples/EchoServer/src/EchoServer.cpp @@ -133,7 +133,7 @@ public: { // receive bytes and transfer(echo) them to the output FIFO buffer int len = _socket.receiveBytes(_fifoIn); - _fifoIn.drain(_fifoOut.write(_fifoIn.buffer(), len)); + _fifoIn.drain(_fifoOut.write(_fifoIn.buffer())); } void onSocketWritable(const AutoPtr& pNf) From 1b14088283843d8ef1ec9084ce3a969b8540c3ed Mon Sep 17 00:00:00 2001 From: aleks-f Date: Tue, 11 Dec 2012 20:27:32 -0600 Subject: [PATCH 075/165] GH31: JSON implementation bug fixed GH #31: JSON implementation bug --- CHANGELOG | 1 + Foundation/include/Poco/Buffer.h | 5 ++--- JSON/include/Poco/JSON/Object.h | 4 ++-- JSON/testsuite/src/JSONTest.cpp | 36 +++++++++++++++++++++++++++++++- JSON/testsuite/src/JSONTest.h | 1 + 5 files changed, 41 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c9598fda1..ebb3f8d65 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ Release 1.5.0 (2012-12-17) - Android compile/build support (by Rangel Reale) - TypeHandler::prepare() now takes const-reference - fixed GH #27: Poco::URI::decode() doesn't properly handle '+' +- fixed GH #31: JSON implementation bug Release 1.5.0 (2012-10-14) ========================== diff --git a/Foundation/include/Poco/Buffer.h b/Foundation/include/Poco/Buffer.h index 4aedf38ec..3f72c87e1 100644 --- a/Foundation/include/Poco/Buffer.h +++ b/Foundation/include/Poco/Buffer.h @@ -51,9 +51,8 @@ namespace Poco { template class Buffer - /// A very simple buffer class that allocates a buffer of - /// a given type and size in the constructor and - /// deallocates the buffer in the destructor. + /// A buffer class that allocates a buffer of a given type and size + /// in the constructor and deallocates the buffer in the destructor. /// /// This class is useful everywhere where a temporary buffer /// is needed. diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h index 3e62bfec7..38fb610bb 100644 --- a/JSON/include/Poco/JSON/Object.h +++ b/JSON/include/Poco/JSON/Object.h @@ -161,7 +161,7 @@ inline bool Object::has(const std::string& key) const inline bool Object::isArray(const std::string& key) const { ValueMap::const_iterator it = _values.find(key); - return it != _values.end() || it->second.type() == typeid(Array::Ptr); + return it != _values.end() && it->second.type() == typeid(Array::Ptr); } @@ -175,7 +175,7 @@ inline bool Object::isNull(const std::string& key) const inline bool Object::isObject(const std::string& key) const { ValueMap::const_iterator it = _values.find(key); - return it != _values.end() || it->second.type() == typeid(Object::Ptr); + return it != _values.end() && it->second.type() == typeid(Object::Ptr); } diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp index 5fe906b73..89a0bf81e 100644 --- a/JSON/testsuite/src/JSONTest.cpp +++ b/JSON/testsuite/src/JSONTest.cpp @@ -366,8 +366,11 @@ void JSONTest::testObjectProperty() } assert(result.type() == typeid(Object::Ptr)); - + Object::Ptr object = result.extract(); + assert (object->isObject("test")); + assert (!object->isArray("test")); + Var test = object->get("test"); assert(test.type() == typeid(Object::Ptr)); object = test.extract(); @@ -379,6 +382,36 @@ void JSONTest::testObjectProperty() } +void JSONTest::testObjectArray() +{ + std::string json = "{ \"test\" : { \"test1\" : [1, 2, 3], \"test2\" : 4 } }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + Object::Ptr object = result.extract(); + assert(object->isObject("test")); + object = object->getObject("test"); + assert(!object->isObject("test1")); + assert(object->isArray("test1")); + assert(!object->isObject("test2")); + assert(!object->isArray("test2")); +} + + void JSONTest::testEmptyArray() { std::string json = "[]"; @@ -833,6 +866,7 @@ CppUnit::Test* JSONTest::suite() CppUnit_addTest(pSuite, JSONTest, testDouble2Property); CppUnit_addTest(pSuite, JSONTest, testDouble3Property); CppUnit_addTest(pSuite, JSONTest, testObjectProperty); + CppUnit_addTest(pSuite, JSONTest, testObjectArray); CppUnit_addTest(pSuite, JSONTest, testEmptyArray); CppUnit_addTest(pSuite, JSONTest, testNestedArray); CppUnit_addTest(pSuite, JSONTest, testNullElement); diff --git a/JSON/testsuite/src/JSONTest.h b/JSON/testsuite/src/JSONTest.h index 858197ae2..f9ee3ddd1 100644 --- a/JSON/testsuite/src/JSONTest.h +++ b/JSON/testsuite/src/JSONTest.h @@ -57,6 +57,7 @@ public: void testDouble2Property(); void testDouble3Property(); void testObjectProperty(); + void testObjectArray(); void testEmptyArray(); void testNestedArray(); void testNullElement(); From 25ea8ba735a6b4ad9ab608aeab3388dc904a7387 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Tue, 11 Dec 2012 21:39:20 -0600 Subject: [PATCH 076/165] SF542 SocketAddress() needs port-only constructor --- Net/include/Poco/Net/NetworkInterface.h | 3 --- Net/include/Poco/Net/SocketAddress.h | 12 ++++++++---- Net/src/SocketAddress.cpp | 6 ++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Net/include/Poco/Net/NetworkInterface.h b/Net/include/Poco/Net/NetworkInterface.h index 41d4f5526..bfbee2081 100644 --- a/Net/include/Poco/Net/NetworkInterface.h +++ b/Net/include/Poco/Net/NetworkInterface.h @@ -241,9 +241,6 @@ public: static NetworkInterface forIndex(unsigned index); /// Returns the NetworkInterface for the given interface index. - /// If an index of 0 is specified, a NetworkInterface instance - /// representing the default interface (empty name and - /// wildcard address) is returned. /// /// Throws an InterfaceNotFoundException if an interface /// with the given index does not exist (or IPv6 is not diff --git a/Net/include/Poco/Net/SocketAddress.h b/Net/include/Poco/Net/SocketAddress.h index ba4d3a9f1..c4c569bd4 100644 --- a/Net/include/Poco/Net/SocketAddress.h +++ b/Net/include/Poco/Net/SocketAddress.h @@ -64,16 +64,20 @@ public: /// Creates a wildcard (all zero) IPv4 SocketAddress. SocketAddress(const IPAddress& host, Poco::UInt16 port); - /// Creates a SocketAddress from an IP address and a port number. + /// Creates a SocketAddress from an IP address and given port number. + + SocketAddress(Poco::UInt16 port); + /// Creates a SocketAddress with unspecified (wildcard) IP address + /// and given port number. SocketAddress(const std::string& host, Poco::UInt16 port); - /// Creates a SocketAddress from an IP address and a port number. + /// Creates a SocketAddress from an IP address and given port number. /// /// The IP address must either be a domain name, or it must /// be in dotted decimal (IPv4) or hex string (IPv6) format. SocketAddress(const std::string& host, const std::string& port); - /// Creates a SocketAddress from an IP address and a + /// Creates a SocketAddress from an IP address and the /// service name or port number. /// /// The IP address must either be a domain name, or it must @@ -83,7 +87,7 @@ public: /// a service name. explicit SocketAddress(const std::string& hostAndPort); - /// Creates a SocketAddress from an IP address or host name and a + /// Creates a SocketAddress from an IP address or host name and the /// port number/service name. Host name/address and port number must /// be separated by a colon. In case of an IPv6 address, /// the address part must be enclosed in brackets. diff --git a/Net/src/SocketAddress.cpp b/Net/src/SocketAddress.cpp index f79a15fc9..fd0486df0 100644 --- a/Net/src/SocketAddress.cpp +++ b/Net/src/SocketAddress.cpp @@ -233,6 +233,12 @@ SocketAddress::SocketAddress(const IPAddress& addr, Poco::UInt16 port) } +SocketAddress::SocketAddress(Poco::UInt16 port) +{ + init(IPAddress(), port); +} + + SocketAddress::SocketAddress(const std::string& addr, Poco::UInt16 port) { init(addr, port); From 2b1de7e427892f0cd53178eb4e3cfc2cab7b73cf Mon Sep 17 00:00:00 2001 From: aleks-f Date: Tue, 11 Dec 2012 21:47:47 -0600 Subject: [PATCH 077/165] SF#215 Wrong return type in SocketConnector.h --- Net/include/Poco/Net/SocketConnector.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Net/include/Poco/Net/SocketConnector.h b/Net/include/Poco/Net/SocketConnector.h index 98adfe085..ae0369223 100644 --- a/Net/include/Poco/Net/SocketConnector.h +++ b/Net/include/Poco/Net/SocketConnector.h @@ -205,7 +205,7 @@ protected: return _pReactor; } - Socket& socket() + StreamSocket& socket() /// Returns a reference to the SocketConnector's socket. { return _socket; From e3d49fe766c0707fa1ecdcff56ecfa66ea940806 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Tue, 11 Dec 2012 22:00:56 -0600 Subject: [PATCH 078/165] Data::ODBC::SessionImpl.canTransact fails on Win7 SF #506: Data::ODBC::SessionImpl.canTransact fails on Win 7 --- Data/ODBC/src/SessionImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/ODBC/src/SessionImpl.cpp b/Data/ODBC/src/SessionImpl.cpp index a7b743d2d..91b704b58 100644 --- a/Data/ODBC/src/SessionImpl.cpp +++ b/Data/ODBC/src/SessionImpl.cpp @@ -218,7 +218,7 @@ bool SessionImpl::canTransact() if (ODBC_TXN_CAPABILITY_UNKNOWN == _canTransact) { SQLUSMALLINT ret; - checkError(Poco::Data::ODBC::SQLGetInfo(_db, SQL_TXN_CAPABLE, &ret, 0, 0), + checkError(Poco::Data::ODBC::SQLGetInfo(_db, SQL_TXN_CAPABLE, &ret, sizeof(ret), 0), "Failed to obtain transaction capability info."); _canTransact = (SQL_TC_NONE != ret) ? From ccd66358b9c503a7499845f6bb4739119b1f9b14 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 11 Dec 2012 21:19:34 -0600 Subject: [PATCH 079/165] fixed SF #597: Configure script ignores cflags --- CHANGELOG | 1 + configure | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index ebb3f8d65..96c009cff 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ Release 1.5.0 (2012-12-17) - TypeHandler::prepare() now takes const-reference - fixed GH #27: Poco::URI::decode() doesn't properly handle '+' - fixed GH #31: JSON implementation bug +- fixed SF #597: Configure script ignores cflags Release 1.5.0 (2012-10-14) ========================== diff --git a/configure b/configure index 8951f982b..df4da5781 100755 --- a/configure +++ b/configure @@ -150,7 +150,7 @@ while [ $# -ge 1 ]; do odbcinclude="`echo ${1} | awk '{print substr($0,16)}'`" ;; --cflags=*) - cflags="`echo ${1} | awk '{print substr($0,10)}'`" ;; + flags="`echo ${1} | awk '{print substr($0,10)}'`" ;; --no-samples) samples="" ;; From 7529891713a89d13f87b6bfef3a0cd183377753c Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 11 Dec 2012 21:25:37 -0600 Subject: [PATCH 080/165] #593 Poco 1.5.0 on FreeBSD: cannot find -ldl --- CHANGELOG | 1 + Data/ODBC/testsuite/Makefile | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 96c009cff..7ff309036 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ Release 1.5.0 (2012-12-17) - fixed GH #27: Poco::URI::decode() doesn't properly handle '+' - fixed GH #31: JSON implementation bug - fixed SF #597: Configure script ignores cflags +- fixed SF #593: Poco 1.5.0 on FreeBSD: cannot find -ldl Release 1.5.0 (2012-10-14) ========================== diff --git a/Data/ODBC/testsuite/Makefile b/Data/ODBC/testsuite/Makefile index e48c7e4db..2fe7e4340 100644 --- a/Data/ODBC/testsuite/Makefile +++ b/Data/ODBC/testsuite/Makefile @@ -20,7 +20,10 @@ include $(POCO_BASE)/Data/ODBC/ODBC.make # Note: # # Do not change linking order or move this line up, these libs have to be linked in this order. # ################################################################################################## -SYSLIBS += -lltdl -ldl +SYSLIBS += -lltdl +ifneq ($(POCO_CONFIG),FreeBSD) +SYSLIBS += -ldl +endif objects = ODBCTestSuite Driver \ ODBCDB2Test ODBCMySQLTest ODBCOracleTest ODBCPostgreSQLTest \ From 560908b7151fbaa42399d78e3aa45fdc663f8f8e Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 11 Dec 2012 22:29:17 -0600 Subject: [PATCH 081/165] SF #97 fix c++0x / clang++ bugs --- CHANGELOG | 3 +++ Data/SQLite/include/Poco/Data/SQLite/Extractor.h | 2 ++ Data/include/Poco/Data/LOB.h | 2 ++ Data/include/Poco/Data/RowIterator.h | 2 ++ Data/include/Poco/Data/Session.h | 2 ++ Data/include/Poco/Data/Statement.h | 2 ++ 6 files changed, 13 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7ff309036..cddb07ff0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,9 @@ Release 1.5.0 (2012-12-17) - fixed GH #31: JSON implementation bug - fixed SF #597: Configure script ignores cflags - fixed SF #593: Poco 1.5.0 on FreeBSD: cannot find -ldl +- added SF #542: SocketAddress() needs port-only constructor +- fixed SF #215: Wrong return type in SocketConnector.h +- applied SF Patch #97: fix c++0x / clang++ bugs Release 1.5.0 (2012-10-14) ========================== diff --git a/Data/SQLite/include/Poco/Data/SQLite/Extractor.h b/Data/SQLite/include/Poco/Data/SQLite/Extractor.h index 30ded04fe..d95dd184e 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Extractor.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Extractor.h @@ -48,6 +48,8 @@ #include "Poco/Data/Constants.h" #include "Poco/Data/Date.h" #include "Poco/Data/Time.h" +#include "Poco/Data/Date.h" +#include "Poco/Data/Time.h" #include "Poco/Any.h" #include "Poco/DynamicAny.h" #include "sqlite3.h" diff --git a/Data/include/Poco/Data/LOB.h b/Data/include/Poco/Data/LOB.h index 456fe676c..e2b1f7392 100644 --- a/Data/include/Poco/Data/LOB.h +++ b/Data/include/Poco/Data/LOB.h @@ -45,6 +45,7 @@ #include "Poco/Dynamic/VarHolder.h" #include "Poco/Exception.h" #include +#include namespace Poco { @@ -221,6 +222,7 @@ inline void swap(LOB& b1, LOB& b2) namespace std { + using std::swap; template<> inline void swap(Poco::Data::BLOB& b1, Poco::Data::BLOB& b2) diff --git a/Data/include/Poco/Data/RowIterator.h b/Data/include/Poco/Data/RowIterator.h index 91c42e18d..047cb6e49 100644 --- a/Data/include/Poco/Data/RowIterator.h +++ b/Data/include/Poco/Data/RowIterator.h @@ -44,6 +44,7 @@ #include "Poco/Data/Row.h" #include "Poco/Dynamic/Var.h" #include +#include namespace Poco { @@ -158,6 +159,7 @@ inline bool RowIterator::operator != (const RowIterator& other) const namespace std { + using std::swap; template<> inline void swap(Poco::Data::RowIterator& s1, Poco::Data::RowIterator& s2) diff --git a/Data/include/Poco/Data/Session.h b/Data/include/Poco/Data/Session.h index 16b0abf99..1fbe6046a 100644 --- a/Data/include/Poco/Data/Session.h +++ b/Data/include/Poco/Data/Session.h @@ -47,6 +47,7 @@ #include "Poco/Data/Binding.h" #include "Poco/AutoPtr.h" #include "Poco/Any.h" +#include namespace Poco { @@ -502,6 +503,7 @@ inline void swap(Session& s1, Session& s2) namespace std { + using std::swap; template<> inline void swap(Poco::Data::Session& s1, Poco::Data::Session& s2) diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h index f95d52057..d983dda05 100644 --- a/Data/include/Poco/Data/Statement.h +++ b/Data/include/Poco/Data/Statement.h @@ -51,6 +51,7 @@ #include "Poco/ActiveMethod.h" #include "Poco/ActiveResult.h" #include "Poco/Format.h" +#include namespace Poco { @@ -834,6 +835,7 @@ inline void swap(Statement& s1, Statement& s2) namespace std { + using std::swap; template<> inline void swap(Poco::Data::Statement& s1, Poco::Data::Statement& s2) From 98c3709b5955d68070101df5ae93716c9ae26f08 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Tue, 11 Dec 2012 23:07:38 -0600 Subject: [PATCH 082/165] SF #111 FTP Client logging apparently code that never got transferred from svn trunk (see https://sourceforge.net/p/poco/patches/111/) --- Net/include/Poco/Net/FTPClientSession.h | 56 +++++- Net/src/FTPClientSession.cpp | 222 +++++++++++++++------ Net/testsuite/src/FTPClientSessionTest.cpp | 87 +++++++- Net/testsuite/src/FTPClientSessionTest.h | 16 +- Net/testsuite/src/FTPClientTestSuite.cpp | 2 +- Net/testsuite/src/FTPClientTestSuite.h | 2 +- 6 files changed, 303 insertions(+), 82 deletions(-) diff --git a/Net/include/Poco/Net/FTPClientSession.h b/Net/include/Poco/Net/FTPClientSession.h index 4eeae4581..d177b672a 100644 --- a/Net/include/Poco/Net/FTPClientSession.h +++ b/Net/include/Poco/Net/FTPClientSession.h @@ -1,7 +1,7 @@ // // FTPClientSession.h // -// $Id: //poco/1.4/Net/include/Poco/Net/FTPClientSession.h#1 $ +// $Id: //poco/svn/Net/include/Poco/Net/FTPClientSession.h#2 $ // // Library: Net // Package: FTP @@ -80,15 +80,24 @@ public: TYPE_BINARY // TYPE I (Image) }; + FTPClientSession(); + /// Creates an FTPClientSession. + /// + /// Passive mode will be used for data transfers. + explicit FTPClientSession(const StreamSocket& socket); /// Creates an FTPClientSession using the given /// connected socket for the control connection. /// /// Passive mode will be used for data transfers. - FTPClientSession(const std::string& host, Poco::UInt16 port = FTP_PORT); + FTPClientSession(const std::string& host, + Poco::UInt16 port = FTP_PORT, + const std::string& username = "", + const std::string& password = ""); /// Creates an FTPClientSession using a socket connected - /// to the given host and port. + /// to the given host and port. If username is supplied, + /// login is attempted. /// /// Passive mode will be used for data transfers. @@ -112,6 +121,13 @@ public: bool getPassive() const; /// Returns true iff passive mode is enabled for this connection. + void open(const std::string& host, + Poco::UInt16 port, + const std::string& username = "", + const std::string& password = ""); + /// Opens the FTP connection to the given host and port. + /// If username is supplied, login is attempted. + void login(const std::string& username, const std::string& password); /// Authenticates the user against the FTP server. Must be /// called before any other commands (except QUIT) can be sent. @@ -122,8 +138,10 @@ public: /// Throws a FTPException in case of a FTP-specific error, or a /// NetException in case of a general network communication failure. + void logout(); + void close(); - /// Sends a QUIT command and closes the connection to the server. + /// Sends a QUIT command and closes the connection to the server. /// /// Throws a FTPException in case of a FTP-specific error, or a /// NetException in case of a general network communication failure. @@ -300,6 +318,12 @@ public: /// Sends the given command verbatim to the server /// and waits for a response. + bool isOpen() const; + /// Returns true if the connection with FTP server is opened. + + bool isLoggedIn() const; + /// Returns true if the session is logged in. + protected: enum StatusClass { @@ -334,16 +358,18 @@ protected: void endTransfer(); private: - FTPClientSession(); FTPClientSession(const FTPClientSession&); FTPClientSession& operator = (const FTPClientSession&); - DialogSocket _controlSocket; + std::string _host; + Poco::UInt16 _port; + DialogSocket* _pControlSocket; SocketStream* _pDataStream; - bool _passiveMode; + bool _passiveMode; FileType _fileType; - bool _supports1738; - bool _isOpen; + bool _supports1738; + bool _serverReady; + bool _isLoggedIn; Poco::Timespan _timeout; }; @@ -381,6 +407,18 @@ inline bool FTPClientSession::isPermanentNegative(int status) } +inline bool FTPClientSession::isOpen() const +{ + return _pControlSocket != 0; +} + + +inline bool FTPClientSession::isLoggedIn() const +{ + return _isLoggedIn; +} + + } } // namespace Poco::Net diff --git a/Net/src/FTPClientSession.cpp b/Net/src/FTPClientSession.cpp index 700984351..ea57a7e9d 100644 --- a/Net/src/FTPClientSession.cpp +++ b/Net/src/FTPClientSession.cpp @@ -1,7 +1,7 @@ // // FTPClientSession.cpp // -// $Id: //poco/1.4/Net/src/FTPClientSession.cpp#1 $ +// $Id: //poco/svn/Net/src/FTPClientSession.cpp#2 $ // // Library: Net // Package: FTP @@ -50,48 +50,72 @@ namespace Poco { namespace Net { -FTPClientSession::FTPClientSession(const StreamSocket& socket): - _controlSocket(socket), +FTPClientSession::FTPClientSession(): + _port(0), + _pControlSocket(0), _pDataStream(0), _passiveMode(true), _fileType(TYPE_BINARY), _supports1738(true), - _isOpen(true), + _serverReady(false), + _isLoggedIn(false), _timeout(DEFAULT_TIMEOUT) { - _controlSocket.setReceiveTimeout(_timeout); } -FTPClientSession::FTPClientSession(const std::string& host, Poco::UInt16 port): - _controlSocket(SocketAddress(host, port)), +FTPClientSession::FTPClientSession(const StreamSocket& socket): + _host(socket.address().host().toString()), + _port(socket.address().port()), + _pControlSocket(new DialogSocket(socket)), _pDataStream(0), _passiveMode(true), _fileType(TYPE_BINARY), _supports1738(true), - _isOpen(true), + _serverReady(false), + _isLoggedIn(false), _timeout(DEFAULT_TIMEOUT) { - _controlSocket.setReceiveTimeout(_timeout); + _pControlSocket->setReceiveTimeout(_timeout); } +FTPClientSession::FTPClientSession(const std::string& host, + Poco::UInt16 port, + const std::string& username, + const std::string& password): + _host(host), + _port(port), + _pControlSocket(new DialogSocket(SocketAddress(host, port))), + _pDataStream(0), + _passiveMode(true), + _fileType(TYPE_BINARY), + _supports1738(true), + _serverReady(false), + _isLoggedIn(false), + _timeout(DEFAULT_TIMEOUT) + { + if (!username.empty()) + login(username, password); + else + _pControlSocket->setReceiveTimeout(_timeout); + } + + FTPClientSession::~FTPClientSession() -{ - try { - close(); - } - catch (...) - { - } + try { close(); } + catch (...) { } } void FTPClientSession::setTimeout(const Poco::Timespan& timeout) { + if (!isOpen()) + throw FTPException("Connection is closed."); + _timeout = timeout; - _controlSocket.setReceiveTimeout(timeout); + _pControlSocket->setReceiveTimeout(timeout); } @@ -114,35 +138,78 @@ bool FTPClientSession::getPassive() const } +void FTPClientSession::open(const std::string& host, + Poco::UInt16 port, + const std::string& username, + const std::string& password) +{ + _host = host; + _port = port; + if (!username.empty()) + login(username, password); + else + { + _pControlSocket = new DialogSocket(SocketAddress(_host, _port)); + _pControlSocket->setReceiveTimeout(_timeout); + } +} + + void FTPClientSession::login(const std::string& username, const std::string& password) { + if (_isLoggedIn) logout(); + + int status = FTP_POSITIVE_COMPLETION * 100; std::string response; - int status = _controlSocket.receiveStatusMessage(response); - if (!isPositiveCompletion(status)) throw FTPException("Cannot login to server", response, status); + if (!_pControlSocket) + { + _pControlSocket = new DialogSocket(SocketAddress(_host, _port)); + _pControlSocket->setReceiveTimeout(_timeout); + } + + if (!_serverReady) + { + status = _pControlSocket->receiveStatusMessage(response); + if (!isPositiveCompletion(status)) + throw FTPException("Cannot login to server", response, status); + + _serverReady = true; + } + status = sendCommand("USER", username, response); if (isPositiveIntermediate(status)) status = sendCommand("PASS", password, response); - if (!isPositiveCompletion(status)) throw FTPException("Login denied", response, status); + if (!isPositiveCompletion(status)) + throw FTPException("Login denied", response, status); + setFileType(_fileType); + _isLoggedIn = true; +} + + +void FTPClientSession::logout() + { + if (!isOpen()) + throw FTPException("Connection is closed."); + + if (_isLoggedIn) + { + try { endTransfer(); } + catch (...) { } + std::string response; + sendCommand("QUIT", response); + _isLoggedIn = false; + } } void FTPClientSession::close() { - if (_isOpen) - { - try - { - endTransfer(); - } - catch (...) - { - } - std::string response; - sendCommand("QUIT", response); - _controlSocket.close(); - _isOpen = false; - } + logout(); + _pControlSocket->close(); + delete _pControlSocket; + _pControlSocket = 0; + _serverReady = false; } @@ -176,7 +243,8 @@ void FTPClientSession::setWorkingDirectory(const std::string& path) { std::string response; int status = sendCommand("CWD", path, response); - if (!isPositiveCompletion(status)) throw FTPException("Cannot change directory", response, status); + if (!isPositiveCompletion(status)) + throw FTPException("Cannot change directory", response, status); } @@ -195,7 +263,8 @@ void FTPClientSession::cdup() { std::string response; int status = sendCommand("CDUP", response); - if (!isPositiveCompletion(status)) throw FTPException("Cannot change directory", response, status); + if (!isPositiveCompletion(status)) + throw FTPException("Cannot change directory", response, status); } @@ -203,9 +272,11 @@ void FTPClientSession::rename(const std::string& oldName, const std::string& new { std::string response; int status = sendCommand("RNFR", oldName, response); - if (!isPositiveIntermediate(status)) throw FTPException(std::string("Cannot rename ") + oldName, response, status); + if (!isPositiveIntermediate(status)) + throw FTPException(std::string("Cannot rename ") + oldName, response, status); status = sendCommand("RNTO", newName, response); - if (!isPositiveCompletion(status)) throw FTPException(std::string("Cannot rename to ") + newName, response, status); + if (!isPositiveCompletion(status)) + throw FTPException(std::string("Cannot rename to ") + newName, response, status); } @@ -213,7 +284,8 @@ void FTPClientSession::remove(const std::string& path) { std::string response; int status = sendCommand("DELE", path, response); - if (!isPositiveCompletion(status)) throw FTPException(std::string("Cannot remove " + path), response, status); + if (!isPositiveCompletion(status)) + throw FTPException(std::string("Cannot remove " + path), response, status); } @@ -221,7 +293,8 @@ void FTPClientSession::createDirectory(const std::string& path) { std::string response; int status = sendCommand("MKD", path, response); - if (!isPositiveCompletion(status)) throw FTPException(std::string("Cannot create directory ") + path, response, status); + if (!isPositiveCompletion(status)) + throw FTPException(std::string("Cannot create directory ") + path, response, status); } @@ -229,12 +302,16 @@ void FTPClientSession::removeDirectory(const std::string& path) { std::string response; int status = sendCommand("RMD", path, response); - if (!isPositiveCompletion(status)) throw FTPException(std::string("Cannot remove directory ") + path, response, status); + if (!isPositiveCompletion(status)) + throw FTPException(std::string("Cannot remove directory ") + path, response, status); } std::istream& FTPClientSession::beginDownload(const std::string& path) { + if (!isOpen()) + throw FTPException("Connection is closed."); + delete _pDataStream; _pDataStream = 0; _pDataStream = new SocketStream(establishDataConnection("RETR", path)); @@ -250,6 +327,9 @@ void FTPClientSession::endDownload() std::ostream& FTPClientSession::beginUpload(const std::string& path) { + if (!isOpen()) + throw FTPException("Connection is closed."); + delete _pDataStream; _pDataStream = 0; _pDataStream = new SocketStream(establishDataConnection("STOR", path)); @@ -265,6 +345,9 @@ void FTPClientSession::endUpload() std::istream& FTPClientSession::beginList(const std::string& path, bool extended) { + if (!isOpen()) + throw FTPException("Connection is closed."); + delete _pDataStream; _pDataStream = 0; _pDataStream = new SocketStream(establishDataConnection(extended ? "LIST" : "NLST", path)); @@ -280,27 +363,37 @@ void FTPClientSession::endList() void FTPClientSession::abort() { - _controlSocket.sendByte(DialogSocket::TELNET_IP); - _controlSocket.synch(); + if (!isOpen()) + throw FTPException("Connection is closed."); + + _pControlSocket->sendByte(DialogSocket::TELNET_IP); + _pControlSocket->synch(); std::string response; int status = sendCommand("ABOR", response); if (status == 426) - status = _controlSocket.receiveStatusMessage(response); - if (status != 226) throw FTPException("Cannot abort transfer", response, status); + status = _pControlSocket->receiveStatusMessage(response); + if (status != 226) + throw FTPException("Cannot abort transfer", response, status); } int FTPClientSession::sendCommand(const std::string& command, std::string& response) { - _controlSocket.sendMessage(command); - return _controlSocket.receiveStatusMessage(response); + if (!isOpen()) + throw FTPException("Connection is closed."); + + _pControlSocket->sendMessage(command); + return _pControlSocket->receiveStatusMessage(response); } int FTPClientSession::sendCommand(const std::string& command, const std::string& arg, std::string& response) { - _controlSocket.sendMessage(command, arg); - return _controlSocket.receiveStatusMessage(response); + if (!isOpen()) + throw FTPException("Connection is closed."); + + _pControlSocket->sendMessage(command, arg); + return _pControlSocket->receiveStatusMessage(response); } @@ -329,23 +422,24 @@ std::string FTPClientSession::extractPath(const std::string& response) StreamSocket FTPClientSession::establishDataConnection(const std::string& command, const std::string& arg) { - StreamSocket ss; if (_passiveMode) - ss = passiveDataConnection(command, arg); + return passiveDataConnection(command, arg); else - ss = activeDataConnection(command, arg); - ss.setReceiveTimeout(_timeout); - return ss; + return activeDataConnection(command, arg); } StreamSocket FTPClientSession::activeDataConnection(const std::string& command, const std::string& arg) { - ServerSocket server(SocketAddress(_controlSocket.address().host(), 0)); + if (!isOpen()) + throw FTPException("Connection is closed."); + + ServerSocket server(SocketAddress(_pControlSocket->address().host(), 0)); sendPortCommand(server.address()); std::string response; int status = sendCommand(command, arg, response); - if (!isPositivePreliminary(status)) throw FTPException(command + " command failed", response, status); + if (!isPositivePreliminary(status)) + throw FTPException(command + " command failed", response, status); if (server.poll(_timeout, Socket::SELECT_READ)) return server.acceptConnection(); else @@ -359,7 +453,8 @@ StreamSocket FTPClientSession::passiveDataConnection(const std::string& command, StreamSocket sock(sa); std::string response; int status = sendCommand(command, arg, response); - if (!isPositivePreliminary(status)) throw FTPException(command + " command failed", response, status); + if (!isPositivePreliminary(status)) + throw FTPException(command + " command failed", response, status); return sock; } @@ -426,7 +521,8 @@ void FTPClientSession::sendPORT(const SocketAddress& addr) arg += NumberFormatter::format(port % 256); std::string response; int status = sendCommand("PORT", arg, response); - if (!isPositiveCompletion(status)) throw FTPException("PORT command failed", response, status); + if (!isPositiveCompletion(status)) + throw FTPException("PORT command failed", response, status); } @@ -451,7 +547,8 @@ void FTPClientSession::sendPASV(SocketAddress& addr) { std::string response; int status = sendCommand("PASV", response); - if (!isPositiveCompletion(status)) throw FTPException("PASV command failed", response, status); + if (!isPositiveCompletion(status)) + throw FTPException("PASV command failed", response, status); parseAddress(response, addr); } @@ -492,7 +589,7 @@ void FTPClientSession::parseExtAddress(const std::string& str, SocketAddress& ad if (it != end && *it == delim) ++it; Poco::UInt16 port = 0; while (it != end && Poco::Ascii::isDigit(*it)) { port *= 10; port += *it++ - '0'; } - addr = SocketAddress(_controlSocket.peerAddress().host(), port); + addr = SocketAddress(_pControlSocket->peerAddress().host(), port); } @@ -503,8 +600,9 @@ void FTPClientSession::endTransfer() delete _pDataStream; _pDataStream = 0; std::string response; - int status = _controlSocket.receiveStatusMessage(response); - if (!isPositiveCompletion(status)) throw FTPException("Data transfer failed", response, status); + int status = _pControlSocket->receiveStatusMessage(response); + if (!isPositiveCompletion(status)) + throw FTPException("Data transfer failed", response, status); } } diff --git a/Net/testsuite/src/FTPClientSessionTest.cpp b/Net/testsuite/src/FTPClientSessionTest.cpp index 7d80eb8bb..d49bbc5d0 100644 --- a/Net/testsuite/src/FTPClientSessionTest.cpp +++ b/Net/testsuite/src/FTPClientSessionTest.cpp @@ -1,7 +1,7 @@ // // FTPClientSessionTest.cpp // -// $Id: //poco/1.4/Net/testsuite/src/FTPClientSessionTest.cpp#1 $ +// $Id: //poco/svn/Net/testsuite/src/FTPClientSessionTest.cpp#2 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. @@ -93,14 +93,11 @@ FTPClientSessionTest::~FTPClientSessionTest() } -void FTPClientSessionTest::testLogin() +void FTPClientSessionTest::login(DialogServer& server, FTPClientSession& session) { - DialogServer server; - server.addResponse("220 localhost FTP ready"); server.addResponse("331 Password required"); server.addResponse("230 Welcome"); server.addResponse("200 Type set to I"); - FTPClientSession session("localhost", server.port()); session.login("user", "password"); std::string cmd = server.popCommand(); assert (cmd == "USER user"); @@ -110,12 +107,86 @@ void FTPClientSessionTest::testLogin() assert (cmd == "TYPE I"); assert (session.getFileType() == FTPClientSession::TYPE_BINARY); - +} + + +void FTPClientSessionTest::testLogin1() +{ + DialogServer server; + server.addResponse("220 localhost FTP ready"); + FTPClientSession session("localhost", server.port()); + assert (session.isOpen()); + assert (!session.isLoggedIn()); + login(server, session); + assert (session.isOpen()); + assert (session.isLoggedIn()); + server.addResponse("221 Good Bye"); + session.logout(); + assert (session.isOpen()); + assert (!session.isLoggedIn()); + + server.clearCommands(); + server.clearResponses(); + login(server, session); + assert (session.isOpen()); + assert (session.isLoggedIn()); server.addResponse("221 Good Bye"); session.close(); + assert (!session.isOpen()); + assert (!session.isLoggedIn()); } +void FTPClientSessionTest::testLogin2() +{ + DialogServer server; + server.addResponse("220 localhost FTP ready"); + server.addResponse("331 Password required"); + server.addResponse("230 Welcome"); + server.addResponse("200 Type set to I"); + FTPClientSession session("localhost", server.port(), "user", "password"); + assert (session.isOpen()); + assert (session.isLoggedIn()); + server.addResponse("221 Good Bye"); + session.close(); + assert (!session.isOpen()); + assert (!session.isLoggedIn()); + + server.clearCommands(); + server.clearResponses(); + server.addResponse("220 localhost FTP ready"); + server.addResponse("331 Password required"); + server.addResponse("230 Welcome"); + server.addResponse("200 Type set to I"); + session.open("localhost", server.port(), "user", "password"); + assert (session.isOpen()); + assert (session.isLoggedIn()); + server.addResponse("221 Good Bye"); + session.close(); + assert (!session.isOpen()); + assert (!session.isLoggedIn()); +} + + +void FTPClientSessionTest::testLogin3() +{ + DialogServer server; + server.addResponse("220 localhost FTP ready"); + server.addResponse("331 Password required"); + server.addResponse("230 Welcome"); + server.addResponse("200 Type set to I"); + FTPClientSession session; + assert (!session.isOpen()); + assert (!session.isLoggedIn()); + session.open("localhost", server.port(), "user", "password"); + server.addResponse("221 Good Bye"); + session.close(); + assert (!session.isOpen()); + assert (!session.isLoggedIn()); +} + + + void FTPClientSessionTest::testLoginFailed1() { DialogServer server; @@ -535,7 +606,9 @@ CppUnit::Test* FTPClientSessionTest::suite() { CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("FTPClientSessionTest"); - CppUnit_addTest(pSuite, FTPClientSessionTest, testLogin); + CppUnit_addTest(pSuite, FTPClientSessionTest, testLogin1); + CppUnit_addTest(pSuite, FTPClientSessionTest, testLogin2); + CppUnit_addTest(pSuite, FTPClientSessionTest, testLogin3); CppUnit_addTest(pSuite, FTPClientSessionTest, testLoginFailed1); CppUnit_addTest(pSuite, FTPClientSessionTest, testLoginFailed2); CppUnit_addTest(pSuite, FTPClientSessionTest, testCommands); diff --git a/Net/testsuite/src/FTPClientSessionTest.h b/Net/testsuite/src/FTPClientSessionTest.h index e73eb0eba..aa6f62aaa 100644 --- a/Net/testsuite/src/FTPClientSessionTest.h +++ b/Net/testsuite/src/FTPClientSessionTest.h @@ -1,7 +1,7 @@ // // FTPClientSessionTest.h // -// $Id: //poco/1.4/Net/testsuite/src/FTPClientSessionTest.h#1 $ +// $Id: //poco/svn/Net/testsuite/src/FTPClientSessionTest.h#2 $ // // Definition of the FTPClientSessionTest class. // @@ -40,13 +40,24 @@ #include "CppUnit/TestCase.h" +namespace Poco { +namespace Net { + +class FTPClientSession; + +} } + +class DialogServer; + class FTPClientSessionTest: public CppUnit::TestCase { public: FTPClientSessionTest(const std::string& name); ~FTPClientSessionTest(); - void testLogin(); + void testLogin1(); + void testLogin2(); + void testLogin3(); void testLoginFailed1(); void testLoginFailed2(); void testCommands(); @@ -63,6 +74,7 @@ public: static CppUnit::Test* suite(); private: + void login(DialogServer& server, Poco::Net::FTPClientSession& session); }; diff --git a/Net/testsuite/src/FTPClientTestSuite.cpp b/Net/testsuite/src/FTPClientTestSuite.cpp index 6bf5a7f03..198e2aac1 100644 --- a/Net/testsuite/src/FTPClientTestSuite.cpp +++ b/Net/testsuite/src/FTPClientTestSuite.cpp @@ -1,7 +1,7 @@ // // FTPClientTestSuite.cpp // -// $Id: //poco/1.4/Net/testsuite/src/FTPClientTestSuite.cpp#1 $ +// $Id: //poco/svn/Net/testsuite/src/FTPClientTestSuite.cpp#2 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/FTPClientTestSuite.h b/Net/testsuite/src/FTPClientTestSuite.h index ecb7ace85..262a91c3f 100644 --- a/Net/testsuite/src/FTPClientTestSuite.h +++ b/Net/testsuite/src/FTPClientTestSuite.h @@ -1,7 +1,7 @@ // // FTPClientTestSuite.h // -// $Id: //poco/1.4/Net/testsuite/src/FTPClientTestSuite.h#1 $ +// $Id: //poco/svn/Net/testsuite/src/FTPClientTestSuite.h#2 $ // // Definition of the FTPClientTestSuite class. // From ef9cda6666faf411e42a9c56f5e48c38094fe6db Mon Sep 17 00:00:00 2001 From: aleks-f Date: Wed, 12 Dec 2012 23:02:20 -0600 Subject: [PATCH 083/165] GH #26: Cannot compile on gcc GH #26: Cannot compile on gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3 using compiler flag pedantic --- CppUnit/include/CppUnit/CppUnit.h | 6 +++++- Crypto/include/Poco/Crypto/Crypto.h | 6 +++++- Data/MySQL/include/Poco/Data/MySQL/MySQL.h | 6 +++++- Data/ODBC/include/Poco/Data/ODBC/ODBC.h | 6 +++++- Data/SQLite/include/Poco/Data/SQLite/SQLite.h | 6 +++++- Data/include/Poco/Data/Data.h | 6 +++++- Foundation/include/Poco/Foundation.h | 6 +++++- JSON/include/Poco/JSON/JSON.h | 6 +++++- Net/include/Poco/Net/Net.h | 6 +++++- NetSSL_OpenSSL/include/Poco/Net/NetSSL.h | 6 +++++- PDF/include/Poco/PDF/PDF.h | 6 +++++- Util/include/Poco/Util/Util.h | 6 +++++- XML/include/Poco/XML/XML.h | 6 +++++- Zip/include/Poco/Zip/Zip.h | 6 +++++- 14 files changed, 70 insertions(+), 14 deletions(-) diff --git a/CppUnit/include/CppUnit/CppUnit.h b/CppUnit/include/CppUnit/CppUnit.h index e86535a2e..57583bc8b 100644 --- a/CppUnit/include/CppUnit/CppUnit.h +++ b/CppUnit/include/CppUnit/CppUnit.h @@ -37,7 +37,11 @@ #if !defined(CppUnit_API) - #define CppUnit_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define CppUnit_API __attribute__ ((visibility ("default"))) + #else + #define CppUnit_API + #endif #endif diff --git a/Crypto/include/Poco/Crypto/Crypto.h b/Crypto/include/Poco/Crypto/Crypto.h index 792eff1aa..6f2ac0f1e 100644 --- a/Crypto/include/Poco/Crypto/Crypto.h +++ b/Crypto/include/Poco/Crypto/Crypto.h @@ -90,7 +90,11 @@ enum RSAPaddingMode #if !defined(Crypto_API) - #define Crypto_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define Crypto_API __attribute__ ((visibility ("default"))) + #else + #define Crypto_API + #endif #endif diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h index 8a99f1b64..10e33075d 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h +++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h @@ -61,7 +61,11 @@ #if !defined(MySQL_API) - #define MySQL_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define MySQL_API __attribute__ ((visibility ("default"))) + #else + #define MySQL_API + #endif #endif diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBC.h b/Data/ODBC/include/Poco/Data/ODBC/ODBC.h index 8500e4ecc..889877113 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/ODBC.h +++ b/Data/ODBC/include/Poco/Data/ODBC/ODBC.h @@ -66,7 +66,11 @@ #if !defined(ODBC_API) - #define ODBC_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define ODBC_API __attribute__ ((visibility ("default"))) + #else + #define ODBC_API + #endif #endif diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLite.h b/Data/SQLite/include/Poco/Data/SQLite/SQLite.h index b9b9fa2e8..a971d57a7 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/SQLite.h +++ b/Data/SQLite/include/Poco/Data/SQLite/SQLite.h @@ -63,7 +63,11 @@ #if !defined(SQLite_API) - #define SQLite_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define SQLite_API __attribute__ ((visibility ("default"))) + #else + #define SQLite_API + #endif #endif diff --git a/Data/include/Poco/Data/Data.h b/Data/include/Poco/Data/Data.h index 0b8005a8e..b473149a3 100644 --- a/Data/include/Poco/Data/Data.h +++ b/Data/include/Poco/Data/Data.h @@ -63,7 +63,11 @@ #if !defined(Data_API) - #define Data_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define Data_API __attribute__ ((visibility ("default"))) + #else + #define Data_API + #endif #endif diff --git a/Foundation/include/Poco/Foundation.h b/Foundation/include/Poco/Foundation.h index 3a062d8b7..65998ba7d 100644 --- a/Foundation/include/Poco/Foundation.h +++ b/Foundation/include/Poco/Foundation.h @@ -76,7 +76,11 @@ #if !defined(Foundation_API) - #define Foundation_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define Foundation_API __attribute__ ((visibility ("default"))) + #else + #define Foundation_API + #endif #endif diff --git a/JSON/include/Poco/JSON/JSON.h b/JSON/include/Poco/JSON/JSON.h index 205229d50..1373429b6 100644 --- a/JSON/include/Poco/JSON/JSON.h +++ b/JSON/include/Poco/JSON/JSON.h @@ -63,7 +63,11 @@ #if !defined(JSON_API) - #define JSON_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define JSON_API __attribute__ ((visibility ("default"))) + #else + #define JSON_API + #endif #endif diff --git a/Net/include/Poco/Net/Net.h b/Net/include/Poco/Net/Net.h index 943433955..89355a3f0 100644 --- a/Net/include/Poco/Net/Net.h +++ b/Net/include/Poco/Net/Net.h @@ -63,7 +63,11 @@ #if !defined(Net_API) - #define Net_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define Net_API __attribute__ ((visibility ("default"))) + #else + #define Net_API + #endif #endif diff --git a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h index e04e4e5ad..ad0b8d182 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h +++ b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h @@ -63,7 +63,11 @@ #if !defined(NetSSL_API) - #define NetSSL_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define NetSSL_API __attribute__ ((visibility ("default"))) + #else + #define NetSSL_API + #endif #endif diff --git a/PDF/include/Poco/PDF/PDF.h b/PDF/include/Poco/PDF/PDF.h index 86670d220..f4b6b5494 100644 --- a/PDF/include/Poco/PDF/PDF.h +++ b/PDF/include/Poco/PDF/PDF.h @@ -72,7 +72,11 @@ #if !defined(PDF_API) - #define PDF_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define PDF_API __attribute__ ((visibility ("default"))) + #else + #define PDF_API + #endif #endif diff --git a/Util/include/Poco/Util/Util.h b/Util/include/Poco/Util/Util.h index 2abceede4..4c54e5972 100644 --- a/Util/include/Poco/Util/Util.h +++ b/Util/include/Poco/Util/Util.h @@ -63,7 +63,11 @@ #if !defined(Util_API) - #define Util_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define Util_API __attribute__ ((visibility ("default"))) + #else + #define Util_API + #endif #endif diff --git a/XML/include/Poco/XML/XML.h b/XML/include/Poco/XML/XML.h index 0da417d50..648f971c1 100644 --- a/XML/include/Poco/XML/XML.h +++ b/XML/include/Poco/XML/XML.h @@ -63,7 +63,11 @@ #if !defined(XML_API) - #define XML_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define XML_API __attribute__ ((visibility ("default"))) + #else + #define XML_API + #endif #endif diff --git a/Zip/include/Poco/Zip/Zip.h b/Zip/include/Poco/Zip/Zip.h index 7fc151b23..bbb9ad8b1 100644 --- a/Zip/include/Poco/Zip/Zip.h +++ b/Zip/include/Poco/Zip/Zip.h @@ -63,7 +63,11 @@ #if !defined(Zip_API) - #define Zip_API + #if defined (__GNUC__) && (__GNUC__ >= 4) + #define Zip_API __attribute__ ((visibility ("default"))) + #else + #define Zip_API + #endif #endif From 25811d4c6492063dbf789372efdf368e6fe9bb4c Mon Sep 17 00:00:00 2001 From: Mike Naquin Date: Thu, 13 Dec 2012 08:27:42 -0600 Subject: [PATCH 084/165] Add 64-bit integer JSON unit test --- JSON/testsuite/src/JSONTest.cpp | 37 +++++++++++++++++++++++++++++++++ JSON/testsuite/src/JSONTest.h | 3 +++ 2 files changed, 40 insertions(+) diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp index 89a0bf81e..993137971 100644 --- a/JSON/testsuite/src/JSONTest.cpp +++ b/JSON/testsuite/src/JSONTest.cpp @@ -203,6 +203,40 @@ void JSONTest::testNumberProperty() assert(value == 1969); } +#if defined(POCO_HAVE_INT64) + + +void JSONTest::testNumber64Property() +{ + std::string json = "{ \"test\" : 5000000000000000 }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isInteger()); + Int64 value = test; + assert(value == 5000000000000000); +} + + +#endif + void JSONTest::testStringProperty() { @@ -860,6 +894,9 @@ CppUnit::Test* JSONTest::suite() CppUnit_addTest(pSuite, JSONTest, testTrueProperty); CppUnit_addTest(pSuite, JSONTest, testFalseProperty); CppUnit_addTest(pSuite, JSONTest, testNumberProperty); +#if defined(POCO_HAVE_INT64) + CppUnit_addTest(pSuite, JSONTest, testNumber64Property); +#endif CppUnit_addTest(pSuite, JSONTest, testStringProperty); CppUnit_addTest(pSuite, JSONTest, testEmptyObject); CppUnit_addTest(pSuite, JSONTest, testDoubleProperty); diff --git a/JSON/testsuite/src/JSONTest.h b/JSON/testsuite/src/JSONTest.h index f9ee3ddd1..956181b09 100644 --- a/JSON/testsuite/src/JSONTest.h +++ b/JSON/testsuite/src/JSONTest.h @@ -51,6 +51,9 @@ public: void testTrueProperty(); void testFalseProperty(); void testNumberProperty(); +#if defined(POCO_HAVE_INT64) + void testNumber64Property(); +#endif void testStringProperty(); void testEmptyObject(); void testDoubleProperty(); From 27616fb0e66f25cdc94c8f4d2409e9be0d7047a6 Mon Sep 17 00:00:00 2001 From: Mike Naquin Date: Thu, 13 Dec 2012 09:39:23 -0600 Subject: [PATCH 085/165] Change token to use 64-bit integers by default (when available) --- Foundation/include/Poco/Token.h | 5 +++++ Foundation/src/Token.cpp | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/Foundation/include/Poco/Token.h b/Foundation/include/Poco/Token.h index fb1a910be..dea7faa1b 100644 --- a/Foundation/include/Poco/Token.h +++ b/Foundation/include/Poco/Token.h @@ -105,8 +105,13 @@ public: virtual std::string asString() const; /// Returns a string representation of the token. +#if defined(POCO_HAVE_INT64) + virtual Int64 asInteger() const; + /// Returns a 64-bit integer representation of the token. +#else virtual int asInteger() const; /// Returns an integer representation of the token. +#endif virtual double asFloat() const; /// Returns a floating-point representation of the token. diff --git a/Foundation/src/Token.cpp b/Foundation/src/Token.cpp index 6eaa6892f..d63386958 100644 --- a/Foundation/src/Token.cpp +++ b/Foundation/src/Token.cpp @@ -76,12 +76,27 @@ std::string Token::asString() const } +#if defined(POCO_HAVE_INT64) + + +Int64 Token::asInteger() const +{ + return NumberParser::parse64(_value); +} + + +#else + + int Token::asInteger() const { return NumberParser::parse(_value); } +#endif + + double Token::asFloat() const { return NumberParser::parseFloat(_value); From d5858c15d4f153d597f59a3368d7643b583fd6de Mon Sep 17 00:00:00 2001 From: Mike Naquin Date: Thu, 13 Dec 2012 09:39:50 -0600 Subject: [PATCH 086/165] Update JSON parser to correctly handle 64-bit integers --- JSON/src/Parser.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/JSON/src/Parser.cpp b/JSON/src/Parser.cpp index 0c4a5a83b..99aeb413a 100644 --- a/JSON/src/Parser.cpp +++ b/JSON/src/Parser.cpp @@ -575,18 +575,20 @@ void Parser::readValue(const Token* token) case Token::INTEGER_LITERAL_TOKEN: if ( _handler != NULL ) { - int value = token->asInteger(); #if defined(POCO_HAVE_INT64) - if ( value == std::numeric_limits::max() - || value == std::numeric_limits::min() ) - { - _handler->value(NumberParser::parse64(token->asString())); - } - else - { - _handler->value(token->asInteger()); - } + Int64 value = token->asInteger(); + // if number is 32-bit, then handle as such + if ( value > std::numeric_limits::max() + || value < std::numeric_limits::min() ) + { + _handler->value(value); + } + else + { + _handler->value(static_cast(value)); + } #else + int value = token->asInteger(); _handle->value(value); #endif } @@ -697,5 +699,4 @@ bool Parser::readElements(bool firstCall) throw JSONException(format("Invalid token '%s' found.", token->asString())); } - } } // namespace Poco::JSON From 7afd9c44dbf4ebf9756da4e68da59ce17a9737aa Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Thu, 13 Dec 2012 22:38:46 +0100 Subject: [PATCH 087/165] add algorithm header and adding lib folder to .gitignore fix compilation on Debian x86_64 with gcc 4.4.5-8 --- .gitignore | 1 + Foundation/include/Poco/String.h | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index caf247df3..0cf5d4fca 100644 --- a/.gitignore +++ b/.gitignore @@ -91,5 +91,6 @@ release_static/ debug_static/ bin/ bin64/ +lib/ pocomsg.h diff --git a/Foundation/include/Poco/String.h b/Foundation/include/Poco/String.h index ea2e26093..ace024aa6 100644 --- a/Foundation/include/Poco/String.h +++ b/Foundation/include/Poco/String.h @@ -44,6 +44,7 @@ #include "Poco/Ascii.h" #include #include +#include namespace Poco { From 5016391c4253f5d0dc95b5ff43e59a6959640c80 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Thu, 13 Dec 2012 22:06:00 -0600 Subject: [PATCH 088/165] add lib64 to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0cf5d4fca..1f51cd384 100644 --- a/.gitignore +++ b/.gitignore @@ -92,5 +92,6 @@ debug_static/ bin/ bin64/ lib/ +lib64/ pocomsg.h From 47b8da7362278325af3cf2b45e8e6f908a644783 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Thu, 13 Dec 2012 22:53:47 -0600 Subject: [PATCH 089/165] ifconfig sample ifconfig sample (contribution by Philip Prindeville) --- Net/samples/ifconfig/CMakeLists.txt | 8 + Net/samples/ifconfig/Makefile | 17 + Net/samples/ifconfig/ifconfig.progen | 12 + Net/samples/ifconfig/ifconfig_CE_vs90.vcproj | 466 ++++++++++++++++++ Net/samples/ifconfig/ifconfig_vs100.vcxproj | 299 +++++++++++ .../ifconfig/ifconfig_vs100.vcxproj.filters | 13 + Net/samples/ifconfig/ifconfig_vs110.vcxproj | 305 ++++++++++++ .../ifconfig/ifconfig_vs110.vcxproj.filters | 13 + Net/samples/ifconfig/ifconfig_vs71.vcproj | 393 +++++++++++++++ Net/samples/ifconfig/ifconfig_vs80.vcproj | 433 ++++++++++++++++ Net/samples/ifconfig/ifconfig_vs90.vcproj | 433 ++++++++++++++++ .../ifconfig/ifconfig_x64_vs100.vcxproj | 299 +++++++++++ .../ifconfig_x64_vs100.vcxproj.filters | 13 + .../ifconfig/ifconfig_x64_vs110.vcxproj | 305 ++++++++++++ .../ifconfig_x64_vs110.vcxproj.filters | 13 + Net/samples/ifconfig/ifconfig_x64_vs90.vcproj | 433 ++++++++++++++++ Net/samples/ifconfig/src/ifconfig.cpp | 121 +++++ Net/samples/samples_vs100.sln | 254 +++++----- 18 files changed, 3710 insertions(+), 120 deletions(-) create mode 100644 Net/samples/ifconfig/CMakeLists.txt create mode 100644 Net/samples/ifconfig/Makefile create mode 100644 Net/samples/ifconfig/ifconfig.progen create mode 100644 Net/samples/ifconfig/ifconfig_CE_vs90.vcproj create mode 100644 Net/samples/ifconfig/ifconfig_vs100.vcxproj create mode 100644 Net/samples/ifconfig/ifconfig_vs100.vcxproj.filters create mode 100644 Net/samples/ifconfig/ifconfig_vs110.vcxproj create mode 100644 Net/samples/ifconfig/ifconfig_vs110.vcxproj.filters create mode 100644 Net/samples/ifconfig/ifconfig_vs71.vcproj create mode 100644 Net/samples/ifconfig/ifconfig_vs80.vcproj create mode 100644 Net/samples/ifconfig/ifconfig_vs90.vcproj create mode 100644 Net/samples/ifconfig/ifconfig_x64_vs100.vcxproj create mode 100644 Net/samples/ifconfig/ifconfig_x64_vs100.vcxproj.filters create mode 100644 Net/samples/ifconfig/ifconfig_x64_vs110.vcxproj create mode 100644 Net/samples/ifconfig/ifconfig_x64_vs110.vcxproj.filters create mode 100644 Net/samples/ifconfig/ifconfig_x64_vs90.vcproj create mode 100644 Net/samples/ifconfig/src/ifconfig.cpp diff --git a/Net/samples/ifconfig/CMakeLists.txt b/Net/samples/ifconfig/CMakeLists.txt new file mode 100644 index 000000000..996e3ff72 --- /dev/null +++ b/Net/samples/ifconfig/CMakeLists.txt @@ -0,0 +1,8 @@ +set(SAMPLE_NAME "ifconfig") + +set(LOCAL_SRCS "") +aux_source_directory(src LOCAL_SRCS) + +add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) +#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/ifconfig/Makefile b/Net/samples/ifconfig/Makefile new file mode 100644 index 000000000..ccd62a2ee --- /dev/null +++ b/Net/samples/ifconfig/Makefile @@ -0,0 +1,17 @@ +# +# Makefile +# +# $Id: //poco/Main/template/sample.make#4 $ +# +# Makefile for Poco download +# + +include $(POCO_BASE)/build/rules/global + +objects = ifconfig + +target = ifconfig +target_version = 1 +target_libs = PocoNet PocoFoundation + +include $(POCO_BASE)/build/rules/exec diff --git a/Net/samples/ifconfig/ifconfig.progen b/Net/samples/ifconfig/ifconfig.progen new file mode 100644 index 000000000..789048c79 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig.progen @@ -0,0 +1,12 @@ +vc.project.guid = ${vc.project.guidFromName} +vc.project.name = ${vc.project.baseName} +vc.project.target = ${vc.project.name} +vc.project.type = executable +vc.project.pocobase = ..\\..\\.. +vc.project.platforms = Win32, x64, WinCE +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs90.vcproj +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include +vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib diff --git a/Net/samples/ifconfig/ifconfig_CE_vs90.vcproj b/Net/samples/ifconfig/ifconfig_CE_vs90.vcproj new file mode 100644 index 000000000..4fc1677bc --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_CE_vs90.vcproj @@ -0,0 +1,466 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/samples/ifconfig/ifconfig_vs100.vcxproj b/Net/samples/ifconfig/ifconfig_vs100.vcxproj new file mode 100644 index 000000000..afcfd154e --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_vs100.vcxproj @@ -0,0 +1,299 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + ifconfig + {34993998-D465-4BCC-8C37-9B868F8498D0} + ifconfig + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + downloadd + downloadd + downloadd + ifconfig + ifconfig + ifconfig + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\ifconfig.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\ifconfig.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\ifconfig.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + \ No newline at end of file diff --git a/Net/samples/ifconfig/ifconfig_vs100.vcxproj.filters b/Net/samples/ifconfig/ifconfig_vs100.vcxproj.filters new file mode 100644 index 000000000..759e74882 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_vs100.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {83f7be8b-e80c-4772-a252-0a82e922575d} + + + + + Source Files + + + \ No newline at end of file diff --git a/Net/samples/ifconfig/ifconfig_vs110.vcxproj b/Net/samples/ifconfig/ifconfig_vs110.vcxproj new file mode 100644 index 000000000..bb9cf68d3 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_vs110.vcxproj @@ -0,0 +1,305 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + ifconfig + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} + ifconfig + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + downloadd + downloadd + downloadd + ifconfig + ifconfig + ifconfig + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\ifconfig.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_mt\ifconfig.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\downloadd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\downloadd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin\static_md\ifconfig.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Net/samples/ifconfig/ifconfig_vs110.vcxproj.filters b/Net/samples/ifconfig/ifconfig_vs110.vcxproj.filters new file mode 100644 index 000000000..e818d85d6 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_vs110.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {8178cf99-4be5-4049-bed2-6e410e991f70} + + + + + Source Files + + + \ No newline at end of file diff --git a/Net/samples/ifconfig/ifconfig_vs71.vcproj b/Net/samples/ifconfig/ifconfig_vs71.vcproj new file mode 100644 index 000000000..2322219f6 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_vs71.vcproj @@ -0,0 +1,393 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/samples/ifconfig/ifconfig_vs80.vcproj b/Net/samples/ifconfig/ifconfig_vs80.vcproj new file mode 100644 index 000000000..1f18e0f44 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_vs80.vcproj @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/samples/ifconfig/ifconfig_vs90.vcproj b/Net/samples/ifconfig/ifconfig_vs90.vcproj new file mode 100644 index 000000000..0d13b0c79 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_vs90.vcproj @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/samples/ifconfig/ifconfig_x64_vs100.vcxproj b/Net/samples/ifconfig/ifconfig_x64_vs100.vcxproj new file mode 100644 index 000000000..c8d6d4094 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_x64_vs100.vcxproj @@ -0,0 +1,299 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + ifconfig + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} + ifconfig + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + downloadd + downloadd + downloadd + ifconfig + ifconfig + ifconfig + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\ifconfig.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\ifconfig.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\ifconfig.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Net/samples/ifconfig/ifconfig_x64_vs100.vcxproj.filters b/Net/samples/ifconfig/ifconfig_x64_vs100.vcxproj.filters new file mode 100644 index 000000000..714b1a3a2 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_x64_vs100.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {25ce49c0-b3a1-4334-9cc8-0a38996eff3a} + + + + + Source Files + + + \ No newline at end of file diff --git a/Net/samples/ifconfig/ifconfig_x64_vs110.vcxproj b/Net/samples/ifconfig/ifconfig_x64_vs110.vcxproj new file mode 100644 index 000000000..166b20ca1 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_x64_vs110.vcxproj @@ -0,0 +1,305 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + ifconfig + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} + ifconfig + Win32Proj + + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + downloadd + downloadd + downloadd + ifconfig + ifconfig + ifconfig + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\ifconfig.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_mt\ifconfig.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\downloadd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\downloadd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + bin64\static_md\ifconfig.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Net/samples/ifconfig/ifconfig_x64_vs110.vcxproj.filters b/Net/samples/ifconfig/ifconfig_x64_vs110.vcxproj.filters new file mode 100644 index 000000000..f2212302e --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_x64_vs110.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {466b345c-48bd-4a7a-a48b-0d351ad0ad12} + + + + + Source Files + + + \ No newline at end of file diff --git a/Net/samples/ifconfig/ifconfig_x64_vs90.vcproj b/Net/samples/ifconfig/ifconfig_x64_vs90.vcproj new file mode 100644 index 000000000..275624ce9 --- /dev/null +++ b/Net/samples/ifconfig/ifconfig_x64_vs90.vcproj @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Net/samples/ifconfig/src/ifconfig.cpp b/Net/samples/ifconfig/src/ifconfig.cpp new file mode 100644 index 000000000..326c8e6bf --- /dev/null +++ b/Net/samples/ifconfig/src/ifconfig.cpp @@ -0,0 +1,121 @@ +// +// ifconfig.cpp +// +// $Id: //poco/1.4/Net/samples/download/src/ifconfig.cpp#1 $ +// +// This sample demonstrates the ifconfig-like capabilities of the +// NetworkInterface class. +// +// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Path.h" +#include "Poco/Exception.h" +#include "Poco/Net/IPAddress.h" +#include "Poco/Net/NetworkInterface.h" +#include +#include + + +using Poco::Path; +using Poco::Exception; +using Poco::Net::IPAddress; +using Poco::Net::NetworkInterface; + + +int main(int argc, char** argv) +{ + + if (argc != 1) + { + Path p(argv[0]); + std::cerr << "usage: " << p.getBaseName() << std::endl; + return 1; + } + + try + { + const NetworkInterface::Map map = NetworkInterface::map(); + for ( NetworkInterface::Map::const_iterator it = map.begin(); + it != map.end(); ++it) + { + const NetworkInterface& intf = it->second; + std::string sep(""); + std::cout << intf.name() << " [" << intf.index() << "]: "; + std::cout << "<"; + if (intf.isUp()) + std::cout << sep << "UP"; sep = ","; + + if (intf.isRunning()) + std::cout << sep << "RUNNING"; sep = ","; + + if (intf.isLoopback()) + std::cout << sep << "LOOPBACK"; sep = ","; + + if (intf.isPointToPoint()) + std::cout << sep << "P2P"; sep = ","; + + if (intf.supportsIPv4()) + std::cout << sep << "IPv4"; sep = ","; + + if (intf.supportsIPv6()) + std::cout << sep << "IPv6"; sep = ","; + + if (intf.supportsBroadcast()) + std::cout << sep << "BCAST"; sep = ","; + + if (intf.supportsMulticast()) + std::cout << sep << "MCAST"; sep = ","; + + std::cout << sep << std::dec << intf.mtu(); sep = ","; + std::cout << ">" << std::endl; + + const NetworkInterface::AddressList& ipList = intf.addressList(); + + NetworkInterface::AddressList::const_iterator ipIt = ipList.begin(); + NetworkInterface::AddressList::const_iterator ipEnd = ipList.end(); + for (; ipIt != ipEnd; ++ipIt) + { + std::cout << " " << ipIt->get().toString(); + IPAddress addr; + addr = ipIt->get(); + if (!addr.isWildcard()) std::cout << '/' << addr.toString() << " (" << addr.prefixLength() << ')'; + addr = ipIt->get(); + if (!addr.isWildcard()) std::cout << (intf.isPointToPoint() ? " dest " : " bcast ") << addr.toString(); + std::cout << std::endl; + } + std::cout << std::endl; + } + } + catch (Exception& exc) + { + std::cerr << exc.displayText() << std::endl; + return 1; + } + + return 0; +} diff --git a/Net/samples/samples_vs100.sln b/Net/samples/samples_vs100.sln index 5152cf346..9e6c8a6cb 100644 --- a/Net/samples/samples_vs100.sln +++ b/Net/samples/samples_vs100.sln @@ -26,250 +26,264 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebSocketServer", "WebSocke EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SMTPLogger", "SMTPLogger\SMTPLogger_vs100.vcxproj", "{83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifconfig", "ifconfig\ifconfig_vs100.vcxproj", "{34993998-D465-4BCC-8C37-9B868F8498D0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 debug_static_md|Win32 = debug_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_shared|Win32 = release_shared|Win32 release_static_md|Win32 = release_static_md|Win32 + release_static_mt|Win32 = release_static_mt|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.Build.0 = debug_shared|Win32 {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.Build.0 = release_shared|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.Build.0 = release_shared|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|Win32.Deploy.0 = release_shared|Win32 {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|Win32.Build.0 = release_static_md|Win32 {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Build.0 = debug_shared|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Build.0 = release_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Build.0 = release_shared|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|Win32.Deploy.0 = release_shared|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.Build.0 = release_static_md|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.Build.0 = debug_shared|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.Build.0 = release_shared|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.Build.0 = release_shared|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|Win32.Deploy.0 = release_shared|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|Win32.Build.0 = release_static_md|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.Build.0 = debug_shared|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.Build.0 = release_shared|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.Build.0 = release_shared|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|Win32.Deploy.0 = release_shared|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|Win32.Build.0 = release_static_md|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.Build.0 = debug_shared|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.Build.0 = release_shared|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.Build.0 = release_shared|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|Win32.Deploy.0 = release_shared|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|Win32.Build.0 = release_static_md|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.Build.0 = debug_shared|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.Build.0 = release_shared|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.Build.0 = release_shared|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|Win32.Deploy.0 = release_shared|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|Win32.Build.0 = release_static_md|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Build.0 = debug_shared|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Build.0 = release_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Build.0 = release_shared|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|Win32.Deploy.0 = release_shared|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.Build.0 = release_static_md|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Build.0 = debug_shared|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Build.0 = release_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Build.0 = release_shared|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|Win32.Deploy.0 = release_shared|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.Build.0 = release_static_md|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.Build.0 = release_shared|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Build.0 = debug_shared|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Build.0 = release_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Build.0 = release_shared|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Deploy.0 = release_shared|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|Win32.Build.0 = release_static_md|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.Build.0 = debug_shared|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.Build.0 = release_shared|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.Build.0 = release_shared|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|Win32.Deploy.0 = release_shared|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|Win32.Build.0 = release_static_md|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.Build.0 = debug_shared|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.Build.0 = release_shared|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.Build.0 = release_shared|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|Win32.Deploy.0 = release_shared|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|Win32.Build.0 = release_static_md|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.Build.0 = debug_shared|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.Build.0 = release_shared|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.Build.0 = release_shared|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|Win32.Deploy.0 = release_shared|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|Win32.Build.0 = release_static_md|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.release_shared|Win32.Build.0 = release_shared|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {34993998-D465-4BCC-8C37-9B868F8498D0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From dbc847eb62be2007911be2183af47714a69342c0 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Thu, 13 Dec 2012 23:04:32 -0600 Subject: [PATCH 090/165] updated CHANGELOG --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index cddb07ff0..23219414d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,6 +21,11 @@ Release 1.5.0 (2012-12-17) - added SF #542: SocketAddress() needs port-only constructor - fixed SF #215: Wrong return type in SocketConnector.h - applied SF Patch #97: fix c++0x / clang++ bugs +- fixed GH32/SF596: Poco::JSON: Parsing long integer (int64) value fails. +- added Net ifconfig sample (contributed by Philip Prindeville) +- merged GH #34: add algorithm header (Roger Meier/Philip Prindeville) +- fixed GH #26: Cannot compile on gcc +- merged SF #111: FTP Client logging (Marian Krivos) Release 1.5.0 (2012-10-14) ========================== From 5d463c3a1c8377cfe09ec9c76cee0cba81e3e19d Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 12:09:23 -0600 Subject: [PATCH 091/165] GH 30:Poco::Path::home() throws GH #30: Poco::Path::home() throws when called from Windows Service done for Win32 and Win32U, return root for WinCE --- CONTRIBUTORS | 39 ++++++++++++++------------- Foundation/include/Poco/Path_WIN32.h | 1 + Foundation/include/Poco/Path_WIN32U.h | 1 + Foundation/include/Poco/Path_WINCE.h | 1 + Foundation/src/Path.cpp | 2 +- Foundation/src/Path_WIN32.cpp | 30 +++++++++++++++++++-- Foundation/src/Path_WIN32U.cpp | 32 ++++++++++++++++++++-- Foundation/src/Path_WINCE.cpp | 14 ++-------- Foundation/testsuite/src/PathTest.cpp | 18 +++++++++++++ Foundation/testsuite/src/PathTest.h | 1 + 10 files changed, 103 insertions(+), 36 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c40d556c6..30956cf0f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,23 +1,23 @@ -Guenter Obiltschnig -Alex Fabijanic -Peter Schojer -Ferdinand Beyer -Krzysztof Burghardt -Claus Dabringer -Caleb Epstein -Eran Hammer-Lahav -Chris Johnson -Sergey Kholodilov -Ryan Kraay -Larry Lewis -Andrew J. P. Maclean -Andrew Marlow -Paschal Mushubi -Jiang Shan -David Shawley -Sergey Skorokhodov +Guenter Obiltschnig +Alex Fabijanic +Peter Schojer +Ferdinand Beyer +Krzysztof Burghardt +Claus Dabringer +Caleb Epstein +Eran Hammer-Lahav +Chris Johnson +Sergey Kholodilov +Ryan Kraay +Larry Lewis +Andrew J. P. Maclean +Andrew Marlow +Paschal Mushubi +Jiang Shan +David Shawley +Sergey Skorokhodov Tom Tan -Sergey N. Yatskevich +Sergey N. Yatskevich Marc Chevrier Philippe Cuvillier Marian Krivos @@ -28,6 +28,7 @@ Rangel Reale Fabrizio Duhem Patrick White Mike Naquin +Roger Meier -- $Id$ diff --git a/Foundation/include/Poco/Path_WIN32.h b/Foundation/include/Poco/Path_WIN32.h index 956b6ae19..066c64a1d 100644 --- a/Foundation/include/Poco/Path_WIN32.h +++ b/Foundation/include/Poco/Path_WIN32.h @@ -54,6 +54,7 @@ public: static std::string homeImpl(); static std::string tempImpl(); static std::string nullImpl(); + static std::string systemImpl(); static std::string expandImpl(const std::string& path); static void listRootsImpl(std::vector& roots); }; diff --git a/Foundation/include/Poco/Path_WIN32U.h b/Foundation/include/Poco/Path_WIN32U.h index ac05a4629..f12c71894 100644 --- a/Foundation/include/Poco/Path_WIN32U.h +++ b/Foundation/include/Poco/Path_WIN32U.h @@ -54,6 +54,7 @@ public: static std::string homeImpl(); static std::string tempImpl(); static std::string nullImpl(); + static std::string systemImpl(); static std::string expandImpl(const std::string& path); static void listRootsImpl(std::vector& roots); diff --git a/Foundation/include/Poco/Path_WINCE.h b/Foundation/include/Poco/Path_WINCE.h index ef6b9f06a..dc3a12647 100644 --- a/Foundation/include/Poco/Path_WINCE.h +++ b/Foundation/include/Poco/Path_WINCE.h @@ -55,6 +55,7 @@ public: static std::string homeImpl(); static std::string tempImpl(); static std::string nullImpl(); + static std::string systemImpl(); static std::string expandImpl(const std::string& path); static void listRootsImpl(std::vector& roots); diff --git a/Foundation/src/Path.cpp b/Foundation/src/Path.cpp index acc19dfce..c96bd956c 100644 --- a/Foundation/src/Path.cpp +++ b/Foundation/src/Path.cpp @@ -599,7 +599,7 @@ Path& Path::clear() _dirs.clear(); _version.clear(); _absolute = false; - return *this; + return *this; } diff --git a/Foundation/src/Path_WIN32.cpp b/Foundation/src/Path_WIN32.cpp index f38d6594a..4b6c68640 100644 --- a/Foundation/src/Path_WIN32.cpp +++ b/Foundation/src/Path_WIN32.cpp @@ -57,10 +57,36 @@ std::string PathImpl::currentImpl() } +std::string PathImpl::systemImpl() +{ + char buffer[MAX_PATH]; + DWORD n = GetSystemDirectoryA(buffer, sizeof(buffer)); + if (n > 0 && n < sizeof(buffer)) + { + std::string result(buffer, n); + if (result[n - 1] != '\\') + result.append("\\"); + return result; + } + else throw SystemException("Cannot get system directory"); +} + + std::string PathImpl::homeImpl() { - std::string result = EnvironmentImpl::getImpl("HOMEDRIVE"); - result.append(EnvironmentImpl::getImpl("HOMEPATH")); + std::string result; + + // windows service has no home dir, return system directory instead + try + { + result = EnvironmentImpl::getImpl("HOMEDRIVE"); + result.append(EnvironmentImpl::getImpl("HOMEPATH")); + } + catch (NotFoundException&) + { + result = systemImpl(); + } + std::string::size_type n = result.size(); if (n > 0 && result[n - 1] != '\\') result.append("\\"); diff --git a/Foundation/src/Path_WIN32U.cpp b/Foundation/src/Path_WIN32U.cpp index d9fe50003..99b162ffa 100644 --- a/Foundation/src/Path_WIN32U.cpp +++ b/Foundation/src/Path_WIN32U.cpp @@ -65,10 +65,38 @@ std::string PathImpl::currentImpl() } +std::string PathImpl::systemImpl() +{ + Buffer buffer(MAX_PATH_LEN); + DWORD n = GetSystemDirectoryW(buffer.begin(), static_cast(buffer.size())); + if (n > 0) + { + n = GetLongPathNameW(buffer.begin(), buffer.begin(), static_cast(buffer.size())); + if (n <= 0) throw SystemException("Cannot get system directory long path name"); + std::string result; + UnicodeConverter::toUTF8(buffer.begin(), result); + if (result[result.size() - 1] != '\\') result.append("\\"); + return result; + } + throw SystemException("Cannot get temporary directory path"); +} + + std::string PathImpl::homeImpl() { - std::string result = EnvironmentImpl::getImpl("HOMEDRIVE"); - result.append(EnvironmentImpl::getImpl("HOMEPATH")); + std::string result; + + // windows service has no home dir, return system directory instead + try + { + result = EnvironmentImpl::getImpl("HOMEDRIVE"); + result.append(EnvironmentImpl::getImpl("HOMEPATH")); + } + catch (NotFoundException&) + { + result = systemImpl(); + } + std::string::size_type n = result.size(); if (n > 0 && result[n - 1] != '\\') result.append("\\"); diff --git a/Foundation/src/Path_WINCE.cpp b/Foundation/src/Path_WINCE.cpp index 612711407..8c02a76e0 100644 --- a/Foundation/src/Path_WINCE.cpp +++ b/Foundation/src/Path_WINCE.cpp @@ -58,19 +58,9 @@ std::string PathImpl::homeImpl() } -std::string PathImpl::tempImpl() +std::string PathImpl::systemImpl() { - Buffer buffer(MAX_PATH_LEN); - DWORD n = GetTempPathW(static_cast(buffer.size()), buffer.begin()); - if (n > 0) - { - std::string result; - UnicodeConverter::toUTF8(buffer.begin(), result); - if (result[n - 1] != '\\') - result.append("\\"); - return result; - } - throw SystemException("Cannot get current directory"); + return("\\"); } diff --git a/Foundation/testsuite/src/PathTest.cpp b/Foundation/testsuite/src/PathTest.cpp index 3f5ec1123..924e1cb1d 100644 --- a/Foundation/testsuite/src/PathTest.cpp +++ b/Foundation/testsuite/src/PathTest.cpp @@ -39,6 +39,15 @@ #include "Poco/Environment.h" #include +#if defined(POCO_OS_FAMILY_WINDOWS) && defined(POCO_WIN32_UTF8) +#if defined(_WIN32_WCE) +#include "Poco/Path_WINCE.h" +#else +#include "Poco/Path_WIN32U.h" +#endif +#elif defined(POCO_OS_FAMILY_WINDOWS) +#include "Poco/Path_WIN32.h" +#endif using Poco::Path; using Poco::PathSyntaxException; @@ -1625,6 +1634,14 @@ void PathTest::testPushPop() } +void PathTest::testWindowsSystem() +{ +#if defined(POCO_OS_FAMILY_WINDOWS) + std::cout << Poco::PathImpl::systemImpl() << std::endl; +#endif +} + + void PathTest::setUp() { } @@ -1666,6 +1683,7 @@ CppUnit::Test* PathTest::suite() CppUnit_addTest(pSuite, PathTest, testSwap); CppUnit_addTest(pSuite, PathTest, testResolve); CppUnit_addTest(pSuite, PathTest, testPushPop); + CppUnit_addTest(pSuite, PathTest, testWindowsSystem); return pSuite; } diff --git a/Foundation/testsuite/src/PathTest.h b/Foundation/testsuite/src/PathTest.h index b616d777f..5ad17a6f7 100644 --- a/Foundation/testsuite/src/PathTest.h +++ b/Foundation/testsuite/src/PathTest.h @@ -73,6 +73,7 @@ public: void testSwap(); void testResolve(); void testPushPop(); + void testWindowsSystem(); void setUp(); void tearDown(); From 903553c9e247c1e8330dd1c999aca20f0ef71810 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 12:19:44 -0600 Subject: [PATCH 092/165] updated CHANGELOG --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 23219414d..763069e39 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,7 @@ Release 1.5.0 (2012-12-17) - merged GH #34: add algorithm header (Roger Meier/Philip Prindeville) - fixed GH #26: Cannot compile on gcc - merged SF #111: FTP Client logging (Marian Krivos) +- fixed GH #30: Poco::Path::home() throws when called from Windows Service Release 1.5.0 (2012-10-14) ========================== From f4121bcb9287cfab65b17e70081df77ee026b73f Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 12:34:45 -0600 Subject: [PATCH 093/165] few ifconfig sample fixes --- Net/samples/ifconfig/src/ifconfig.cpp | 47 ++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/Net/samples/ifconfig/src/ifconfig.cpp b/Net/samples/ifconfig/src/ifconfig.cpp index 326c8e6bf..824a9cd79 100644 --- a/Net/samples/ifconfig/src/ifconfig.cpp +++ b/Net/samples/ifconfig/src/ifconfig.cpp @@ -68,30 +68,59 @@ int main(int argc, char** argv) std::cout << intf.name() << " [" << intf.index() << "]: "; std::cout << "<"; if (intf.isUp()) - std::cout << sep << "UP"; sep = ","; + { + std::cout << sep << "UP"; + sep = ","; + } if (intf.isRunning()) - std::cout << sep << "RUNNING"; sep = ","; + { + std::cout << sep << "RUNNING"; + sep = ","; + } if (intf.isLoopback()) - std::cout << sep << "LOOPBACK"; sep = ","; + { + std::cout << sep << "LOOPBACK"; + sep = ","; + } if (intf.isPointToPoint()) - std::cout << sep << "P2P"; sep = ","; + { + std::cout << sep << "P2P"; + sep = ","; + } if (intf.supportsIPv4()) - std::cout << sep << "IPv4"; sep = ","; + { + std::cout << sep << "IPv4"; + sep = ","; + } if (intf.supportsIPv6()) - std::cout << sep << "IPv6"; sep = ","; + { + std::cout << sep << "IPv6"; + sep = ","; + } if (intf.supportsBroadcast()) - std::cout << sep << "BCAST"; sep = ","; + { + std::cout << sep << "BCAST"; + sep = ","; + } if (intf.supportsMulticast()) - std::cout << sep << "MCAST"; sep = ","; + { + std::cout << sep << "MCAST"; + sep = ","; + } + + if (!intf.isLoopback()) + { + std::cout << sep << std::dec << intf.mtu(); + sep = ","; + } - std::cout << sep << std::dec << intf.mtu(); sep = ","; std::cout << ">" << std::endl; const NetworkInterface::AddressList& ipList = intf.addressList(); From 4a5cb5031b940b6ad92e621193e78b42ab1ef9b2 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 14:03:14 -0600 Subject: [PATCH 094/165] fixed resolution fo Int64 --- JSON/testsuite/src/JSONTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp index 993137971..dbb2521da 100644 --- a/JSON/testsuite/src/JSONTest.cpp +++ b/JSON/testsuite/src/JSONTest.cpp @@ -230,7 +230,7 @@ void JSONTest::testNumber64Property() Object::Ptr object = result.extract(); Var test = object->get("test"); assert(test.isInteger()); - Int64 value = test; + Poco::Int64 value = test; assert(value == 5000000000000000); } From 60b0879b5012ead08ec30620c84998699401c38c Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 12:45:14 -0600 Subject: [PATCH 095/165] updated sample description --- Net/samples/ifconfig/src/ifconfig.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Net/samples/ifconfig/src/ifconfig.cpp b/Net/samples/ifconfig/src/ifconfig.cpp index 824a9cd79..6e88569af 100644 --- a/Net/samples/ifconfig/src/ifconfig.cpp +++ b/Net/samples/ifconfig/src/ifconfig.cpp @@ -3,8 +3,8 @@ // // $Id: //poco/1.4/Net/samples/download/src/ifconfig.cpp#1 $ // -// This sample demonstrates the ifconfig-like capabilities of the -// NetworkInterface class. +// This sample demonstrates the (display only) ifconfig-like capabilities +// of the NetworkInterface class. // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. From 0b0e293b96d37825b088a46adf751e00a5d2a748 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 14:44:28 -0600 Subject: [PATCH 096/165] added Error.cpp/h files to VS projects --- Foundation/Foundation_CE_vs90.vcproj | 8 ++++++++ Foundation/Foundation_vs110.vcxproj | 2 ++ Foundation/Foundation_vs110.vcxproj.filters | 6 ++++++ Foundation/Foundation_vs80.vcproj | 8 ++++++++ Foundation/Foundation_vs90.vcproj | 8 ++++++++ Foundation/Foundation_x64_vs100.vcxproj | 2 ++ Foundation/Foundation_x64_vs100.vcxproj.filters | 6 ++++++ Foundation/Foundation_x64_vs110.vcxproj | 2 ++ Foundation/Foundation_x64_vs110.vcxproj.filters | 6 ++++++ Foundation/Foundation_x64_vs90.vcproj | 8 ++++++++ 10 files changed, 56 insertions(+) diff --git a/Foundation/Foundation_CE_vs90.vcproj b/Foundation/Foundation_CE_vs90.vcproj index 1410a1cb5..f3b552211 100644 --- a/Foundation/Foundation_CE_vs90.vcproj +++ b/Foundation/Foundation_CE_vs90.vcproj @@ -6217,6 +6217,10 @@ /> + + @@ -6601,6 +6605,10 @@ RelativePath=".\include\Poco\Environment_WINCE.h" > + + diff --git a/Foundation/Foundation_vs110.vcxproj b/Foundation/Foundation_vs110.vcxproj index 1af432b66..30e807248 100644 --- a/Foundation/Foundation_vs110.vcxproj +++ b/Foundation/Foundation_vs110.vcxproj @@ -334,6 +334,7 @@ true true + @@ -1004,6 +1005,7 @@ + diff --git a/Foundation/Foundation_vs110.vcxproj.filters b/Foundation/Foundation_vs110.vcxproj.filters index 512dc207d..ba3474bac 100644 --- a/Foundation/Foundation_vs110.vcxproj.filters +++ b/Foundation/Foundation_vs110.vcxproj.filters @@ -222,6 +222,9 @@ Core\Source Files + + Core\Source Files + Core\Source Files @@ -953,6 +956,9 @@ Core\Header Files + + Core\Header Files + Core\Header Files diff --git a/Foundation/Foundation_vs80.vcproj b/Foundation/Foundation_vs80.vcproj index 8d16d82ca..c321e3157 100644 --- a/Foundation/Foundation_vs80.vcproj +++ b/Foundation/Foundation_vs80.vcproj @@ -735,6 +735,10 @@ /> + + @@ -1123,6 +1127,10 @@ RelativePath=".\include\Poco\Environment_WIN32U.h" > + + diff --git a/Foundation/Foundation_vs90.vcproj b/Foundation/Foundation_vs90.vcproj index 5be3445e2..3bb20cf15 100644 --- a/Foundation/Foundation_vs90.vcproj +++ b/Foundation/Foundation_vs90.vcproj @@ -732,6 +732,10 @@ /> + + @@ -1120,6 +1124,10 @@ RelativePath=".\include\Poco\Environment_WIN32U.h" > + + diff --git a/Foundation/Foundation_x64_vs100.vcxproj b/Foundation/Foundation_x64_vs100.vcxproj index 11ab74d76..94b8ceb6a 100644 --- a/Foundation/Foundation_x64_vs100.vcxproj +++ b/Foundation/Foundation_x64_vs100.vcxproj @@ -334,6 +334,7 @@ true true + @@ -1003,6 +1004,7 @@ + diff --git a/Foundation/Foundation_x64_vs100.vcxproj.filters b/Foundation/Foundation_x64_vs100.vcxproj.filters index 84d3fcef9..94b5ee37e 100644 --- a/Foundation/Foundation_x64_vs100.vcxproj.filters +++ b/Foundation/Foundation_x64_vs100.vcxproj.filters @@ -222,6 +222,9 @@ Core\Source Files + + Core\Source Files + Core\Source Files @@ -953,6 +956,9 @@ Core\Header Files + + Core\Header Files + Core\Header Files diff --git a/Foundation/Foundation_x64_vs110.vcxproj b/Foundation/Foundation_x64_vs110.vcxproj index befff146f..13a842e3a 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj +++ b/Foundation/Foundation_x64_vs110.vcxproj @@ -340,6 +340,7 @@ true true + @@ -1009,6 +1010,7 @@ + diff --git a/Foundation/Foundation_x64_vs110.vcxproj.filters b/Foundation/Foundation_x64_vs110.vcxproj.filters index 84d3fcef9..94b5ee37e 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj.filters +++ b/Foundation/Foundation_x64_vs110.vcxproj.filters @@ -222,6 +222,9 @@ Core\Source Files + + Core\Source Files + Core\Source Files @@ -953,6 +956,9 @@ Core\Header Files + + Core\Header Files + Core\Header Files diff --git a/Foundation/Foundation_x64_vs90.vcproj b/Foundation/Foundation_x64_vs90.vcproj index d47d6a431..886387cc9 100644 --- a/Foundation/Foundation_x64_vs90.vcproj +++ b/Foundation/Foundation_x64_vs90.vcproj @@ -738,6 +738,10 @@ /> + + @@ -1126,6 +1130,10 @@ RelativePath=".\include\Poco\Environment_WIN32U.h" > + + From 1ea4b41dade303bd0218eaa51848c0cfc806e24e Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 15:30:24 -0600 Subject: [PATCH 097/165] added ifconfig to samples Makefile --- Foundation/src/Thread_WIN32.cpp | 2 +- Net/samples/Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Foundation/src/Thread_WIN32.cpp b/Foundation/src/Thread_WIN32.cpp index cd402fe0e..fb227610f 100644 --- a/Foundation/src/Thread_WIN32.cpp +++ b/Foundation/src/Thread_WIN32.cpp @@ -101,7 +101,7 @@ ThreadImpl::ThreadImpl(): { } - + ThreadImpl::~ThreadImpl() { if (_thread) CloseHandle(_thread); diff --git a/Net/samples/Makefile b/Net/samples/Makefile index b4daacab8..55cd04cf1 100644 --- a/Net/samples/Makefile +++ b/Net/samples/Makefile @@ -22,3 +22,4 @@ projects: $(MAKE) -C TwitterClient $(MAKECMDGOALS) $(MAKE) -C WebSocketServer $(MAKECMDGOALS) $(MAKE) -C SMTPLogger $(MAKECMDGOALS) + $(MAKE) -C ifconfig $(MAKECMDGOALS) From 245dc64c7e31c2f9cfae479e451d207ae88a6ea4 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Fri, 14 Dec 2012 15:28:17 -0600 Subject: [PATCH 098/165] added VS2012 Foundation TestSuite dependency added VS2012 Foundation TestSuite dependency on TestApp and TestLibrary --- Foundation/Foundation_vs110.sln | 50 +++++++++++++++++---------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/Foundation/Foundation_vs110.sln b/Foundation/Foundation_vs110.sln index 9d6c8230a..21faa17af 100644 --- a/Foundation/Foundation_vs110.sln +++ b/Foundation/Foundation_vs110.sln @@ -15,7 +15,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\Te EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}" ProjectSection(ProjectDependencies) = postProject + {0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F} {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} EndProjectSection EndProject Global @@ -28,30 +30,6 @@ Global release_static_mt|Win32 = release_static_mt|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.ActiveCfg = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.Build.0 = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.ActiveCfg = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.Build.0 = debug_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.ActiveCfg = release_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32 - {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.Build.0 = release_shared|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 @@ -64,6 +42,30 @@ Global {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.Build.0 = release_static_md|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.Build.0 = release_shared|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.ActiveCfg = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.Build.0 = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.ActiveCfg = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.Build.0 = debug_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.ActiveCfg = release_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32 + {0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32 {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32 {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 From 2a81e59e8c990c49d8f2fa092d8506645cb06ac9 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 19:48:10 -0600 Subject: [PATCH 099/165] MySQL DateTime support, samples Linux compile --- Data/MySQL/src/ResultMetadata.cpp | 6 +- Data/MySQL/src/ResultMetadata.cpp~ | 246 ++ Data/MySQL/src/SessionImpl.cpp | 4 +- Data/MySQL/src/SessionImpl.cpp~ | 290 +++ Data/MySQL/testsuite/src/MySQLTest.cpp | 21 +- Data/MySQL/testsuite/src/MySQLTest.cpp~ | 861 +++++++ Data/MySQL/testsuite/src/MySQLTest.h | 3 +- Data/MySQL/testsuite/src/MySQLTest.h~ | 148 ++ Data/MySQL/testsuite/src/SQLExecutor.cpp | 33 + Data/MySQL/testsuite/src/SQLExecutor.cpp~ | 1878 +++++++++++++++ Data/MySQL/testsuite/src/SQLExecutor.h | 2 +- Data/MySQL/testsuite/src/SQLExecutor.h~ | 126 + Data/include/Poco/Data/TypeHandler.h | 4 +- Data/include/Poco/Data/TypeHandler.h~ | 2113 +++++++++++++++++ Data/samples/RecordSet/src/RecordSet.cpp | 6 +- Data/samples/RecordSet/src/RecordSet.cpp~ | 103 + .../samples/RowFormatter/src/RowFormatter.cpp | 12 +- .../RowFormatter/src/RowFormatter.cpp~ | 140 ++ JSON/testsuite/src/JSONTest.cpp~ | 923 +++++++ 19 files changed, 6905 insertions(+), 14 deletions(-) create mode 100644 Data/MySQL/src/ResultMetadata.cpp~ create mode 100644 Data/MySQL/src/SessionImpl.cpp~ create mode 100644 Data/MySQL/testsuite/src/MySQLTest.cpp~ create mode 100644 Data/MySQL/testsuite/src/MySQLTest.h~ create mode 100644 Data/MySQL/testsuite/src/SQLExecutor.cpp~ create mode 100644 Data/MySQL/testsuite/src/SQLExecutor.h~ create mode 100644 Data/include/Poco/Data/TypeHandler.h~ create mode 100644 Data/samples/RecordSet/src/RecordSet.cpp~ create mode 100644 Data/samples/RowFormatter/src/RowFormatter.cpp~ create mode 100644 JSON/testsuite/src/JSONTest.cpp~ diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp index a45f71ff6..ae43f9f0c 100644 --- a/Data/MySQL/src/ResultMetadata.cpp +++ b/Data/MySQL/src/ResultMetadata.cpp @@ -130,7 +130,11 @@ namespace case MYSQL_TYPE_LONGLONG: if (unsig) return Poco::Data::MetaColumn::FDT_UINT64; return Poco::Data::MetaColumn::FDT_INT64; - + case MYSQL_TYPE_DATE: + case MYSQL_TYPE_TIME: + case MYSQL_TYPE_DATETIME: + return Poco::Data::MetaColumn::FDT_TIMESTAMP; + case MYSQL_TYPE_STRING: case MYSQL_TYPE_VAR_STRING: return Poco::Data::MetaColumn::FDT_STRING; diff --git a/Data/MySQL/src/ResultMetadata.cpp~ b/Data/MySQL/src/ResultMetadata.cpp~ new file mode 100644 index 000000000..a45f71ff6 --- /dev/null +++ b/Data/MySQL/src/ResultMetadata.cpp~ @@ -0,0 +1,246 @@ +// +// MySQLException.cpp +// +// $Id: //poco/1.4/Data/MySQL/src/ResultMetadata.cpp#1 $ +// +// Library: Data +// Package: MySQL +// Module: ResultMetadata +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Data/MySQL/ResultMetadata.h" +#include "Poco/Data/MySQL/MySQLException.h" +#include + +namespace +{ + class ResultMetadataHandle + /// Simple exception-safe wrapper + { + public: + + explicit ResultMetadataHandle(MYSQL_STMT* stmt) + { + h = mysql_stmt_result_metadata(stmt); + } + + ~ResultMetadataHandle() + { + if (h) + { + mysql_free_result(h); + } + } + + operator MYSQL_RES* () + { + return h; + } + + private: + + MYSQL_RES* h; + }; + + std::size_t fieldSize(const MYSQL_FIELD& field) + /// Convert field MySQL-type and field MySQL-length to actual field length + { + switch (field.type) + { + case MYSQL_TYPE_TINY: return sizeof(char); + case MYSQL_TYPE_SHORT: return sizeof(short); + case MYSQL_TYPE_INT24: + case MYSQL_TYPE_LONG: return sizeof(Poco::Int32); + case MYSQL_TYPE_FLOAT: return sizeof(float); + case MYSQL_TYPE_DOUBLE: return sizeof(double); + case MYSQL_TYPE_LONGLONG: return sizeof(Poco::Int64); + + case MYSQL_TYPE_DATE: + case MYSQL_TYPE_TIME: + case MYSQL_TYPE_DATETIME: + return sizeof(MYSQL_TIME); + + case MYSQL_TYPE_DECIMAL: + case MYSQL_TYPE_NEWDECIMAL: + case MYSQL_TYPE_STRING: + case MYSQL_TYPE_VAR_STRING: + case MYSQL_TYPE_TINY_BLOB: + case MYSQL_TYPE_MEDIUM_BLOB: + case MYSQL_TYPE_LONG_BLOB: + case MYSQL_TYPE_BLOB: + return field.length; + + default: + throw Poco::Data::MySQL::StatementException("unknown field type"); + } + } + + Poco::Data::MetaColumn::ColumnDataType fieldType(const MYSQL_FIELD& field) + /// Convert field MySQL-type to Poco-type + { + bool unsig = ((field.flags & UNSIGNED_FLAG) == UNSIGNED_FLAG); + + switch (field.type) + { + case MYSQL_TYPE_TINY: + if (unsig) return Poco::Data::MetaColumn::FDT_UINT8; + return Poco::Data::MetaColumn::FDT_INT8; + + case MYSQL_TYPE_SHORT: + if (unsig) return Poco::Data::MetaColumn::FDT_UINT16; + return Poco::Data::MetaColumn::FDT_INT16; + + case MYSQL_TYPE_INT24: + case MYSQL_TYPE_LONG: + if (unsig) return Poco::Data::MetaColumn::FDT_UINT32; + return Poco::Data::MetaColumn::FDT_INT32; + + case MYSQL_TYPE_FLOAT: + return Poco::Data::MetaColumn::FDT_FLOAT; + + case MYSQL_TYPE_DOUBLE: + return Poco::Data::MetaColumn::FDT_DOUBLE; + + case MYSQL_TYPE_LONGLONG: + if (unsig) return Poco::Data::MetaColumn::FDT_UINT64; + return Poco::Data::MetaColumn::FDT_INT64; + + case MYSQL_TYPE_STRING: + case MYSQL_TYPE_VAR_STRING: + return Poco::Data::MetaColumn::FDT_STRING; + + case MYSQL_TYPE_TINY_BLOB: + case MYSQL_TYPE_MEDIUM_BLOB: + case MYSQL_TYPE_LONG_BLOB: + case MYSQL_TYPE_BLOB: + return Poco::Data::MetaColumn::FDT_BLOB; + default: + return Poco::Data::MetaColumn::FDT_UNKNOWN; + } + } +} // namespace + + +namespace Poco { +namespace Data { +namespace MySQL { + +void ResultMetadata::reset() +{ + _columns.resize(0); + _row.resize(0); + _buffer.resize(0); + _lengths.resize(0); + _isNull.resize(0); +} + +void ResultMetadata::init(MYSQL_STMT* stmt) +{ + ResultMetadataHandle h(stmt); + + if (!h) + { + // all right, it is normal + // querys such an "INSERT INTO" just does not have result at all + reset(); + return; + } + + std::size_t count = mysql_num_fields(h); + MYSQL_FIELD* fields = mysql_fetch_fields(h); + + std::size_t commonSize = 0; + _columns.reserve(count); + + {for (std::size_t i = 0; i < count; i++) + { + _columns.push_back(MetaColumn( + i, // position + fields[i].name, // name + fieldType(fields[i]), // type + fieldSize(fields[i]), // length + 0, // TODO: precision + !IS_NOT_NULL(fields[i].flags) // nullable + )); + + commonSize += _columns[i].length(); + }} + + _buffer.resize(commonSize); + _row.resize(count); + _lengths.resize(count); + _isNull.resize(count); + + std::size_t offset = 0; + + {for (std::size_t i = 0; i < count; i++) + { + std::memset(&_row[i], 0, sizeof(MYSQL_BIND)); + + _row[i].buffer_type = fields[i].type; + _row[i].buffer_length = static_cast(_columns[i].length()); + _row[i].buffer = &_buffer[0] + offset; + _row[i].length = &_lengths[i]; + _row[i].is_null = &_isNull[i]; + + offset += _row[i].buffer_length; + }} +} + +std::size_t ResultMetadata::columnsReturned() const +{ + return static_cast(_columns.size()); +} + +const MetaColumn& ResultMetadata::metaColumn(std::size_t pos) const +{ + return _columns[pos]; +} + +MYSQL_BIND* ResultMetadata::row() +{ + return &_row[0]; +} + +std::size_t ResultMetadata::length(std::size_t pos) const +{ + return _lengths[pos]; +} + +const unsigned char* ResultMetadata::rawData(std::size_t pos) const +{ + return reinterpret_cast(_row[pos].buffer); +} + +bool ResultMetadata::isNull(std::size_t pos) const +{ + return (_isNull[pos] != 0); +} + +}}} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/SessionImpl.cpp b/Data/MySQL/src/SessionImpl.cpp index 6884fd0f6..22f26bdb3 100644 --- a/Data/MySQL/src/SessionImpl.cpp +++ b/Data/MySQL/src/SessionImpl.cpp @@ -1,5 +1,5 @@ // -// MySQLException.cpp +// SessionImpl.cpp // // $Id: //poco/1.4/Data/MySQL/src/SessionImpl.cpp#1 $ // @@ -67,7 +67,7 @@ const std::string SessionImpl::MYSQL_SERIALIZABLE = "SERIALIZABLE"; SessionImpl::SessionImpl(const std::string& connectionString, std::size_t loginTimeout) : - Poco::Data::AbstractSessionImpl(toLower(connectionString), loginTimeout), + Poco::Data::AbstractSessionImpl(connectionString, loginTimeout), _handle(0), _connected(false), _inTransaction(false) diff --git a/Data/MySQL/src/SessionImpl.cpp~ b/Data/MySQL/src/SessionImpl.cpp~ new file mode 100644 index 000000000..6884fd0f6 --- /dev/null +++ b/Data/MySQL/src/SessionImpl.cpp~ @@ -0,0 +1,290 @@ +// +// MySQLException.cpp +// +// $Id: //poco/1.4/Data/MySQL/src/SessionImpl.cpp#1 $ +// +// Library: Data +// Package: MySQL +// Module: SessionImpl +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "Poco/Data/MySQL/SessionImpl.h" +#include "Poco/Data/MySQL/MySQLStatementImpl.h" +#include "Poco/Data/Session.h" +#include "Poco/NumberParser.h" +#include "Poco/String.h" + + +namespace +{ + std::string copyStripped(std::string::const_iterator from, std::string::const_iterator to) + { + // skip leading spaces + while ((from != to) && isspace(*from)) from++; + // skip trailing spaces + while ((from != to) && isspace(*(to - 1))) to--; + + return std::string(from, to); + } +} + + +namespace Poco { +namespace Data { +namespace MySQL { + + +const std::string SessionImpl::MYSQL_READ_UNCOMMITTED = "READ UNCOMMITTED"; +const std::string SessionImpl::MYSQL_READ_COMMITTED = "READ COMMITTED"; +const std::string SessionImpl::MYSQL_REPEATABLE_READ = "REPEATABLE READ"; +const std::string SessionImpl::MYSQL_SERIALIZABLE = "SERIALIZABLE"; + + +SessionImpl::SessionImpl(const std::string& connectionString, std::size_t loginTimeout) : + Poco::Data::AbstractSessionImpl(toLower(connectionString), loginTimeout), + _handle(0), + _connected(false), + _inTransaction(false) +{ + addProperty("insertId", + &SessionImpl::setInsertId, + &SessionImpl::getInsertId); + + open(); + setConnectionTimeout(CONNECTION_TIMEOUT_DEFAULT); +} + + +void SessionImpl::open(const std::string& connect) +{ + if (connect != connectionString()) + { + if (isConnected()) + throw InvalidAccessException("Session already connected"); + + if (!connect.empty()) + setConnectionString(connect); + } + + poco_assert_dbg (!connectionString().empty()); + + _handle.init(); + + unsigned int timeout = static_cast(getLoginTimeout()); + _handle.options(MYSQL_OPT_CONNECT_TIMEOUT, timeout); + + std::map options; + + // Default values + options["host"] = "localhost"; + options["port"] = "3306"; + options["user"] = ""; + options["password"] = ""; + options["db"] = ""; + options["compress"] = ""; + options["auto-reconnect"] = ""; + + const std::string& connString = connectionString(); + for (std::string::const_iterator start = connString.begin();;) + { + std::string::const_iterator finish = std::find(start, connString.end(), ';'); + std::string::const_iterator middle = std::find(start, finish, '='); + + if (middle == finish) + throw MySQLException("create session: bad connection string format, can not find '='"); + + options[copyStripped(start, middle)] = copyStripped(middle + 1, finish); + + if ((finish == connString.end()) || (finish + 1 == connString.end())) break; + + start = finish + 1; + } + + if (options["user"] == "") + throw MySQLException("create session: specify user name"); + + const char * db = NULL; + if (!options["db"].empty()) + db = options["db"].c_str(); + + unsigned int port = 0; + if (!NumberParser::tryParseUnsigned(options["port"], port) || 0 == port || port > 65535) + throw MySQLException("create session: specify correct port (numeric in decimal notation)"); + + if (options["compress"] == "true") + _handle.options(MYSQL_OPT_COMPRESS); + else if (options["compress"] == "false") + ; + else if (options["compress"] != "") + throw MySQLException("create session: specify correct compress option (true or false) or skip it"); + + if (options["auto-reconnect"] == "true") + _handle.options(MYSQL_OPT_RECONNECT, true); + else if (options["auto-reconnect"] == "false") + _handle.options(MYSQL_OPT_RECONNECT, false); + else if (options["auto-reconnect"] != "") + throw MySQLException("create session: specify correct auto-reconnect option (true or false) or skip it"); + + // Real connect + _handle.connect(options["host"].c_str(), + options["user"].c_str(), + options["password"].c_str(), + db, + port); + + addFeature("autoCommit", + &SessionImpl::autoCommit, + &SessionImpl::isAutoCommit); + + _connected = true; +} + + +SessionImpl::~SessionImpl() +{ + close(); +} + + +Poco::Data::StatementImpl* SessionImpl::createStatementImpl() +{ + return new MySQLStatementImpl(*this); +} + + +void SessionImpl::begin() +{ + Poco::FastMutex::ScopedLock l(_mutex); + + if (_inTransaction) + throw Poco::InvalidAccessException("Already in transaction."); + + _handle.startTransaction(); + _inTransaction = true; +} + + +void SessionImpl::commit() +{ + _handle.commit(); + _inTransaction = false; +} + + +void SessionImpl::rollback() +{ + _handle.rollback(); + _inTransaction = false; +} + + +void SessionImpl::autoCommit(const std::string&, bool val) +{ + StatementExecutor ex(_handle); + ex.prepare(Poco::format("SET autocommit=%d", val ? 1 : 0)); + ex.execute(); +} + + +bool SessionImpl::isAutoCommit(const std::string&) +{ + int ac = 0; + return 1 == getSetting("autocommit", ac); +} + + +void SessionImpl::setTransactionIsolation(Poco::UInt32 ti) +{ + std::string isolation; + switch (ti) + { + case Session::TRANSACTION_READ_UNCOMMITTED: + isolation = MYSQL_READ_UNCOMMITTED; break; + case Session::TRANSACTION_READ_COMMITTED: + isolation = MYSQL_READ_COMMITTED; break; + case Session::TRANSACTION_REPEATABLE_READ: + isolation = MYSQL_REPEATABLE_READ; break; + case Session::TRANSACTION_SERIALIZABLE: + isolation = MYSQL_SERIALIZABLE; break; + default: + throw Poco::InvalidArgumentException("setTransactionIsolation()"); + } + + StatementExecutor ex(_handle); + ex.prepare(Poco::format("SET SESSION TRANSACTION ISOLATION LEVEL %s", isolation)); + ex.execute(); +} + + +Poco::UInt32 SessionImpl::getTransactionIsolation() +{ + std::string isolation; + getSetting("tx_isolation", isolation); + Poco::replaceInPlace(isolation, "-", " "); + if (MYSQL_READ_UNCOMMITTED == isolation) + return Session::TRANSACTION_READ_UNCOMMITTED; + else if (MYSQL_READ_COMMITTED == isolation) + return Session::TRANSACTION_READ_COMMITTED; + else if (MYSQL_REPEATABLE_READ == isolation) + return Session::TRANSACTION_REPEATABLE_READ; + else if (MYSQL_SERIALIZABLE == isolation) + return Session::TRANSACTION_SERIALIZABLE; + + throw InvalidArgumentException("getTransactionIsolation()"); +} + + +bool SessionImpl::hasTransactionIsolation(Poco::UInt32 ti) +{ + return Session::TRANSACTION_READ_UNCOMMITTED == ti || + Session::TRANSACTION_READ_COMMITTED == ti || + Session::TRANSACTION_REPEATABLE_READ == ti || + Session::TRANSACTION_SERIALIZABLE == ti; +} + + +void SessionImpl::close() +{ + if (_connected) + { + _handle.close(); + _connected = false; + } +} + + +void SessionImpl::setConnectionTimeout(std::size_t timeout) +{ + _handle.options(MYSQL_OPT_READ_TIMEOUT, static_cast(timeout)); + _handle.options(MYSQL_OPT_WRITE_TIMEOUT, static_cast(timeout)); + _timeout = timeout; +} + + +}}} diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp index 6db543d09..a800a7c55 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.cpp +++ b/Data/MySQL/testsuite/src/MySQLTest.cpp @@ -64,7 +64,7 @@ Poco::SharedPtr MySQLTest::_pExecutor = 0; // Parameters for barebone-test #define MYSQL_USER "root" #define MYSQL_PWD "poco" -#define MYSQL_HOST "localhost" +#define MYSQL_HOST "192.168.1.33" #define MYSQL_PORT 3306 #define MYSQL_DB "test" @@ -417,6 +417,15 @@ void MySQLTest::testEmptyDB() } +void MySQLTest::testDateTime() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonDateTimeTable(); + _pExecutor->dateTime(); +} + + void MySQLTest::testBLOB() { if (!_pSession) fail ("Test not available."); @@ -697,6 +706,15 @@ void MySQLTest::recreatePersonBLOBTable() } +void MySQLTest::recreatePersonDateTimeTable() +{ + dropTable("Person"); + try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Birthday DATETIME)", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreatePersonDateTimeTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreatePersonDateTimeTable()"); } +} + + void MySQLTest::recreateIntsTable() { dropTable("Strings"); @@ -833,6 +851,7 @@ CppUnit::Test* MySQLTest::suite() CppUnit_addTest(pSuite, MySQLTest, testIllegalRange); CppUnit_addTest(pSuite, MySQLTest, testSingleSelect); CppUnit_addTest(pSuite, MySQLTest, testEmptyDB); + CppUnit_addTest(pSuite, MySQLTest, testDateTime); //CppUnit_addTest(pSuite, MySQLTest, testBLOB); CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt); CppUnit_addTest(pSuite, MySQLTest, testFloat); diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp~ b/Data/MySQL/testsuite/src/MySQLTest.cpp~ new file mode 100644 index 000000000..93e484bb0 --- /dev/null +++ b/Data/MySQL/testsuite/src/MySQLTest.cpp~ @@ -0,0 +1,861 @@ +// +// MySQLTest.cpp +// +// $Id: //poco/1.4/Data/MySQL/testsuite/src/MySQLTest.cpp#1 $ +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "MySQLTest.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" +#include "Poco/String.h" +#include "Poco/Format.h" +#include "Poco/Tuple.h" +#include "Poco/NamedTuple.h" +#include "Poco/Exception.h" +#include "Poco/Data/LOB.h" +#include "Poco/Data/StatementImpl.h" +#include "Poco/Data/MySQL/Connector.h" +#include "Poco/Data/MySQL/MySQLException.h" +#include "Poco/Nullable.h" +#include "Poco/Data/DataException.h" +#include + +using namespace Poco::Data; +using namespace Poco::Data::Keywords; +using Poco::Data::MySQL::ConnectionException; +using Poco::Data::MySQL::StatementException; +using Poco::format; +using Poco::NotFoundException; +using Poco::Int32; +using Poco::Nullable; +using Poco::Tuple; +using Poco::NamedTuple; + +Poco::SharedPtr MySQLTest::_pSession = 0; +Poco::SharedPtr MySQLTest::_pExecutor = 0; + +// +// Parameters for barebone-test +#define MYSQL_USER "root" +#define MYSQL_PWD "poco" +#define MYSQL_HOST "192.168.1.33" +#define MYSQL_PORT 3306 +#define MYSQL_DB "test" + +// +// Connection string +std::string MySQLTest::_dbConnString = "host=" MYSQL_HOST + ";user=" MYSQL_USER + ";password=" MYSQL_PWD + ";db=" MYSQL_DB + ";compress=true;auto-reconnect=true"; + + +MySQLTest::MySQLTest(const std::string& name): + CppUnit::TestCase(name) +{ + MySQL::Connector::registerConnector(); +} + + +MySQLTest::~MySQLTest() +{ + MySQL::Connector::unregisterConnector(); +} + + +void MySQLTest::testConnectNoDB() +{ + std::string dbConnString = "host=" MYSQL_HOST + ";user=" MYSQL_USER + ";password=" MYSQL_PWD + ";compress=true;auto-reconnect=true"; + + try + { + Session session(MySQL::Connector::KEY, dbConnString); + std::cout << "Connected to [" << "MySQL" << "] without database. Disconnecting ..." << std::endl; + session.close(); + std::cout << "Disconnected." << std::endl; + } + catch (ConnectionFailedException& ex) + { + std::cout << ex.displayText() << std::endl; + } +} + + +void MySQLTest::testBareboneMySQL() +{ + if (!_pSession) fail ("Test not available."); + + std::string tableCreateString = "CREATE TABLE Test " + "(First VARCHAR(30)," + "Second VARCHAR(30)," + "Third VARBINARY(30)," + "Fourth INTEGER," + "Fifth FLOAT)"; + + _pExecutor->bareboneMySQLTest(MYSQL_HOST, MYSQL_USER, MYSQL_PWD, MYSQL_DB, MYSQL_PORT, tableCreateString.c_str()); +} + + +void MySQLTest::testSimpleAccess() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->simpleAccess(); +} + + +void MySQLTest::testComplexType() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->complexType(); +} + + +void MySQLTest::testSimpleAccessVector() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->simpleAccessVector(); +} + + +void MySQLTest::testComplexTypeVector() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->complexTypeVector(); +} + + +void MySQLTest::testInsertVector() +{ + if (!_pSession) fail ("Test not available."); + + recreateStringsTable(); + _pExecutor->insertVector(); +} + + +void MySQLTest::testInsertEmptyVector() +{ + if (!_pSession) fail ("Test not available."); + + recreateStringsTable(); + _pExecutor->insertEmptyVector(); +} + + +void MySQLTest::testInsertSingleBulk() +{ + if (!_pSession) fail ("Test not available."); + + recreateIntsTable(); + _pExecutor->insertSingleBulk(); +} + + +void MySQLTest::testInsertSingleBulkVec() +{ + if (!_pSession) fail ("Test not available."); + + recreateIntsTable(); + _pExecutor->insertSingleBulkVec(); +} + + +void MySQLTest::testLimit() +{ + if (!_pSession) fail ("Test not available."); + + recreateIntsTable(); + _pExecutor->limits(); +} + + +void MySQLTest::testLimitZero() +{ + if (!_pSession) fail ("Test not available."); + + recreateIntsTable(); + _pExecutor->limitZero(); +} + + +void MySQLTest::testLimitOnce() +{ + if (!_pSession) fail ("Test not available."); + + recreateIntsTable(); + _pExecutor->limitOnce(); + +} + + +void MySQLTest::testLimitPrepare() +{ + if (!_pSession) fail ("Test not available."); + + recreateIntsTable(); + _pExecutor->limitPrepare(); +} + + + +void MySQLTest::testPrepare() +{ + if (!_pSession) fail ("Test not available."); + + recreateIntsTable(); + _pExecutor->prepare(); +} + + +void MySQLTest::testSetSimple() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->setSimple(); +} + + +void MySQLTest::testSetComplex() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->setComplex(); +} + + +void MySQLTest::testSetComplexUnique() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->setComplexUnique(); +} + +void MySQLTest::testMultiSetSimple() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->multiSetSimple(); +} + + +void MySQLTest::testMultiSetComplex() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->multiSetComplex(); +} + + +void MySQLTest::testMapComplex() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->mapComplex(); +} + + +void MySQLTest::testMapComplexUnique() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->mapComplexUnique(); +} + + +void MySQLTest::testMultiMapComplex() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->multiMapComplex(); +} + + +void MySQLTest::testSelectIntoSingle() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->selectIntoSingle(); +} + + +void MySQLTest::testSelectIntoSingleStep() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->selectIntoSingleStep(); +} + + +void MySQLTest::testSelectIntoSingleFail() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->selectIntoSingleFail(); +} + + +void MySQLTest::testLowerLimitOk() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->lowerLimitOk(); +} + + +void MySQLTest::testSingleSelect() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->singleSelect(); +} + + +void MySQLTest::testLowerLimitFail() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->lowerLimitFail(); +} + + +void MySQLTest::testCombinedLimits() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->combinedLimits(); +} + + + +void MySQLTest::testRange() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->ranges(); +} + + +void MySQLTest::testCombinedIllegalLimits() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->combinedIllegalLimits(); +} + + + +void MySQLTest::testIllegalRange() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->illegalRange(); +} + + +void MySQLTest::testEmptyDB() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->emptyDB(); +} + + +void MySQLTest::testBLOB() +{ + if (!_pSession) fail ("Test not available."); + + const std::size_t maxFldSize = 65534; + _pSession->setProperty("maxFieldSize", Poco::Any(maxFldSize-1)); + recreatePersonBLOBTable(); + + try + { + _pExecutor->blob(maxFldSize); + fail ("must fail"); + } + catch (DataException&) + { + _pSession->setProperty("maxFieldSize", Poco::Any(maxFldSize)); + } + + recreatePersonBLOBTable(); + _pExecutor->blob(maxFldSize); + + recreatePersonBLOBTable(); + + try + { + _pExecutor->blob(maxFldSize+1); + fail ("must fail"); + } + catch (DataException&) { } +} + + +void MySQLTest::testBLOBStmt() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonBLOBTable(); + _pExecutor->blobStmt(); +} + + +void MySQLTest::testFloat() +{ + if (!_pSession) fail ("Test not available."); + + recreateFloatsTable(); + _pExecutor->floats(); +} + + +void MySQLTest::testDouble() +{ + if (!_pSession) fail ("Test not available."); + + recreateFloatsTable(); + _pExecutor->doubles(); +} + + +void MySQLTest::testTuple() +{ + if (!_pSession) fail ("Test not available."); + + recreateTuplesTable(); + _pExecutor->tuples(); +} + + +void MySQLTest::testTupleVector() +{ + if (!_pSession) fail ("Test not available."); + + recreateTuplesTable(); + _pExecutor->tupleVector(); +} + + +void MySQLTest::testInternalExtraction() +{ + if (!_pSession) fail ("Test not available."); + + recreateVectorsTable(); + _pExecutor->internalExtraction(); +} + + +void MySQLTest::testNull() +{ + if (!_pSession) fail ("Test not available."); + + recreateVectorsTable(); + _pExecutor->doNull(); +} + + +void MySQLTest::testSessionTransaction() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->sessionTransaction(_dbConnString); +} + + +void MySQLTest::testTransaction() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->transaction(_dbConnString); +} + + +void MySQLTest::testReconnect() +{ + if (!_pSession) fail ("Test not available."); + + recreatePersonTable(); + _pExecutor->reconnect(); +} + + +void MySQLTest::testNullableInt() +{ + if (!_pSession) fail ("Test not available."); + + recreateNullableIntTable(); + + Nullable i1(1); + Nullable i2; + + int id = 1; + *_pSession << "INSERT INTO NullableIntTest VALUES(?, ?)", use(id), use(i1), now; + id = 2; + *_pSession << "INSERT INTO NullableIntTest VALUES(?, ?)", use(id), use(i2), now; + id = 3; + i2 = 3; + *_pSession << "INSERT INTO NullableIntTest VALUES(?, ?)", use(id), use(i2), now; + + int count = 0; + *_pSession << "SELECT COUNT(*) FROM NullableIntTest", into(count), now; + assert (count == 3); + + Nullable ci1; + Nullable ci2; + Nullable ci3; + id = 1; + *_pSession << "SELECT Value FROM NullableIntTest WHERE Id = ?", into(ci1), use(id), now; + assert (ci1 == i1); + id = 2; + *_pSession << "SELECT Value FROM NullableIntTest WHERE Id = ?", into(ci2), use(id), now; + assert (ci2.isNull()); + assert (!(0 == ci2)); + assert (0 != ci2); + assert (!(ci2 == 0)); + assert (ci2 != 0); + ci2 = 10; + assert (10 == ci2); + assert (ci2 == 10); + assert (!ci2.isNull()); + id = 3; + *_pSession << "SELECT Value FROM NullableIntTest WHERE Id = ?", into(ci3), use(id), now; + assert (!ci3.isNull()); + assert (ci3 == 3); + assert (3 == ci3); +} + + +void MySQLTest::testNullableString() +{ + if (!_pSession) fail ("Test not available."); + + recreateNullableStringTable(); + + Int32 id = 0; + Nullable address("Address"); + Nullable age = 10; + *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(id), use(address), use(age), now; + id++; + address = null; + age = null; + *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(id), use(address), use(age), now; + + Nullable resAddress; + Nullable resAge; + *_pSession << "SELECT Address, Age FROM NullableStringTest WHERE Id = ?", into(resAddress), into(resAge), use(id), now; + assert(resAddress == address); + assert(resAge == age); + assert(resAddress.isNull()); + assert(null == resAddress); + assert(resAddress == null); + + resAddress = std::string("Test"); + assert(!resAddress.isNull()); + assert(resAddress == std::string("Test")); + assert(std::string("Test") == resAddress); + assert(null != resAddress); + assert(resAddress != null); +} + + +void MySQLTest::testTupleWithNullable() +{ + if (!_pSession) fail ("Test not available."); + + recreateNullableStringTable(); + + typedef Poco::Tuple, Nullable > Info; + + Info info(0, std::string("Address"), 10); + *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(info), now; + + info.set<0>(info.get<0>()++); + info.set<1>(null); + *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(info), now; + + info.set<0>(info.get<0>()++); + info.set<1>(std::string("Address!")); + info.set<2>(null); + *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(info), now; + + std::vector infos; + infos.push_back(Info(10, std::string("A"), 0)); + infos.push_back(Info(11, null, 12)); + infos.push_back(Info(12, std::string("B"), null)); + + *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(infos), now; + + std::vector result; + + *_pSession << "SELECT Id, Address, Age FROM NullableStringTest", into(result), now; + + assert(result[0].get<1>() == std::string("Address")); + assert(result[0].get<2>() == 10); + + assert(result[1].get<1>() == null); + assert(result[1].get<2>() == 10); + + assert(result[2].get<1>() == std::string("Address!")); + assert(result[2].get<2>() == null); + + assert(result[3].get<1>() == std::string("A")); + assert(result[3].get<2>() == 0); + + assert(result[4].get<1>() == null); + assert(result[4].get<2>() == 12); + + assert(result[5].get<1>() == std::string("B")); + assert(result[5].get<2>() == null); + +} + + +void MySQLTest::dropTable(const std::string& tableName) +{ + + try { *_pSession << format("DROP TABLE IF EXISTS %s", tableName), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("dropTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("dropTable()"); } +} + + +void MySQLTest::recreatePersonTable() +{ + dropTable("Person"); + try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Age INTEGER)", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreatePersonTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreatePersonTable()"); } +} + + +void MySQLTest::recreatePersonBLOBTable() +{ + dropTable("Person"); + try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Image BLOB)", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreatePersonBLOBTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreatePersonBLOBTable()"); } +} + + +void MySQLTest::recreatePersonDateTimeTable() +{ + dropTable("Person"); + try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Birthday DATETIME)", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreatePersonDateTimeTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreatePersonDateTimeTable()"); } +} + + +void MySQLTest::recreateIntsTable() +{ + dropTable("Strings"); + try { *_pSession << "CREATE TABLE Strings (str INTEGER)", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateIntsTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateIntsTable()"); } +} + + +void MySQLTest::recreateStringsTable() +{ + dropTable("Strings"); + try { *_pSession << "CREATE TABLE Strings (str VARCHAR(30))", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateStringsTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateStringsTable()"); } +} + + +void MySQLTest::recreateFloatsTable() +{ + dropTable("Strings"); + try { *_pSession << "CREATE TABLE Strings (str FLOAT)", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateFloatsTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateFloatsTable()"); } +} + + +void MySQLTest::recreateTuplesTable() +{ + dropTable("Tuples"); + try { *_pSession << "CREATE TABLE Tuples " + "(i0 INTEGER, i1 INTEGER, i2 INTEGER, i3 INTEGER, i4 INTEGER, i5 INTEGER, i6 INTEGER, " + "i7 INTEGER, i8 INTEGER, i9 INTEGER, i10 INTEGER, i11 INTEGER, i12 INTEGER, i13 INTEGER," + "i14 INTEGER, i15 INTEGER, i16 INTEGER, i17 INTEGER, i18 INTEGER, i19 INTEGER)", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateTuplesTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateTuplesTable()"); } +} + + +void MySQLTest::recreateNullableIntTable() +{ + dropTable("NullableIntTest"); + try { + *_pSession << "CREATE TABLE NullableIntTest (Id INTEGER(10), Value INTEGER(10))", now; + } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateNullableIntTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateNullableIntTable()"); } +} + + +void MySQLTest::recreateNullableStringTable() +{ + dropTable("NullableStringTest"); + try { + *_pSession << "CREATE TABLE NullableStringTest (Id INTEGER(10), Address VARCHAR(30), Age INTEGER(10))", now; + } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateNullableStringTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateNullableStringTable()"); } +} + + +void MySQLTest::recreateVectorsTable() +{ + dropTable("Vectors"); + try { *_pSession << "CREATE TABLE Vectors (i0 INTEGER, flt0 FLOAT, str0 VARCHAR(30))", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateVectorsTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateVectorsTable()"); } +} + + +void MySQLTest::setUp() +{ +} + + +void MySQLTest::tearDown() +{ + dropTable("Person"); + dropTable("Strings"); +} + + +CppUnit::Test* MySQLTest::suite() +{ + MySQL::Connector::registerConnector(); + + try + { + _pSession = new Session(MySQL::Connector::KEY, _dbConnString); + } + catch (ConnectionFailedException& ex) + { + std::cout << ex.displayText() << std::endl; + return 0; + } + + std::cout << "*** Connected to [" << "MySQL" << "] test database." << std::endl; + + _pExecutor = new SQLExecutor("MySQL SQL Executor", _pSession); + + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("MySQLTest"); + + CppUnit_addTest(pSuite, MySQLTest, testConnectNoDB); + CppUnit_addTest(pSuite, MySQLTest, testBareboneMySQL); + CppUnit_addTest(pSuite, MySQLTest, testSimpleAccess); + CppUnit_addTest(pSuite, MySQLTest, testComplexType); + CppUnit_addTest(pSuite, MySQLTest, testSimpleAccessVector); + CppUnit_addTest(pSuite, MySQLTest, testComplexTypeVector); + CppUnit_addTest(pSuite, MySQLTest, testInsertVector); + CppUnit_addTest(pSuite, MySQLTest, testInsertEmptyVector); + CppUnit_addTest(pSuite, MySQLTest, testInsertSingleBulk); + CppUnit_addTest(pSuite, MySQLTest, testInsertSingleBulkVec); + CppUnit_addTest(pSuite, MySQLTest, testLimit); + CppUnit_addTest(pSuite, MySQLTest, testLimitOnce); + CppUnit_addTest(pSuite, MySQLTest, testLimitPrepare); + CppUnit_addTest(pSuite, MySQLTest, testLimitZero); + CppUnit_addTest(pSuite, MySQLTest, testPrepare); + CppUnit_addTest(pSuite, MySQLTest, testSetSimple); + CppUnit_addTest(pSuite, MySQLTest, testSetComplex); + CppUnit_addTest(pSuite, MySQLTest, testSetComplexUnique); + CppUnit_addTest(pSuite, MySQLTest, testMultiSetSimple); + CppUnit_addTest(pSuite, MySQLTest, testMultiSetComplex); + CppUnit_addTest(pSuite, MySQLTest, testMapComplex); + CppUnit_addTest(pSuite, MySQLTest, testMapComplexUnique); + CppUnit_addTest(pSuite, MySQLTest, testMultiMapComplex); + CppUnit_addTest(pSuite, MySQLTest, testSelectIntoSingle); + CppUnit_addTest(pSuite, MySQLTest, testSelectIntoSingleStep); + CppUnit_addTest(pSuite, MySQLTest, testSelectIntoSingleFail); + CppUnit_addTest(pSuite, MySQLTest, testLowerLimitOk); + CppUnit_addTest(pSuite, MySQLTest, testLowerLimitFail); + CppUnit_addTest(pSuite, MySQLTest, testCombinedLimits); + CppUnit_addTest(pSuite, MySQLTest, testCombinedIllegalLimits); + CppUnit_addTest(pSuite, MySQLTest, testRange); + CppUnit_addTest(pSuite, MySQLTest, testIllegalRange); + CppUnit_addTest(pSuite, MySQLTest, testSingleSelect); + CppUnit_addTest(pSuite, MySQLTest, testEmptyDB); + //CppUnit_addTest(pSuite, MySQLTest, testBLOB); + CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt); + CppUnit_addTest(pSuite, MySQLTest, testFloat); + CppUnit_addTest(pSuite, MySQLTest, testDouble); + CppUnit_addTest(pSuite, MySQLTest, testTuple); + CppUnit_addTest(pSuite, MySQLTest, testTupleVector); + CppUnit_addTest(pSuite, MySQLTest, testInternalExtraction); + CppUnit_addTest(pSuite, MySQLTest, testNull); + CppUnit_addTest(pSuite, MySQLTest, testNullableInt); + CppUnit_addTest(pSuite, MySQLTest, testNullableString); + CppUnit_addTest(pSuite, MySQLTest, testTupleWithNullable); + CppUnit_addTest(pSuite, MySQLTest, testSessionTransaction); + CppUnit_addTest(pSuite, MySQLTest, testTransaction); + CppUnit_addTest(pSuite, MySQLTest, testReconnect); + + return pSuite; +} diff --git a/Data/MySQL/testsuite/src/MySQLTest.h b/Data/MySQL/testsuite/src/MySQLTest.h index b84b94d7c..3a9fe275c 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.h +++ b/Data/MySQL/testsuite/src/MySQLTest.h @@ -95,7 +95,7 @@ public: void testIllegalRange(); void testSingleSelect(); void testEmptyDB(); - + void testDateTime(); void testBLOB(); void testBLOBStmt(); @@ -129,6 +129,7 @@ private: void dropTable(const std::string& tableName); void recreatePersonTable(); void recreatePersonBLOBTable(); + void recreatePersonDateTimeTable(); void recreateStringsTable(); void recreateIntsTable(); void recreateFloatsTable(); diff --git a/Data/MySQL/testsuite/src/MySQLTest.h~ b/Data/MySQL/testsuite/src/MySQLTest.h~ new file mode 100644 index 000000000..1132571f9 --- /dev/null +++ b/Data/MySQL/testsuite/src/MySQLTest.h~ @@ -0,0 +1,148 @@ +// +// ODBCMySQLTest.h +// +// $Id: //poco/1.4/Data/MySQL/testsuite/src/ODBCMySQLTest.h#1 $ +// +// Definition of the MySQLTest class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef MySQLTest_INCLUDED +#define MySQLTest_INCLUDED + + +#include "Poco/Data/MySQL/MySQL.h" +#include "Poco/Data/Session.h" +#include "Poco/SharedPtr.h" +#include "CppUnit/TestCase.h" +#include "SQLExecutor.h" + + +class MySQLTest: public CppUnit::TestCase + /// MySQL test class + /// Tested: + /// + /// Driver | DB | OS + /// ----------------+---------------------------+------------------------------------------ + /// 03.51.12.00 | MySQL 5.0.27-community-nt | MS Windows XP Professional x64 v.2003/SP1 + /// + +{ +public: + MySQLTest(const std::string& name); + ~MySQLTest(); + + void testConnectNoDB(); + void testBareboneMySQL(); + + void testSimpleAccess(); + void testComplexType(); + void testSimpleAccessVector(); + void testComplexTypeVector(); + void testInsertVector(); + void testInsertEmptyVector(); + + void testInsertSingleBulk(); + void testInsertSingleBulkVec(); + + void testLimit(); + void testLimitOnce(); + void testLimitPrepare(); + void testLimitZero(); + void testPrepare(); + + void testSetSimple(); + void testSetComplex(); + void testSetComplexUnique(); + void testMultiSetSimple(); + void testMultiSetComplex(); + void testMapComplex(); + void testMapComplexUnique(); + void testMultiMapComplex(); + void testSelectIntoSingle(); + void testSelectIntoSingleStep(); + void testSelectIntoSingleFail(); + void testLowerLimitOk(); + void testLowerLimitFail(); + void testCombinedLimits(); + void testCombinedIllegalLimits(); + void testRange(); + void testIllegalRange(); + void testSingleSelect(); + void testEmptyDB(); + + void testBLOB(); + void testBLOBStmt(); + + void testFloat(); + void testDouble(); + + void testTuple(); + void testTupleVector(); + + void testInternalExtraction(); + + void testNull(); + void testNullVector(); + + void testNullableInt(); + void testNullableString(); + void testTupleWithNullable(); + + void testSessionTransaction(); + void testTransaction(); + + void testReconnect(); + + void setUp(); + void tearDown(); + + static CppUnit::Test* suite(); + +private: + + void dropTable(const std::string& tableName); + void recreatePersonTable(); + void recreatePersonBLOBTable(); + void recreatePersonDateTimeTable(); + void recreateStringsTable(); + void recreateIntsTable(); + void recreateFloatsTable(); + void recreateTuplesTable(); + void recreateVectorsTable(); + void recreateNullableIntTable(); + void recreateNullableStringTable(); + + static std::string _dbConnString; + static Poco::SharedPtr _pSession; + static Poco::SharedPtr _pExecutor; + static const bool bindValues[8]; +}; + + +#endif // MySQLTest_INCLUDED diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index c4a4f150b..4e63a6109 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -35,6 +35,7 @@ #include "Poco/String.h" #include "Poco/Format.h" #include "Poco/Tuple.h" +#include "Poco/DateTime.h" #include "Poco/Any.h" #include "Poco/Exception.h" #include "Poco/Data/LOB.h" @@ -58,6 +59,7 @@ using Poco::Data::MySQL::ConnectionException; using Poco::Data::MySQL::StatementException; using Poco::format; using Poco::Tuple; +using Poco::DateTime; using Poco::Any; using Poco::AnyCast; using Poco::NotFoundException; @@ -1295,6 +1297,35 @@ void SQLExecutor::blob(int bigSize) assert (res == big); } + +void SQLExecutor::dateTime() +{ + std::string funct = "dateTime()"; + std::string lastName("Bart"); + std::string firstName("Simpson"); + std::string address("Springfield"); + DateTime birthday(1980, 4, 1, 5, 45, 12); + + int count = 0; + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(birthday), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + DateTime bd; + assert (bd != birthday); + try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (bd == birthday); + + std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person"); +} + + void SQLExecutor::blobStmt() { std::string funct = "blobStmt()"; @@ -1320,6 +1351,7 @@ void SQLExecutor::blobStmt() poco_assert (res == blob); } + void SQLExecutor::tuples() { typedef Tuple TupleType; @@ -1338,6 +1370,7 @@ void SQLExecutor::tuples() assert (ret == t); } + void SQLExecutor::tupleVector() { typedef Tuple TupleType; diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp~ b/Data/MySQL/testsuite/src/SQLExecutor.cpp~ new file mode 100644 index 000000000..e120749eb --- /dev/null +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp~ @@ -0,0 +1,1878 @@ +// +// SQLExecutor.cpp +// +// $Id: //poco/1.4/Data/MySQL/testsuite/src/SQLExecutor.cpp#1 $ +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "CppUnit/TestCase.h" +#include "SQLExecutor.h" +#include "Poco/String.h" +#include "Poco/Format.h" +#include "Poco/Tuple.h" +#include "Poco/DateTime.h" +#include "Poco/Any.h" +#include "Poco/Exception.h" +#include "Poco/Data/LOB.h" +#include "Poco/Data/StatementImpl.h" +#include "Poco/Data/RecordSet.h" +#include "Poco/Data/Transaction.h" +#include "Poco/Data/MySQL/Connector.h" +#include "Poco/Data/MySQL/MySQLException.h" + +#ifdef _WIN32 +#include +#endif + +#include +#include + + +using namespace Poco::Data; +using namespace Poco::Data::Keywords; +using Poco::Data::MySQL::ConnectionException; +using Poco::Data::MySQL::StatementException; +using Poco::format; +using Poco::Tuple; +using Poco::DateTime; +using Poco::Any; +using Poco::AnyCast; +using Poco::NotFoundException; +using Poco::InvalidAccessException; +using Poco::BadCastException; +using Poco::RangeException; + + +struct Person +{ + std::string lastName; + std::string firstName; + std::string address; + int age; + Person(){age = 0;} + Person(const std::string& ln, const std::string& fn, const std::string& adr, int a):lastName(ln), firstName(fn), address(adr), age(a) + { + } + bool operator==(const Person& other) const + { + return lastName == other.lastName && firstName == other.firstName && address == other.address && age == other.age; + } + + bool operator < (const Person& p) const + { + if (age < p.age) + return true; + if (lastName < p.lastName) + return true; + if (firstName < p.firstName) + return true; + return (address < p.address); + } + + const std::string& operator () () const + /// This method is required so we can extract data to a map! + { + // we choose the lastName as examplary key + return lastName; + } +}; + + +namespace Poco { +namespace Data { + + +template <> +class TypeHandler +{ +public: + static void bind(std::size_t pos, const Person& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Address VARCHAR, Age INTEGER(3)) + poco_assert_dbg (pBinder != 0); + pBinder->bind(pos++, obj.lastName, dir); + pBinder->bind(pos++, obj.firstName, dir); + pBinder->bind(pos++, obj.address, dir); + pBinder->bind(pos++, obj.age, dir); + } + + static void prepare(std::size_t pos, const Person& obj, AbstractPreparator* pPrepare) + { + // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Address VARCHAR, Age INTEGER(3)) + poco_assert_dbg (pPrepare != 0); + pPrepare->prepare(pos++, obj.lastName); + pPrepare->prepare(pos++, obj.firstName); + pPrepare->prepare(pos++, obj.address); + pPrepare->prepare(pos++, obj.age); + } + + static std::size_t size() + { + return 4; + } + + static void extract(std::size_t pos, Person& obj, const Person& defVal, AbstractExtractor* pExt) + { + poco_assert_dbg (pExt != 0); + if (!pExt->extract(pos++, obj.lastName)) + obj.lastName = defVal.lastName; + if (!pExt->extract(pos++, obj.firstName)) + obj.firstName = defVal.firstName; + if (!pExt->extract(pos++, obj.address)) + obj.address = defVal.address; + if (!pExt->extract(pos++, obj.age)) + obj.age = defVal.age; + } + +private: + TypeHandler(); + ~TypeHandler(); + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +} } // namespace Poco::Data + + +SQLExecutor::SQLExecutor(const std::string& name, Poco::Data::Session* pSession): + CppUnit::TestCase(name), + _pSession(pSession) +{ +} + + +SQLExecutor::~SQLExecutor() +{ +} + + +void SQLExecutor::bareboneMySQLTest(const char* host, const char* user, const char* pwd, const char* db, int port, const char* tableCreateString) +{ + int rc; + MYSQL* hsession = mysql_init(0); + assert (hsession != 0); + + MYSQL* tmp = mysql_real_connect(hsession, host, user, pwd, db, port, 0, 0); + assert(tmp == hsession); + + MYSQL_STMT* hstmt = mysql_stmt_init(hsession); + assert(hstmt != 0); + + std::string sql = "DROP TABLE Test"; + mysql_real_query(hsession, sql.c_str(), static_cast(sql.length())); + + sql = tableCreateString; + rc = mysql_stmt_prepare(hstmt, sql.c_str(), static_cast(sql.length())); + assert(rc == 0); + + rc = mysql_stmt_execute(hstmt); + assert(rc == 0); + + sql = "INSERT INTO Test VALUES (?,?,?,?,?)"; + rc = mysql_stmt_prepare(hstmt, sql.c_str(), static_cast(sql.length())); + assert(rc == 0); + + std::string str[3] = { "111", "222", "333" }; + int fourth = 4; + float fifth = 1.5; + + MYSQL_BIND bind_param[5] = {{0}}; + + bind_param[0].buffer = const_cast(str[0].c_str()); + bind_param[0].buffer_length = static_cast(str[0].length()); + bind_param[0].buffer_type = MYSQL_TYPE_STRING; + + bind_param[1].buffer = const_cast(str[1].c_str()); + bind_param[1].buffer_length = static_cast(str[1].length()); + bind_param[1].buffer_type = MYSQL_TYPE_STRING; + + bind_param[2].buffer = const_cast(str[2].c_str()); + bind_param[2].buffer_length = static_cast(str[2].length()); + bind_param[2].buffer_type = MYSQL_TYPE_STRING; + + bind_param[3].buffer = &fourth; + bind_param[3].buffer_type = MYSQL_TYPE_LONG; + + bind_param[4].buffer = &fifth; + bind_param[4].buffer_type = MYSQL_TYPE_FLOAT; + + rc = mysql_stmt_bind_param(hstmt, bind_param); + assert (rc == 0); + + rc = mysql_stmt_execute(hstmt); + assert (rc == 0); + + sql = "SELECT * FROM Test"; + rc = mysql_stmt_prepare(hstmt, sql.c_str(), static_cast(sql.length())); + assert (rc == 0); + + char chr[3][5] = {{ 0 }}; + unsigned long lengths[5] = { 0 }; + fourth = 0; + fifth = 0.0f; + + MYSQL_BIND bind_result[5] = {{0}}; + + bind_result[0].buffer = chr[0]; + bind_result[0].buffer_length = sizeof(chr[0]); + bind_result[0].buffer_type = MYSQL_TYPE_STRING; + bind_result[0].length = &lengths[0]; + + bind_result[1].buffer = chr[1]; + bind_result[1].buffer_length = sizeof(chr[1]); + bind_result[1].buffer_type = MYSQL_TYPE_STRING; + bind_result[1].length = &lengths[1]; + + bind_result[2].buffer = chr[2]; + bind_result[2].buffer_length = sizeof(chr[2]); + bind_result[2].buffer_type = MYSQL_TYPE_STRING; + bind_result[2].length = &lengths[2]; + + bind_result[3].buffer = &fourth; + bind_result[3].buffer_type = MYSQL_TYPE_LONG; + bind_result[3].length = &lengths[3]; + + bind_result[4].buffer = &fifth; + bind_result[4].buffer_type = MYSQL_TYPE_FLOAT; + bind_result[4].length = &lengths[4]; + + rc = mysql_stmt_bind_result(hstmt, bind_result); + assert (rc == 0); + + rc = mysql_stmt_execute(hstmt); + assert (rc == 0); + rc = mysql_stmt_fetch(hstmt); + assert (rc == 0); + + assert (0 == std::strncmp("111", chr[0], 3)); + assert (0 == std::strncmp("222", chr[1], 3)); + assert (0 == std::strncmp("333", chr[2], 3)); + assert (4 == fourth); + assert (1.5 == fifth); + + rc = mysql_stmt_close(hstmt); + assert(rc == 0); + + sql = "DROP TABLE Test"; + rc = mysql_real_query(hsession, sql.c_str(), static_cast(sql.length())); + assert(rc == 0); + + mysql_close(hsession); +} + + +void SQLExecutor::simpleAccess() +{ + std::string funct = "simpleAccess()"; + std::string lastName = "lastName"; + std::string firstName("firstName"); + std::string address("Address"); + int age = 133132; + int count = 0; + std::string result; + + count = 0; + try + { + Statement stmt(*_pSession); + stmt << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age);//, now; + stmt.execute(); + } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + assert (count == 1); + + try { *_pSession << "SELECT LastName FROM Person", into(result), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (lastName == result); + + try { *_pSession << "SELECT Age FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == age); +} + + +void SQLExecutor::complexType() +{ + std::string funct = "complexType()"; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(p1), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(p2), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + + Person c1; + Person c2; + try { *_pSession << "SELECT * FROM Person WHERE LastName = 'LN1'", into(c1), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (c1 == p1); +} + + +void SQLExecutor::simpleAccessVector() +{ + std::string funct = "simpleAccessVector()"; + std::vector lastNames; + std::vector firstNames; + std::vector addresses; + std::vector ages; + std::string tableName("Person"); + lastNames.push_back("LN1"); + lastNames.push_back("LN2"); + firstNames.push_back("FN1"); + firstNames.push_back("FN2"); + addresses.push_back("ADDR1"); + addresses.push_back("ADDR2"); + ages.push_back(1); + ages.push_back(2); + int count = 0; + std::string result; + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + + std::vector lastNamesR; + std::vector firstNamesR; + std::vector addressesR; + std::vector agesR; + try { *_pSession << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (ages == agesR); + assert (lastNames == lastNamesR); + assert (firstNames == firstNamesR); + assert (addresses == addressesR); +} + + +void SQLExecutor::complexTypeVector() +{ + std::string funct = "complexTypeVector()"; + std::vector people; + people.push_back(Person("LN1", "FN1", "ADDR1", 1)); + people.push_back(Person("LN2", "FN2", "ADDR2", 2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + + std::vector result; + try { *_pSession << "SELECT * FROM Person", into(result), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (result == people); +} + + +void SQLExecutor::insertVector() +{ + std::string funct = "insertVector()"; + std::vector str; + str.push_back("s1"); + str.push_back("s2"); + str.push_back("s3"); + str.push_back("s3"); + int count = 100; + + { + Statement stmt((*_pSession << "INSERT INTO Strings VALUES (?)", use(str))); + try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 0); + + try { stmt.execute(); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 4); + } + count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 4); +} + + +void SQLExecutor::insertEmptyVector() +{ + std::string funct = "insertEmptyVector()"; + std::vector str; + + try + { + *_pSession << "INSERT INTO Strings VALUES (?)", use(str), now; + fail("empty collections should not work"); + } + catch (Poco::Exception&) + { + } +} + + +void SQLExecutor::insertSingleBulk() +{ + std::string funct = "insertSingleBulk()"; + int x = 0; + Statement stmt((*_pSession << "INSERT INTO Strings VALUES (?)", use(x))); + + for (x = 0; x < 100; ++x) + { + std::size_t i = stmt.execute(); + assert (i == 0); + } + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 100); + + try { *_pSession << "SELECT SUM(str) FROM Strings", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == ((0+99)*100/2)); +} + + +void SQLExecutor::floats() +{ + std::string funct = "floats()"; + float data = 1.5f; + float ret = 0.0f; + + try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + try { *_pSession << "SELECT str FROM Strings", into(ret), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (ret == data); +} + + +void SQLExecutor::doubles() +{ + std::string funct = "floats()"; + double data = 1.5; + double ret = 0.0; + + try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + try { *_pSession << "SELECT str FROM Strings", into(ret), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (ret == data); +} + + +void SQLExecutor::insertSingleBulkVec() +{ + std::string funct = "insertSingleBulkVec()"; + std::vector data; + + for (int x = 0; x < 100; ++x) + data.push_back(x); + + Statement stmt((*_pSession << "INSERT INTO Strings VALUES (?)", use(data))); + stmt.execute(); + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + assert (count == 100); + try { *_pSession << "SELECT SUM(str) FROM Strings", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == ((0+99)*100/2)); +} + + +void SQLExecutor::limits() +{ + std::string funct = "limit()"; + std::vector data; + for (int x = 0; x < 100; ++x) + { + data.push_back(x); + } + + try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + std::vector retData; + try { *_pSession << "SELECT * FROM Strings", into(retData), limit(50), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (retData.size() == 50); + for (int x = 0; x < 50; ++x) + { + assert(data[x] == retData[x]); + } +} + + +void SQLExecutor::limitZero() +{ + std::string funct = "limitZero()"; + std::vector data; + for (int x = 0; x < 100; ++x) + { + data.push_back(x); + } + + try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + std::vector retData; + try { *_pSession << "SELECT * FROM Strings", into(retData), limit(0), now; }// stupid test, but at least we shouldn't crash + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (retData.size() == 0); +} + + +void SQLExecutor::limitOnce() +{ + std::string funct = "limitOnce()"; + std::vector data; + for (int x = 0; x < 101; ++x) + { + data.push_back(x); + } + + try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + std::vector retData; + Statement stmt = (*_pSession << "SELECT * FROM Strings", into(retData), limit(50), now); + assert (!stmt.done()); + assert (retData.size() == 50); + stmt.execute(); + assert (!stmt.done()); + assert (retData.size() == 100); + stmt.execute(); + assert (stmt.done()); + assert (retData.size() == 101); + + for (int x = 0; x < 101; ++x) + { + assert(data[x] == retData[x]); + } +} + + +void SQLExecutor::limitPrepare() +{ + std::string funct = "limitPrepare()"; + std::vector data; + for (int x = 0; x < 100; ++x) + { + data.push_back(x); + } + + try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + std::vector retData; + Statement stmt = (*_pSession << "SELECT * FROM Strings", into(retData), limit(50)); + assert (retData.size() == 0); + assert (!stmt.done()); + + try { stmt.execute(); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (!stmt.done()); + assert (retData.size() == 50); + + try { stmt.execute(); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (stmt.done()); + assert (retData.size() == 100); + + try { stmt.execute(); }// will restart execution! + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (!stmt.done()); + assert (retData.size() == 150); + for (int x = 0; x < 150; ++x) + { + assert(data[x%100] == retData[x]); + } +} + + + +void SQLExecutor::prepare() +{ + std::string funct = "prepare()"; + std::vector data; + for (int x = 0; x < 100; x += 2) + { + data.push_back(x); + } + + { + Statement stmt((*_pSession << "INSERT INTO Strings VALUES (?)", use(data))); + } + // stmt should not have been executed when destroyed + int count = 100; + try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 0); +} + + +void SQLExecutor::setSimple() +{ + std::string funct = "setSimple()"; + std::set lastNames; + std::set firstNames; + std::set addresses; + std::set ages; + std::string tableName("Person"); + lastNames.insert("LN1"); + lastNames.insert("LN2"); + firstNames.insert("FN1"); + firstNames.insert("FN2"); + addresses.insert("ADDR1"); + addresses.insert("ADDR2"); + ages.insert(1); + ages.insert(2); + int count = 0; + std::string result; + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + + std::set lastNamesR; + std::set firstNamesR; + std::set addressesR; + std::set agesR; + try { *_pSession << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (ages == agesR); + assert (lastNames == lastNamesR); + assert (firstNames == firstNamesR); + assert (addresses == addressesR); +} + + +void SQLExecutor::setComplex() +{ + std::string funct = "setComplex()"; + std::set people; + people.insert(Person("LN1", "FN1", "ADDR1", 1)); + people.insert(Person("LN2", "FN2", "ADDR2", 2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + + std::set result; + try { *_pSession << "SELECT * FROM Person", into(result), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (result == people); +} + + +void SQLExecutor::setComplexUnique() +{ + std::string funct = "setComplexUnique()"; + std::vector people; + Person p1("LN1", "FN1", "ADDR1", 1); + people.push_back(p1); + people.push_back(p1); + people.push_back(p1); + people.push_back(p1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.push_back(p2); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 5); + + std::set result; + try { *_pSession << "SELECT * FROM Person", into(result), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (result.size() == 2); + assert (*result.begin() == p1); + assert (*++result.begin() == p2); +} + +void SQLExecutor::multiSetSimple() +{ + std::string funct = "multiSetSimple()"; + std::multiset lastNames; + std::multiset firstNames; + std::multiset addresses; + std::multiset ages; + std::string tableName("Person"); + lastNames.insert("LN1"); + lastNames.insert("LN2"); + firstNames.insert("FN1"); + firstNames.insert("FN2"); + addresses.insert("ADDR1"); + addresses.insert("ADDR2"); + ages.insert(1); + ages.insert(2); + int count = 0; + std::string result; + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + + std::multiset lastNamesR; + std::multiset firstNamesR; + std::multiset addressesR; + std::multiset agesR; + try { *_pSession << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (ages.size() == agesR.size()); + assert (lastNames.size() == lastNamesR.size()); + assert (firstNames.size() == firstNamesR.size()); + assert (addresses.size() == addressesR.size()); +} + + +void SQLExecutor::multiSetComplex() +{ + std::string funct = "multiSetComplex()"; + std::multiset people; + Person p1("LN1", "FN1", "ADDR1", 1); + people.insert(p1); + people.insert(p1); + people.insert(p1); + people.insert(p1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(p2); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 5); + + std::multiset result; + try { *_pSession << "SELECT * FROM Person", into(result), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (result.size() == people.size()); +} + + +void SQLExecutor::mapComplex() +{ + std::string funct = "mapComplex()"; + std::map people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN2", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + + std::map result; + try { *_pSession << "SELECT * FROM Person", into(result), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (result == people); +} + + +void SQLExecutor::mapComplexUnique() +{ + std::string funct = "mapComplexUnique()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN2", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 5); + + std::map result; + try { *_pSession << "SELECT * FROM Person", into(result), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (result.size() == 2); +} + + +void SQLExecutor::multiMapComplex() +{ + std::string funct = "multiMapComplex()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN2", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 5); + + std::multimap result; + try { *_pSession << "SELECT * FROM Person", into(result), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (result.size() == people.size()); +} + + +void SQLExecutor::selectIntoSingle() +{ + std::string funct = "selectIntoSingle()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + Person result; + try { *_pSession << "SELECT * FROM Person", into(result), limit(1), now; }// will return 1 object into one single result + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (result == p1); +} + + +void SQLExecutor::selectIntoSingleStep() +{ + std::string funct = "selectIntoSingleStep()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + Person result; + Statement stmt = (*_pSession << "SELECT * FROM Person", into(result), limit(1)); + stmt.execute(); + assert (result == p1); + assert (!stmt.done()); + stmt.execute(); + assert (result == p2); + assert (stmt.done()); +} + + +void SQLExecutor::selectIntoSingleFail() +{ + std::string funct = "selectIntoSingleFail()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), limit(2, true), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + Person result; + try + { + *_pSession << "SELECT * FROM Person", into(result), limit(1, true), now; // will fail now + fail("hardLimit is set: must fail"); + } + catch(Poco::Data::LimitException&) + { + } +} + + +void SQLExecutor::lowerLimitOk() +{ + std::string funct = "lowerLimitOk()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + Person result; + try + { + *_pSession << "SELECT * FROM Person", into(result), lowerLimit(2), now; // will return 2 objects into one single result but only room for one! + fail("Not enough space for results"); + } + catch(Poco::Exception&) + { + } +} + + +void SQLExecutor::singleSelect() +{ + std::string funct = "singleSelect()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + Person result; + Statement stmt = (*_pSession << "SELECT * FROM Person", into(result), limit(1)); + stmt.execute(); + assert (result == p1); + assert (!stmt.done()); + stmt.execute(); + assert (result == p2); + assert (stmt.done()); +} + + +void SQLExecutor::lowerLimitFail() +{ + std::string funct = "lowerLimitFail()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + Person result; + try + { + *_pSession << "SELECT * FROM Person", into(result), lowerLimit(3), now; // will fail + fail("should fail. not enough data"); + } + catch(Poco::Exception&) + { + } +} + + +void SQLExecutor::combinedLimits() +{ + std::string funct = "combinedLimits()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + std::vector result; + try { *_pSession << "SELECT * FROM Person", into(result), lowerLimit(2), upperLimit(2), now; }// will return 2 objects + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (result.size() == 2); + assert (result[0] == p1); + assert (result[1] == p2); +} + + + +void SQLExecutor::ranges() +{ + std::string funct = "range()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + std::vector result; + try { *_pSession << "SELECT * FROM Person", into(result), range(2, 2), now; }// will return 2 objects + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (result.size() == 2); + assert (result[0] == p1); + assert (result[1] == p2); +} + + +void SQLExecutor::combinedIllegalLimits() +{ + std::string funct = "combinedIllegalLimits()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + Person result; + try + { + *_pSession << "SELECT * FROM Person", into(result), lowerLimit(3), upperLimit(2), now; + fail("lower > upper is not allowed"); + } + catch(LimitException&) + { + } +} + + +void SQLExecutor::illegalRange() +{ + std::string funct = "illegalRange()"; + std::multimap people; + Person p1("LN1", "FN1", "ADDR1", 1); + Person p2("LN2", "FN2", "ADDR2", 2); + people.insert(std::make_pair("LN1", p1)); + people.insert(std::make_pair("LN1", p2)); + + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 2); + Person result; + try + { + *_pSession << "SELECT * FROM Person", into(result), range(3, 2), now; + fail("lower > upper is not allowed"); + } + catch(LimitException&) + { + } +} + + +void SQLExecutor::emptyDB() +{ + std::string funct = "emptyDB()"; + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 0); + + Person result; + Statement stmt = (*_pSession << "SELECT * FROM Person", into(result), limit(1)); + stmt.execute(); + assert (result.firstName.empty()); + assert (stmt.done()); +} + + +void SQLExecutor::blob(int bigSize) +{ + std::string funct = "blob()"; + std::string lastName("lastname"); + std::string firstName("firstname"); + std::string address("Address"); + + Poco::Data::CLOB img("0123456789", 10); + int count = 0; + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(img), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + Poco::Data::CLOB res; + assert (res.size() == 0); + try { *_pSession << "SELECT Image FROM Person", into(res), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (res == img); + + Poco::Data::CLOB big; + std::vector v(bigSize, 'x'); + big.assignRaw(&v[0], (std::size_t) v.size()); + + assert (big.size() == (std::size_t) bigSize); + + try { *_pSession << "DELETE FROM Person", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + try { *_pSession << "INSERT INTO Person VALUES(?,?,?,?)", use(lastName), use(firstName), use(address), use(big), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + try { *_pSession << "SELECT Image FROM Person", into(res), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (res == big); +} + + +void SQLExecutor::dateTime() +{ + std::string funct = "dateTime()"; + std::string lastName("Bart"); + std::string firstName("Simpson"); + std::string address("Springfield"); + DateTime birthday(1980, 4, 1, 5, 45, 12); + + int count = 0; + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(birthday), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + DateTime bd; + try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (bd == birthday); + + std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person"); +} + + +void SQLExecutor::blobStmt() +{ + std::string funct = "blobStmt()"; + std::string lastName("lastname"); + std::string firstName("firstname"); + std::string address("Address"); + Poco::Data::CLOB blob("0123456789", 10); + + int count = 0; + Statement ins = (*_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(blob)); + ins.execute(); + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + Poco::Data::CLOB res; + poco_assert (res.size() == 0); + Statement stmt = (*_pSession << "SELECT Image FROM Person", into(res)); + try { stmt.execute(); } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + poco_assert (res == blob); +} + + +void SQLExecutor::tuples() +{ + typedef Tuple TupleType; + std::string funct = "tuples()"; + TupleType t(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19); + + try { *_pSession << "INSERT INTO Tuples VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", use(t), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + TupleType ret(-10,-11,-12,-13,-14,-15,-16,-17,-18,-19); + assert (ret != t); + try { *_pSession << "SELECT * FROM Tuples", into(ret), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (ret == t); +} + + +void SQLExecutor::tupleVector() +{ + typedef Tuple TupleType; + std::string funct = "tupleVector()"; + TupleType t(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19); + Tuple + t10(10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29); + TupleType t100(100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119); + std::vector v; + v.push_back(t); + v.push_back(t10); + v.push_back(t100); + + try { *_pSession << "INSERT INTO Tuples VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", use(v), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Tuples", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (v.size() == (std::size_t) count); + + std::vector > ret; + try { *_pSession << "SELECT * FROM Tuples", into(ret), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (ret == v); +} + + +void SQLExecutor::internalExtraction() +{ + /*std::string funct = "internalExtraction()"; + std::vector > v; + v.push_back(Tuple(1, 1.5f, "3")); + v.push_back(Tuple(2, 2.5f, "4")); + v.push_back(Tuple(3, 3.5f, "5")); + v.push_back(Tuple(4, 4.5f, "6")); + + try { *_pSession << "INSERT INTO Vectors VALUES (?,?,?)", use(v), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + try + { + Statement stmt = (*_pSession << "SELECT * FROM Vectors", now); + RecordSet rset(stmt); + + assert (3 == rset.columnCount()); + assert (4 == rset.rowCount()); + + int curVal = 3; + do + { + assert (rset["str0"] == curVal); + ++curVal; + } while (rset.moveNext()); + + rset.moveFirst(); + assert (rset["str0"] == "3"); + rset.moveLast(); + assert (rset["str0"] == "6"); + + RecordSet rset2(rset); + assert (3 == rset2.columnCount()); + assert (4 == rset2.rowCount()); + + int i = rset.value(0,0); + assert (1 == i); + + std::string s = rset.value(0,0); + assert ("1" == s); + + int a = rset.value(0,2); + assert (3 == a); + + try + { + double d = rset.value(1,1); + assert (2.5 == d); + } + catch (BadCastException&) + { + float f = rset.value(1,1); + assert (2.5 == f); + } + + s = rset.value(2,2); + assert ("5" == s); + i = rset.value("str0", 2); + assert (5 == i); + + const Column& col = rset.column(0); + Column::Iterator it = col.begin(); + Column::Iterator end = col.end(); + for (int i = 1; it != end; ++it, ++i) + assert (*it == i); + + rset = (*_pSession << "SELECT COUNT(*) AS cnt FROM Vectors", now); + + //various results for COUNT(*) are received from different drivers + try + { + //this is what most drivers will return + int i = rset.value(0,0); + assert (4 == i); + } + catch(BadCastException&) + { + try + { + //this is for Oracle + double i = rset.value(0,0); + assert (4 == int(i)); + } + catch(BadCastException&) + { + //this is for PostgreSQL + Poco::Int64 big = rset.value(0,0); + assert (4 == big); + } + } + + s = rset.value("cnt", 0).convert(); + assert ("4" == s); + + try { const Column& col1 = rset.column(100); fail ("must fail"); } + catch (RangeException&) { } + + try { rset.value(0,0); fail ("must fail"); } + catch (BadCastException&) { } + + stmt = (*_pSession << "DELETE FROM Vectors", now); + rset = stmt; + + try { const Column& col1 = rset.column(0); fail ("must fail"); } + catch (RangeException&) { } + } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } +*/ +} + + +void SQLExecutor::doNull() +{ + std::string funct = "null()"; + + *_pSession << "INSERT INTO Vectors VALUES (?, ?, ?)", + use(Poco::Data::Keywords::null), + use(Poco::Data::Keywords::null), + use(Poco::Data::Keywords::null), now; + + int count = 0; + try { *_pSession << "SELECT COUNT(*) FROM Vectors", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + int i0 = 0; + Statement stmt1 = (*_pSession << "SELECT i0 FROM Vectors", into(i0, Poco::Data::Position(0), -1)); + try { stmt1.execute(); } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + poco_assert (i0 == -1); + + float flt0 = 0; + Statement stmt2 = (*_pSession << "SELECT flt0 FROM Vectors", into(flt0, Poco::Data::Position(0), 3.25f)); + try { stmt2.execute(); } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + poco_assert (flt0 == 3.25); + + std::string str0("string"); + Statement stmt3 = (*_pSession << "SELECT str0 FROM Vectors", into(str0, Poco::Data::Position(0), std::string("DEFAULT"))); + try { stmt3.execute(); } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + poco_assert (str0 == "DEFAULT"); +} + + +void SQLExecutor::setTransactionIsolation(Session& session, Poco::UInt32 ti) +{ + if (session.hasTransactionIsolation(ti)) + { + std::string funct = "setTransactionIsolation()"; + + try + { + Transaction t(session, false); + t.setIsolation(ti); + + assert (ti == t.getIsolation()); + assert (t.isIsolation(ti)); + + assert (ti == session.getTransactionIsolation()); + assert (session.isTransactionIsolation(ti)); + } + catch(Poco::Exception& e){ std::cout << funct << ':' << e.displayText() << std::endl;} + } + else + { + std::cout << "Transaction isolation not supported: "; + switch (ti) + { + case Session::TRANSACTION_READ_COMMITTED: + std::cout << "READ COMMITTED"; break; + case Session::TRANSACTION_READ_UNCOMMITTED: + std::cout << "READ UNCOMMITTED"; break; + case Session::TRANSACTION_REPEATABLE_READ: + std::cout << "REPEATABLE READ"; break; + case Session::TRANSACTION_SERIALIZABLE: + std::cout << "SERIALIZABLE"; break; + default: + std::cout << "UNKNOWN"; break; + } + std::cout << std::endl; + } +} + + +void SQLExecutor::sessionTransaction(const std::string& connect) +{ + if (!_pSession->canTransact()) + { + std::cout << "Session not capable of transactions." << std::endl; + return; + } + + Session local("mysql", connect); + local.setFeature("autoCommit", true); + + std::string funct = "transaction()"; + std::vector lastNames; + std::vector firstNames; + std::vector addresses; + std::vector ages; + std::string tableName("Person"); + lastNames.push_back("LN1"); + lastNames.push_back("LN2"); + firstNames.push_back("FN1"); + firstNames.push_back("FN2"); + addresses.push_back("ADDR1"); + addresses.push_back("ADDR2"); + ages.push_back(1); + ages.push_back(2); + int count = 0, locCount = 0; + std::string result; + + bool autoCommit = _pSession->getFeature("autoCommit"); + + _pSession->setFeature("autoCommit", true); + assert (!_pSession->isTransaction()); + _pSession->setFeature("autoCommit", false); + assert (!_pSession->isTransaction()); + + setTransactionIsolation((*_pSession), Session::TRANSACTION_READ_UNCOMMITTED); + setTransactionIsolation((*_pSession), Session::TRANSACTION_REPEATABLE_READ); + setTransactionIsolation((*_pSession), Session::TRANSACTION_SERIALIZABLE); + + setTransactionIsolation((*_pSession), Session::TRANSACTION_READ_COMMITTED); + + _pSession->begin(); + assert (_pSession->isTransaction()); + try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (_pSession->isTransaction()); + + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (0 == locCount); + + try { (*_pSession) << "SELECT COUNT(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (2 == count); + assert (_pSession->isTransaction()); + _pSession->rollback(); + assert (!_pSession->isTransaction()); + + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (0 == locCount); + + try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (0 == count); + assert (!_pSession->isTransaction()); + + _pSession->begin(); + try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (_pSession->isTransaction()); + + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (0 == locCount); + + _pSession->commit(); + assert (!_pSession->isTransaction()); + + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (2 == locCount); + + try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (2 == count); + + _pSession->setFeature("autoCommit", autoCommit); +} + + +void SQLExecutor::transaction(const std::string& connect) +{ + if (!_pSession->canTransact()) + { + std::cout << "Session not transaction-capable." << std::endl; + return; + } + + Session local("mysql", connect); + local.setFeature("autoCommit", true); + + setTransactionIsolation((*_pSession), Session::TRANSACTION_READ_COMMITTED); + setTransactionIsolation(local, Session::TRANSACTION_READ_COMMITTED); + + std::string funct = "transaction()"; + std::vector lastNames; + std::vector firstNames; + std::vector addresses; + std::vector ages; + std::string tableName("Person"); + lastNames.push_back("LN1"); + lastNames.push_back("LN2"); + firstNames.push_back("FN1"); + firstNames.push_back("FN2"); + addresses.push_back("ADDR1"); + addresses.push_back("ADDR2"); + ages.push_back(1); + ages.push_back(2); + int count = 0, locCount = 0; + std::string result; + + bool autoCommit = _pSession->getFeature("autoCommit"); + + _pSession->setFeature("autoCommit", true); + assert (!_pSession->isTransaction()); + _pSession->setFeature("autoCommit", false); + assert (!_pSession->isTransaction()); + _pSession->setTransactionIsolation(Session::TRANSACTION_READ_COMMITTED); + + { + Transaction trans((*_pSession)); + assert (trans.isActive()); + assert (_pSession->isTransaction()); + + try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + assert (_pSession->isTransaction()); + assert (trans.isActive()); + + try { (*_pSession) << "SELECT COUNT(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (2 == count); + assert (_pSession->isTransaction()); + assert (trans.isActive()); + } + assert (!_pSession->isTransaction()); + + try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (0 == count); + assert (!_pSession->isTransaction()); + + { + Transaction trans((*_pSession)); + try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (0 == locCount); + + assert (_pSession->isTransaction()); + assert (trans.isActive()); + trans.commit(); + assert (!_pSession->isTransaction()); + assert (!trans.isActive()); + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (2 == locCount); + } + + try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (2 == count); + + _pSession->begin(); + try { (*_pSession) << "DELETE FROM PERSON", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (2 == locCount); + + try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (0 == count); + _pSession->commit(); + + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (0 == locCount); + + std::string sql1 = format("INSERT INTO PERSON VALUES ('%s','%s','%s',%d)", lastNames[0], firstNames[0], addresses[0], ages[0]); + std::string sql2 = format("INSERT INTO PERSON VALUES ('%s','%s','%s',%d)", lastNames[1], firstNames[1], addresses[1], ages[1]); + std::vector sql; + sql.push_back(sql1); + sql.push_back(sql2); + + Transaction trans((*_pSession)); + + trans.execute(sql1, false); + try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (1 == count); + trans.execute(sql2, false); + try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (2 == count); + + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (0 == locCount); + + trans.rollback(); + + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (0 == locCount); + + try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (0 == count); + + trans.execute(sql); + + local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + assert (2 == locCount); + + try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (2 == count); + + _pSession->setFeature("autoCommit", autoCommit); +} + + +void SQLExecutor::reconnect() +{ + std::string funct = "reconnect()"; + std::string lastName = "lastName"; + std::string firstName("firstName"); + std::string address("Address"); + int age = 133132; + int count = 0; + std::string result; + + try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + + count = 0; + try { (*_pSession) << "SELECT COUNT(*) FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + assert (_pSession->isConnected()); + _pSession->close(); + assert (!_pSession->isConnected()); + try + { + (*_pSession) << "SELECT LastName FROM PERSON", into(result), now; + fail ("must fail"); + } + catch(NotConnectedException&){ } + assert (!_pSession->isConnected()); + + _pSession->open(); + assert (_pSession->isConnected()); + try { (*_pSession) << "SELECT Age FROM PERSON", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == age); + assert (_pSession->isConnected()); +} diff --git a/Data/MySQL/testsuite/src/SQLExecutor.h b/Data/MySQL/testsuite/src/SQLExecutor.h index 4166224d1..1dc64e38e 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.h +++ b/Data/MySQL/testsuite/src/SQLExecutor.h @@ -102,7 +102,7 @@ public: void blob(int bigSize = 1024); void blobStmt(); - + void dateTime(); void floats(); void doubles(); void tuples(); diff --git a/Data/MySQL/testsuite/src/SQLExecutor.h~ b/Data/MySQL/testsuite/src/SQLExecutor.h~ new file mode 100644 index 000000000..1dc64e38e --- /dev/null +++ b/Data/MySQL/testsuite/src/SQLExecutor.h~ @@ -0,0 +1,126 @@ +// +// SQLExecutor.h +// +// $Id: //poco/1.4/Data/MySQL/testsuite/src/SQLExecutor.h#1 $ +// +// Definition of the SQLExecutor class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef SQLExecutor_INCLUDED +#define SQLExecutor_INCLUDED + + +#include "Poco/Data/MySQL/MySQL.h" +#include "Poco/Data/Session.h" + + +class SQLExecutor: public CppUnit::TestCase +{ +public: + enum DataBinding + { + PB_IMMEDIATE, + PB_AT_EXEC + }; + + enum DataExtraction + { + DE_MANUAL, + DE_BOUND + }; + + SQLExecutor(const std::string& name, Poco::Data::Session* _pSession); + ~SQLExecutor(); + + void bareboneMySQLTest(const char* host, const char* user, const char* pwd, const char* db, int port, const char* tableCreateString); + /// This function uses "bare bone" MySQL API calls (i.e. calls are not + /// "wrapped" in PocoData framework structures). + /// The purpose of the function is to verify that driver behaves + /// correctly. If this test passes, subsequent tests failures are likely ours. + + void simpleAccess(); + void complexType(); + void simpleAccessVector(); + void complexTypeVector(); + void insertVector(); + void insertEmptyVector(); + + void insertSingleBulk(); + void insertSingleBulkVec(); + + void limits(); + void limitOnce(); + void limitPrepare(); + void limitZero(); + void prepare(); + + void setSimple(); + void setComplex(); + void setComplexUnique(); + void multiSetSimple(); + void multiSetComplex(); + void mapComplex(); + void mapComplexUnique(); + void multiMapComplex(); + void selectIntoSingle(); + void selectIntoSingleStep(); + void selectIntoSingleFail(); + void lowerLimitOk(); + void lowerLimitFail(); + void combinedLimits(); + void combinedIllegalLimits(); + void ranges(); + void illegalRange(); + void singleSelect(); + void emptyDB(); + + void blob(int bigSize = 1024); + void blobStmt(); + void dateTime(); + void floats(); + void doubles(); + void tuples(); + void tupleVector(); + + void internalExtraction(); + void doNull(); + + void sessionTransaction(const std::string& connect); + void transaction(const std::string& connect); + + void reconnect(); + +private: + void setTransactionIsolation(Poco::Data::Session& session, Poco::UInt32 ti); + + Poco::Data::Session* _pSession; +}; + + +#endif // SQLExecutor_INCLUDED diff --git a/Data/include/Poco/Data/TypeHandler.h b/Data/include/Poco/Data/TypeHandler.h index e206d34c8..3a94b6352 100644 --- a/Data/include/Poco/Data/TypeHandler.h +++ b/Data/include/Poco/Data/TypeHandler.h @@ -294,11 +294,11 @@ public: poco_assert_dbg (pPreparator != 0); if (obj.isNull()) { - pPreparator->prepare(pos++, (Poco::Any&)Poco::Data::Keywords::null); + pPreparator->prepare(pos++, Poco::Data::Keywords::null); } else { - pPreparator->prepare(pos++, (T&)obj.value()); + pPreparator->prepare(pos++, obj.value()); } } diff --git a/Data/include/Poco/Data/TypeHandler.h~ b/Data/include/Poco/Data/TypeHandler.h~ new file mode 100644 index 000000000..5a9fe630c --- /dev/null +++ b/Data/include/Poco/Data/TypeHandler.h~ @@ -0,0 +1,2113 @@ +// +// TypeHandler.h +// +// $Id: //poco/Main/Data/include/Poco/Data/TypeHandler.h#13 $ +// +// Library: Data +// Package: DataCore +// Module: TypeHandler +// +// Definition of the TypeHandler class. +// +// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#ifndef Data_TypeHandler_INCLUDED +#define Data_TypeHandler_INCLUDED + + +#include "Poco/Data/Data.h" +#include "Poco/Data/AbstractBinder.h" +#include "Poco/Data/AbstractExtractor.h" +#include "Poco/Data/AbstractPreparator.h" +#include "Poco/Nullable.h" +#include "Poco/Tuple.h" +#include "Poco/AutoPtr.h" +#include "Poco/SharedPtr.h" +#include + + +namespace Poco { +namespace Data { + + +class AbstractTypeHandler + /// Parent class for type handlers. + /// The reason for this class is to prevent instantiations of type handlers. + /// For documentation on type handlers, see TypeHandler class. +{ +protected: + AbstractTypeHandler(); + ~AbstractTypeHandler(); + AbstractTypeHandler(const AbstractTypeHandler&); + AbstractTypeHandler& operator = (const AbstractTypeHandler&); +}; + + +template +class TypeHandler: public AbstractTypeHandler + /// Converts Rows to a Type and the other way around. Provide template specializations to support your own complex types. + /// + /// Take as example the following (simplified) class: + /// class Person + /// { + /// private: + /// std::string _lastName; + /// std::string _firstName; + /// int _age; + /// public: + /// const std::string& getLastName(); + /// [...] // other set/get methods (returning const reference), a default constructor, + /// [...] // optional < operator (for set, multiset) or function operator (for map, multimap) + /// }; + /// + /// The TypeHandler must provide a custom bind, size, prepare and extract method: + /// + /// template <> + /// class TypeHandler + /// { + /// public: + /// static std::size_t size() + /// { + /// return 3; // lastName + firstname + age occupy three columns + /// } + /// + /// static void bind(std::size_t pos, const Person& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) + /// { + /// // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3)) + /// // Note that we advance pos by the number of columns the datatype uses! For string/int this is one. + /// poco_assert_dbg (pBinder != 0); + /// TypeHandler::bind(pos++, obj.getLastName(), pBinder, dir); + /// TypeHandler::bind(pos++, obj.getFirstName(), pBinder, dir); + /// TypeHandler::bind(pos++, obj.getAge(), pBinder); + /// } + /// + /// static void prepare(std::size_t pos, const Person& obj, AbstractPreparator* pPreparator) + /// { + /// // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3)) + /// poco_assert_dbg (pPreparator != 0); + /// TypeHandler::prepare(pos++, obj.getLastName(), pPreparator); + /// TypeHandler::prepare(pos++, obj.getFirstName(), pPreparator); + /// TypeHandler::prepare(pos++, obj.getAge(), pPreparator); + /// } + /// + /// static void extract(std::size_t pos, Person& obj, const Person& defVal, AbstractExtractor* pExt) + /// { + /// // defVal is the default person we should use if we encunter NULL entries, so we take the individual fields + /// // as defaults. You can do more complex checking, ie return defVal if only one single entry of the fields is null etc... + /// poco_assert_dbg (pExt != 0); + /// std::string lastName; + /// std::string firstName; + /// int age = 0; + /// // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3)) + /// TypeHandler::extract(pos++, lastName, defVal.getLastName(), pExt); + /// TypeHandler::extract(pos++, firstName, defVal.getFirstName(), pExt); + /// TypeHandler::extract(pos++, age, defVal.getAge(), pExt); + /// obj.setLastName(lastName); + /// obj.setFirstName(firstName); + /// obj.setAge(age); + /// } + /// }; + /// + /// Note that the TypeHandler template specialization must always be declared in the namespace Poco::Data. + /// Apart from that no further work is needed. One can now use Person with into and use clauses. +{ +public: + static void bind(std::size_t pos, const T& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert_dbg (pBinder != 0); + pBinder->bind(pos, obj, dir); + } + + static std::size_t size() + { + return 1u; + } + + static void extract(std::size_t pos, T& obj, const T& defVal, AbstractExtractor* pExt) + { + poco_assert_dbg (pExt != 0); + if (!pExt->extract(pos, obj)) obj = defVal; + } + + static void prepare(std::size_t pos, const T& obj, AbstractPreparator* pPreparator) + { + poco_assert_dbg (pPreparator != 0); + pPreparator->prepare(pos, obj); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator = (const TypeHandler&); +}; + + +template +class TypeHandler >: public AbstractTypeHandler + /// Specialization of type handler for std::deque. +{ +public: + static void bind(std::size_t pos, const std::deque& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert_dbg (pBinder != 0); + pBinder->bind(pos, obj, dir); + } + + static std::size_t size() + { + return 1u; + } + + static void extract(std::size_t pos, std::deque& obj, const T& defVal, AbstractExtractor* pExt) + { + poco_assert_dbg (pExt != 0); + if (!pExt->extract(pos, obj)) + obj.assign(obj.size(), defVal); + } + + static void prepare(std::size_t pos, const std::deque& obj, AbstractPreparator* pPreparator) + { + poco_assert_dbg (pPreparator != 0); + pPreparator->prepare(pos, obj); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator = (const TypeHandler&); +}; + + +template +class TypeHandler >: public AbstractTypeHandler + /// Specialization of type handler for std::vector. +{ +public: + static void bind(std::size_t pos, const std::vector& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert_dbg (pBinder != 0); + pBinder->bind(pos, obj, dir); + } + + static std::size_t size() + { + return 1u; + } + + static void extract(std::size_t pos, std::vector& obj, const T& defVal, AbstractExtractor* pExt) + { + poco_assert_dbg (pExt != 0); + if (!pExt->extract(pos, obj)) + obj.assign(obj.size(), defVal); + } + + static void prepare(std::size_t pos, const std::vector& obj, AbstractPreparator* pPreparator) + { + poco_assert_dbg (pPreparator != 0); + pPreparator->prepare(pos, obj); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator = (const TypeHandler&); +}; + + +template +class TypeHandler >: public AbstractTypeHandler + /// Specialization of type handler for std::list. +{ +public: + static void bind(std::size_t pos, const std::list& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert_dbg (pBinder != 0); + pBinder->bind(pos, obj, dir); + } + + static std::size_t size() + { + return 1u; + } + + static void extract(std::size_t pos, std::list& obj, const T& defVal, AbstractExtractor* pExt) + { + poco_assert_dbg (pExt != 0); + if (!pExt->extract(pos, obj)) + obj.assign(obj.size(), defVal); + } + + static void prepare(std::size_t pos, const std::list& obj, AbstractPreparator* pPreparator) + { + poco_assert_dbg (pPreparator != 0); + pPreparator->prepare(pos, obj); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator = (const TypeHandler&); +}; + +template +class TypeHandler > + /// Specialization of type handler for Nullable. +{ +public: + + static void bind(std::size_t pos, const Nullable& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert_dbg (pBinder != 0); + if (obj.isNull()) + { + pBinder->bind(pos++, Poco::Data::Keywords::null, dir); + } + else + { + pBinder->bind(pos++, obj.value(), dir); + } + } + + static void prepare(std::size_t pos, const Nullable& obj, AbstractPreparator* pPreparator) + { + poco_assert_dbg (pPreparator != 0); + if (obj.isNull()) + { + //Poco::Any a(Poco::Data::Keywords::null); + pPreparator->prepare(pos++, Poco::Data::Keywords::null); + } + else + { + pPreparator->prepare(pos++, (T&)obj.value()); + } + } + + static std::size_t size() + { + return 1u; + } + + static void extract(std::size_t pos, Nullable& obj, const Nullable& , AbstractExtractor* pExt) + { + poco_assert_dbg (pExt != 0); + T val; + + if (pExt->extract(pos++, val)) + { + obj = val; + } + else + { + obj.clear(); + } + } + +private: + + TypeHandler(); + ~TypeHandler(); + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +/// Poco::Tuple TypeHandler specializations + +// define this macro to nothing for smaller code size +#define POCO_TUPLE_TYPE_HANDLER_INLINE inline + + +template +POCO_TUPLE_TYPE_HANDLER_INLINE +void tupleBind(std::size_t& pos, TupleType tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) +{ + TypeHandler::bind(pos, tuple.template get(), pBinder, dir); + pos += TypeHandler::size(); +} + + +template +POCO_TUPLE_TYPE_HANDLER_INLINE +void tuplePrepare(std::size_t& pos, TupleType tuple, AbstractPreparator* pPreparator) +{ + TypeHandler::prepare(pos, tuple.template get(), pPreparator); + pos += TypeHandler::size(); +} + + +template +POCO_TUPLE_TYPE_HANDLER_INLINE +void tupleExtract(std::size_t& pos, TupleType tuple, DefValType defVal, AbstractExtractor* pExt) +{ + Poco::Data::TypeHandler::extract(pos, tuple.template get(), + defVal.template get(), pExt); + pos += TypeHandler::size(); +} + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template + class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size() + + TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler > +{ +public: + typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; + typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; + + static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + poco_assert (pBinder != 0); + tupleBind(pos, tuple, pBinder, dir); + } + + static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) + { + poco_assert (pPreparator != 0); + tuplePrepare(pos, tuple, pPreparator); + } + + static std::size_t size() + { + return TypeHandler::size(); + } + + static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, + AbstractExtractor* pExt) + { + poco_assert (pExt != 0); + tupleExtract(pos, tuple, defVal, pExt); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator=(const TypeHandler&); +}; + + +template +class TypeHandler >: public AbstractTypeHandler +{ +public: + static void bind(std::size_t pos, const std::pair& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + TypeHandler::bind(pos, obj.first, pBinder, dir); + pos += TypeHandler::size(); + TypeHandler::bind(pos, obj.second, pBinder, dir); + } + + static std::size_t size() + { + return static_cast(TypeHandler::size() + TypeHandler::size()); + } + + static void extract(std::size_t pos, std::pair& obj, const std::pair& defVal, AbstractExtractor* pExt) + { + TypeHandler::extract(pos, obj.first, defVal.first, pExt); + pos += TypeHandler::size(); + TypeHandler::extract(pos, obj.second, defVal.second, pExt); + } + + static void prepare(std::size_t pos, const std::pair& obj, AbstractPreparator* pPreparator) + { + TypeHandler::prepare(pos, obj.first, pPreparator); + pos += TypeHandler::size(); + TypeHandler::prepare(pos, obj.second, pPreparator); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator = (const TypeHandler&); +}; + + +template +class TypeHandler >: public AbstractTypeHandler + /// Specialization of type handler for Poco::AutoPtr +{ +public: + static void bind(std::size_t pos, const Poco::AutoPtr& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + // *obj will trigger a nullpointer exception if empty: this is on purpose + TypeHandler::bind(pos, *obj, pBinder, dir); + } + + static std::size_t size() + { + return static_cast(TypeHandler::size()); + } + + static void extract(std::size_t pos, Poco::AutoPtr& obj, const Poco::AutoPtr& defVal, AbstractExtractor* pExt) + { + poco_assert_dbg (pExt != 0); + + obj = Poco::AutoPtr(new T()); + if (defVal) + TypeHandler::extract(pos, *obj, *defVal, pExt); + else + TypeHandler::extract(pos, *obj, *obj, pExt); + } + + static void prepare(std::size_t pos, const Poco::AutoPtr&, AbstractPreparator* pPreparator) + { + poco_assert_dbg (pPreparator != 0); + TypeHandler::prepare(pos, T(), pPreparator); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator = (const TypeHandler&); +}; + + + +template +class TypeHandler >: public AbstractTypeHandler + /// Specialization of type handler for Poco::SharedPtr +{ +public: + static void bind(std::size_t pos, const Poco::SharedPtr& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) + { + // *obj will trigger a nullpointer exception if empty + TypeHandler::bind(pos, *obj, pBinder, dir); + } + + static std::size_t size() + { + return static_cast(TypeHandler::size()); + } + + static void extract(std::size_t pos, Poco::SharedPtr& obj, const Poco::SharedPtr& defVal, AbstractExtractor* pExt) + { + poco_assert_dbg (pExt != 0); + + obj = Poco::SharedPtr(new T()); + if (defVal) + TypeHandler::extract(pos, *obj, *defVal, pExt); + else + TypeHandler::extract(pos, *obj, *obj, pExt); + } + + static void prepare(std::size_t pos, const Poco::SharedPtr&, AbstractPreparator* pPreparator) + { + poco_assert_dbg (pPreparator != 0); + TypeHandler::prepare(pos, T(), pPreparator); + } + +private: + TypeHandler(const TypeHandler&); + TypeHandler& operator = (const TypeHandler&); +}; + + +} } // namespace Poco::Data + + +#endif // Data_TypeHandler_INCLUDED diff --git a/Data/samples/RecordSet/src/RecordSet.cpp b/Data/samples/RecordSet/src/RecordSet.cpp index 1d20d139a..a1a4823fb 100644 --- a/Data/samples/RecordSet/src/RecordSet.cpp +++ b/Data/samples/RecordSet/src/RecordSet.cpp @@ -71,8 +71,10 @@ int main(int argc, char** argv) session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now; // insert some rows - session << "INSERT INTO Person VALUES('Bart Simpson', 'Springfield', 12, ?)", use(DateTime(1980, 4, 1)), now; - session << "INSERT INTO Person VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(DateTime(1982, 5, 9)), now; + DateTime bd(1980, 4, 1); + DateTime ld(1982, 5, 9); + session << "INSERT INTO Person VALUES('Bart Simpson', 'Springfield', 12, ?)", use(bd), now; + session << "INSERT INTO Person VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(ld), now; // a simple query Statement select(session); diff --git a/Data/samples/RecordSet/src/RecordSet.cpp~ b/Data/samples/RecordSet/src/RecordSet.cpp~ new file mode 100644 index 000000000..1d20d139a --- /dev/null +++ b/Data/samples/RecordSet/src/RecordSet.cpp~ @@ -0,0 +1,103 @@ +// +// RecordSet.cpp +// +// $Id: //poco/Main/Data/samples/RecordSet/src/RecordSet.cpp#2 $ +// +// This sample demonstrates the Data library. +// +/// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + + +#include "Poco/SharedPtr.h" +#include "Poco/DateTime.h" +#include "Poco/Data/SessionFactory.h" +#include "Poco/Data/Session.h" +#include "Poco/Data/RecordSet.h" +#include "Poco/Data/Column.h" +#include "Poco/Data/SQLite/Connector.h" +#include + + +using namespace Poco::Data::Keywords; +using Poco::DateTime; +using Poco::Data::Session; +using Poco::Data::Statement; +using Poco::Data::RecordSet; + + +struct Person +{ + std::string name; + std::string address; + int age; +}; + + +int main(int argc, char** argv) +{ + // register SQLite connector + Poco::Data::SQLite::Connector::registerConnector(); + + // create a session + Session session("SQLite", "sample.db"); + + // drop sample table, if it exists + session << "DROP TABLE IF EXISTS Person", now; + + // (re)create table + session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now; + + // insert some rows + session << "INSERT INTO Person VALUES('Bart Simpson', 'Springfield', 12, ?)", use(DateTime(1980, 4, 1)), now; + session << "INSERT INTO Person VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(DateTime(1982, 5, 9)), now; + + // a simple query + Statement select(session); + select << "SELECT * FROM Person"; + select.execute(); + + // create a RecordSet + RecordSet rs(select); + std::size_t cols = rs.columnCount(); + // print all column names + for (std::size_t col = 0; col < cols; ++col) + { + std::cout << rs.columnName(col) << std::endl; + } + // iterate over all rows and columns + bool more = rs.moveFirst(); + while (more) + { + for (std::size_t col = 0; col < cols; ++col) + { + std::cout << rs[col].convert() << " "; + } + std::cout << std::endl; + more = rs.moveNext(); + } + + return 0; +} diff --git a/Data/samples/RowFormatter/src/RowFormatter.cpp b/Data/samples/RowFormatter/src/RowFormatter.cpp index 3b9073393..f2b93cb19 100644 --- a/Data/samples/RowFormatter/src/RowFormatter.cpp +++ b/Data/samples/RowFormatter/src/RowFormatter.cpp @@ -116,10 +116,14 @@ int main(int argc, char** argv) session << "CREATE TABLE Simpsons (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now; // insert some rows - session << "INSERT INTO Simpsons VALUES('Homer Simpson', 'Springfield', 42, ?)", use(DateTime(1956, 3, 1)), now; - session << "INSERT INTO Simpsons VALUES('Marge Simpson', 'Springfield', 38, ?)", use(DateTime(1954, 10, 1)), now; - session << "INSERT INTO Simpsons VALUES('Bart Simpson', 'Springfield', 12, ?)", use(DateTime(1980, 4, 1)), now; - session << "INSERT INTO Simpsons VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(DateTime(1982, 5, 9)), now; + DateTime hd(1956, 3, 1); + session << "INSERT INTO Simpsons VALUES('Homer Simpson', 'Springfield', 42, ?)", use(hd), now; + DateTime md(1954, 10, 1); + session << "INSERT INTO Simpsons VALUES('Marge Simpson', 'Springfield', 38, ?)", use(md), now; + DateTime bd(1980, 4, 1); + session << "INSERT INTO Simpsons VALUES('Bart Simpson', 'Springfield', 12, ?)", use(bd), now; + DateTime ld(1982, 5, 9); + session << "INSERT INTO Simpsons VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(ld), now; // create a statement and print the column names and data as HTML table HTMLTableFormatter tf; diff --git a/Data/samples/RowFormatter/src/RowFormatter.cpp~ b/Data/samples/RowFormatter/src/RowFormatter.cpp~ new file mode 100644 index 000000000..63a5dc278 --- /dev/null +++ b/Data/samples/RowFormatter/src/RowFormatter.cpp~ @@ -0,0 +1,140 @@ +// +// RowFormatter.cpp +// +// $Id: //poco/Main/Data/samples/RecordSet/src/RowFormatter.cpp#2 $ +// +// This sample demonstrates the Data library recordset row formatting +// and streaming capabilities. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + + +#include "Poco/SharedPtr.h" +#include "Poco/DateTime.h" +#include "Poco/Data/SessionFactory.h" +#include "Poco/Data/Session.h" +#include "Poco/Data/Statement.h" +#include "Poco/Data/RecordSet.h" +#include "Poco/Data/RowFormatter.h" +#include "Poco/Data/SQLite/Connector.h" +#include + + +using namespace Poco::Data::Keywords; +using Poco::DateTime; +using Poco::Data::Session; +using Poco::Data::Statement; +using Poco::Data::RecordSet; +using Poco::Data::RowFormatter; + + +class HTMLTableFormatter : public RowFormatter +{ +public: + HTMLTableFormatter() + { + std::ostringstream os; + os << "" << std::endl; + setPrefix(os.str()); + + os.str(""); + os << "
" << std::endl; + setPostfix(os.str()); + } + + std::string& formatNames(const NameVecPtr pNames, std::string& formattedNames) + { + std::ostringstream str; + + str << "\t" << std::endl; + NameVec::const_iterator it = pNames->begin(); + NameVec::const_iterator end = pNames->end(); + for (; it != end; ++it) str << "\t\t" << *it << "" << std::endl; + str << "\t" << std::endl; + + return formattedNames = str.str(); + } + + std::string& formatValues(const ValueVec& vals, std::string& formattedValues) + { + std::ostringstream str; + + str << "\t" << std::endl; + ValueVec::const_iterator it = vals.begin(); + ValueVec::const_iterator end = vals.end(); + for (; it != end; ++it) + { + if (it->isNumeric()) + str << "\t\t"; + else + str << "\t\t"; + + str << it->convert() << "" << std::endl; + } + str << "\t" << std::endl; + + return formattedValues = str.str(); + } +}; + + +int main(int argc, char** argv) +{ + // register SQLite connector + Poco::Data::SQLite::Connector::registerConnector(); + + // create a session + Session session("SQLite", "sample.db"); + + // drop sample table, if it exists + session << "DROP TABLE IF EXISTS Simpsons", now; + + // (re)create table + session << "CREATE TABLE Simpsons (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now; + + // insert some rows + DateTime hd(1956, 3, 1), md(1954, 10, 1), bd(1980, 4, 1), ld(1982, 5, 9); + session << "INSERT INTO Simpsons VALUES('Homer Simpson', 'Springfield', 42, ?)", use(hd), now; + session << "INSERT INTO Simpsons VALUES('Marge Simpson', 'Springfield', 38, ?)", use(md), now; + session << "INSERT INTO Simpsons VALUES('Bart Simpson', 'Springfield', 12, ?)", use(bd), now; + session << "INSERT INTO Simpsons VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(ld), now; + + // create a statement and print the column names and data as HTML table + HTMLTableFormatter tf; + Statement stmt = (session << "SELECT * FROM Simpsons", format(tf), now); + RecordSet rs(stmt); + std::cout << rs << std::endl; + + // Note: The code above is divided into individual steps for clarity purpose. + // The four lines can be reduced to the following single line of code: + std::cout << RecordSet(session, "SELECT * FROM Simpsons", new HTMLTableFormatter); + + // simple formatting example (uses the default SimpleRowFormatter provided by framework) + std::cout << std::endl << "Simple formatting:" << std::endl << std::endl; + std::cout << RecordSet(session, "SELECT * FROM Simpsons"); + + return 0; +} diff --git a/JSON/testsuite/src/JSONTest.cpp~ b/JSON/testsuite/src/JSONTest.cpp~ new file mode 100644 index 000000000..993137971 --- /dev/null +++ b/JSON/testsuite/src/JSONTest.cpp~ @@ -0,0 +1,923 @@ +// +// JSONTest.cpp +// +// $Id: //poco/1.4/XML/testsuite/src/JSONTest.cpp#1 $ +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + + +#include "JSONTest.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" +#include "Poco/JSON/Object.h" +#include "Poco/JSON/Parser.h" +#include "Poco/JSON/Query.h" +#include "Poco/JSON/JSONException.h" +#include "Poco/JSON/Stringifier.h" +#include "Poco/JSON/DefaultHandler.h" +#include "Poco/JSON/Template.h" +#include "Poco/Path.h" +#include "Poco/Environment.h" +#include "Poco/File.h" +#include "Poco/FileStream.h" +#include "Poco/Glob.h" +#include + + +using namespace Poco::JSON; +using namespace Poco::Dynamic; + + +JSONTest::JSONTest(const std::string& name): CppUnit::TestCase("JSON") +{ + +} + + +JSONTest::~JSONTest() +{ + +} + + +void JSONTest::setUp() +{ +} + + +void JSONTest::tearDown() +{ +} + + +void JSONTest::testStringifier() +{ + Object obj; + + Array arr; + Object obj2; + + obj.set("array", arr); + obj.set("obj2", obj2); + + std::ostringstream ostr; + obj.stringify(ostr); + assert (ostr.str() == "{\"array\":[],\"obj2\":{}}"); +} + + +void JSONTest::testNullProperty() +{ + std::string json = "{ \"test\" : null }"; + Parser parser; + + Var result; + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + assert(object->isNull("test")); + Var test = object->get("test"); + assert(test.isEmpty()); +} + + +void JSONTest::testTrueProperty() +{ + std::string json = "{ \"test\" : true }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.type() == typeid(bool)); + bool value = test; + assert(value); +} + + +void JSONTest::testFalseProperty() +{ + std::string json = "{ \"test\" : false }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.type() == typeid(bool)); + bool value = test; + assert(!value); +} + + +void JSONTest::testNumberProperty() +{ + std::string json = "{ \"test\" : 1969 }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isInteger()); + int value = test; + assert(value == 1969); +} + +#if defined(POCO_HAVE_INT64) + + +void JSONTest::testNumber64Property() +{ + std::string json = "{ \"test\" : 5000000000000000 }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isInteger()); + Int64 value = test; + assert(value == 5000000000000000); +} + + +#endif + + +void JSONTest::testStringProperty() +{ + std::string json = "{ \"test\" : \"value\" }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isString()); + std::string value = test.convert(); + assert(value.compare("value") == 0); +} + + +void JSONTest::testEmptyObject() +{ + std::string json = "{}"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + assert(object->size() == 0); +} + + +void JSONTest::testDoubleProperty() +{ + std::string json = "{ \"test\" : 123.45 }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isNumeric()); + double value = test; + assert(value == 123.45); +} + + +void JSONTest::testDouble2Property() +{ + std::string json = "{ \"test\" : 12e34 }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isNumeric()); + double value = test; + assert(value >= 1.99e34 && value <= 12.01e34); +} + + +void JSONTest::testDouble3Property() +{ + std::string json = "{ \"test\" : 12e-34 }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + Var test = object->get("test"); + assert(test.isNumeric()); + double value = test; + assert(value == 12e-34); +} + + +void JSONTest::testObjectProperty() +{ + std::string json = "{ \"test\" : { \"property\" : \"value\" } }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + assert (object->isObject("test")); + assert (!object->isArray("test")); + + Var test = object->get("test"); + assert(test.type() == typeid(Object::Ptr)); + object = test.extract(); + + test = object->get("property"); + assert(test.isString()); + std::string value = test.convert(); + assert(value.compare("value") == 0); +} + + +void JSONTest::testObjectArray() +{ + std::string json = "{ \"test\" : { \"test1\" : [1, 2, 3], \"test2\" : 4 } }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + Object::Ptr object = result.extract(); + assert(object->isObject("test")); + object = object->getObject("test"); + assert(!object->isObject("test1")); + assert(object->isArray("test1")); + assert(!object->isObject("test2")); + assert(!object->isArray("test2")); +} + + +void JSONTest::testEmptyArray() +{ + std::string json = "[]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + assert(array->size() == 0); +} + + +void JSONTest::testNestedArray() +{ + std::string json = "[[[[]]]]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + assert(array->size() == 1); +} + + +void JSONTest::testNullElement() +{ + std::string json = "[ null ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + assert(array->isNull(0)); + Var test = array->get(0); + assert(test.isEmpty()); +} + + +void JSONTest::testTrueElement() +{ + std::string json = "[ true ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Var test = array->get(0); + assert(test.type() == typeid(bool)); + bool value = test; + assert(value); +} + + +void JSONTest::testFalseElement() +{ + std::string json = "[ false ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Var test = array->get(0); + assert(test.type() == typeid(bool)); + bool value = test; + assert(!value); +} + + +void JSONTest::testNumberElement() +{ + std::string json = "[ 1969 ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Var test = array->get(0); + assert(test.isInteger()); + int value = test; + assert(value == 1969); +} + + +void JSONTest::testStringElement() +{ + std::string json = "[ \"value\" ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Var test = array->get(0); + assert(test.isString()); + std::string value = test.convert(); + assert(value.compare("value") == 0); +} + + +void JSONTest::testEmptyObjectElement() +{ + std::string json = "[{}]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Object::Ptr object = array->getObject(0); + assert(object->size() == 0); +} + + +void JSONTest::testDoubleElement() +{ + std::string json = "[ 123.45 ]"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Array::Ptr)); + + Array::Ptr array = result.extract(); + Var test = array->get(0); + assert(test.isNumeric()); + double value = test; + assert(value == 123.45); +} + + +void JSONTest::testOptValue() +{ + std::string json = "{ }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Object::Ptr object = result.extract(); + int n = object->optValue("test", 123); + assert(n == 123); +} + + +void JSONTest::testQuery() +{ + std::string json = "{ \"name\" : \"Franky\", \"children\" : [ \"Jonas\", \"Ellen\" ] }"; + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(json); + result = handler.result(); + } + catch(JSONException& jsone) + { + std::cout << jsone.message() << std::endl; + assert(false); + } + + assert(result.type() == typeid(Object::Ptr)); + + Query query(result); + + std::string firstChild = query.findValue("children[0]", ""); + assert(firstChild.compare("Jonas") == 0); +} + + +void JSONTest::testValidJanssonFiles() +{ + Poco::Path pathPattern(getTestFilesPath("valid")); + + std::set paths; + Poco::Glob::glob(pathPattern, paths); + + for(std::set::iterator it = paths.begin(); it != paths.end(); ++it) + { + Poco::Path filePath(*it, "input"); + + if ( filePath.isFile() ) + { + Poco::File inputFile(filePath); + if ( inputFile.exists() ) + { + Poco::FileInputStream fis(filePath.toString()); + std::cout << filePath.toString() << std::endl; + + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(fis); + result = handler.result(); + std::cout << "Ok!" << std::endl; + } + catch(JSONException& jsone) + { + std::string err = jsone.displayText(); + std::cout << "Failed:" << err << std::endl; + fail (err); + } + catch(Poco::Exception& e) + { + std::string err = e.displayText(); + std::cout << "Failed:" << err << std::endl; + fail (err); + } + } + } + } +} + + +void JSONTest::testInvalidJanssonFiles() +{ + Poco::Path pathPattern(getTestFilesPath("invalid")); + + std::set paths; + Poco::Glob::glob(pathPattern, paths); + + for(std::set::iterator it = paths.begin(); it != paths.end(); ++it) + { + Poco::Path filePath(*it, "input"); + + if ( filePath.isFile() ) + { + Poco::File inputFile(filePath); + if ( inputFile.exists() ) + { + Poco::FileInputStream fis(filePath.toString()); + std::cout << filePath.toString() << std::endl; + + Parser parser; + Var result; + + try + { + DefaultHandler handler; + parser.setHandler(&handler); + parser.parse(fis); + result = handler.result(); + // We shouldn't get here. + std::cout << "We didn't get an exception. This is the result: " << result.convert() << std::endl; + fail(result.convert()); + } + catch(JSONException&) + { + continue; + } + catch(Poco::SyntaxException&) + { } + } + } + } +} + + +void JSONTest::testTemplate() +{ + Template tpl; + tpl.parse("Hello world! From \nYou're too old\n"); + + Object::Ptr data = new Object(); + Object::Ptr person = new Object(); + data->set("person", person); + person->set("name", "Franky"); + person->set("toOld", true); + tpl.render(data, std::cout); +} + + +std::string JSONTest::getTestFilesPath(const std::string& type) +{ + std::ostringstream ostr; + ostr << "data/" << type << '/'; + std::string validDir(ostr.str()); + Poco::Path pathPattern(validDir); + if (Poco::File(pathPattern).exists()) + { + validDir += '*'; + return validDir; + } + + ostr.str(""); + ostr << "/JSON/testsuite/data/" << type << '/'; + validDir = Poco::Environment::get("POCO_BASE") + ostr.str(); + pathPattern = validDir; + + if (Poco::File(pathPattern).exists()) + validDir += '*'; + else + throw Poco::NotFoundException("cannot locate directory containing valid JSON test files"); + + return validDir; +} + + +CppUnit::Test* JSONTest::suite() +{ + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("JSONTest"); + + CppUnit_addTest(pSuite, JSONTest, testStringifier); + CppUnit_addTest(pSuite, JSONTest, testNullProperty); + CppUnit_addTest(pSuite, JSONTest, testTrueProperty); + CppUnit_addTest(pSuite, JSONTest, testFalseProperty); + CppUnit_addTest(pSuite, JSONTest, testNumberProperty); +#if defined(POCO_HAVE_INT64) + CppUnit_addTest(pSuite, JSONTest, testNumber64Property); +#endif + CppUnit_addTest(pSuite, JSONTest, testStringProperty); + CppUnit_addTest(pSuite, JSONTest, testEmptyObject); + CppUnit_addTest(pSuite, JSONTest, testDoubleProperty); + CppUnit_addTest(pSuite, JSONTest, testDouble2Property); + CppUnit_addTest(pSuite, JSONTest, testDouble3Property); + CppUnit_addTest(pSuite, JSONTest, testObjectProperty); + CppUnit_addTest(pSuite, JSONTest, testObjectArray); + CppUnit_addTest(pSuite, JSONTest, testEmptyArray); + CppUnit_addTest(pSuite, JSONTest, testNestedArray); + CppUnit_addTest(pSuite, JSONTest, testNullElement); + CppUnit_addTest(pSuite, JSONTest, testTrueElement); + CppUnit_addTest(pSuite, JSONTest, testFalseElement); + CppUnit_addTest(pSuite, JSONTest, testNumberElement); + CppUnit_addTest(pSuite, JSONTest, testStringElement); + CppUnit_addTest(pSuite, JSONTest, testEmptyObjectElement); + CppUnit_addTest(pSuite, JSONTest, testDoubleElement); + CppUnit_addTest(pSuite, JSONTest, testOptValue); + CppUnit_addTest(pSuite, JSONTest, testQuery); + CppUnit_addTest(pSuite, JSONTest, testValidJanssonFiles); + CppUnit_addTest(pSuite, JSONTest, testInvalidJanssonFiles); + CppUnit_addTest(pSuite, JSONTest, testTemplate); + + return pSuite; +} From 413db6d246510dc0168fe6480353af649f72b290 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 19:53:59 -0600 Subject: [PATCH 100/165] clean temp file garbage --- Data/MySQL/src/ResultMetadata.cpp~ | 246 -- Data/MySQL/src/SessionImpl.cpp~ | 290 --- Data/MySQL/testsuite/src/MySQLTest.cpp~ | 861 ------- Data/MySQL/testsuite/src/MySQLTest.h~ | 148 -- Data/MySQL/testsuite/src/SQLExecutor.cpp~ | 1878 --------------- Data/MySQL/testsuite/src/SQLExecutor.h~ | 126 - Data/include/Poco/Data/TypeHandler.h~ | 2113 ----------------- Data/samples/RecordSet/src/RecordSet.cpp~ | 103 - .../RowFormatter/src/RowFormatter.cpp~ | 140 -- JSON/testsuite/src/JSONTest.cpp~ | 923 ------- 10 files changed, 6828 deletions(-) delete mode 100644 Data/MySQL/src/ResultMetadata.cpp~ delete mode 100644 Data/MySQL/src/SessionImpl.cpp~ delete mode 100644 Data/MySQL/testsuite/src/MySQLTest.cpp~ delete mode 100644 Data/MySQL/testsuite/src/MySQLTest.h~ delete mode 100644 Data/MySQL/testsuite/src/SQLExecutor.cpp~ delete mode 100644 Data/MySQL/testsuite/src/SQLExecutor.h~ delete mode 100644 Data/include/Poco/Data/TypeHandler.h~ delete mode 100644 Data/samples/RecordSet/src/RecordSet.cpp~ delete mode 100644 Data/samples/RowFormatter/src/RowFormatter.cpp~ delete mode 100644 JSON/testsuite/src/JSONTest.cpp~ diff --git a/Data/MySQL/src/ResultMetadata.cpp~ b/Data/MySQL/src/ResultMetadata.cpp~ deleted file mode 100644 index a45f71ff6..000000000 --- a/Data/MySQL/src/ResultMetadata.cpp~ +++ /dev/null @@ -1,246 +0,0 @@ -// -// MySQLException.cpp -// -// $Id: //poco/1.4/Data/MySQL/src/ResultMetadata.cpp#1 $ -// -// Library: Data -// Package: MySQL -// Module: ResultMetadata -// -// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Data/MySQL/ResultMetadata.h" -#include "Poco/Data/MySQL/MySQLException.h" -#include - -namespace -{ - class ResultMetadataHandle - /// Simple exception-safe wrapper - { - public: - - explicit ResultMetadataHandle(MYSQL_STMT* stmt) - { - h = mysql_stmt_result_metadata(stmt); - } - - ~ResultMetadataHandle() - { - if (h) - { - mysql_free_result(h); - } - } - - operator MYSQL_RES* () - { - return h; - } - - private: - - MYSQL_RES* h; - }; - - std::size_t fieldSize(const MYSQL_FIELD& field) - /// Convert field MySQL-type and field MySQL-length to actual field length - { - switch (field.type) - { - case MYSQL_TYPE_TINY: return sizeof(char); - case MYSQL_TYPE_SHORT: return sizeof(short); - case MYSQL_TYPE_INT24: - case MYSQL_TYPE_LONG: return sizeof(Poco::Int32); - case MYSQL_TYPE_FLOAT: return sizeof(float); - case MYSQL_TYPE_DOUBLE: return sizeof(double); - case MYSQL_TYPE_LONGLONG: return sizeof(Poco::Int64); - - case MYSQL_TYPE_DATE: - case MYSQL_TYPE_TIME: - case MYSQL_TYPE_DATETIME: - return sizeof(MYSQL_TIME); - - case MYSQL_TYPE_DECIMAL: - case MYSQL_TYPE_NEWDECIMAL: - case MYSQL_TYPE_STRING: - case MYSQL_TYPE_VAR_STRING: - case MYSQL_TYPE_TINY_BLOB: - case MYSQL_TYPE_MEDIUM_BLOB: - case MYSQL_TYPE_LONG_BLOB: - case MYSQL_TYPE_BLOB: - return field.length; - - default: - throw Poco::Data::MySQL::StatementException("unknown field type"); - } - } - - Poco::Data::MetaColumn::ColumnDataType fieldType(const MYSQL_FIELD& field) - /// Convert field MySQL-type to Poco-type - { - bool unsig = ((field.flags & UNSIGNED_FLAG) == UNSIGNED_FLAG); - - switch (field.type) - { - case MYSQL_TYPE_TINY: - if (unsig) return Poco::Data::MetaColumn::FDT_UINT8; - return Poco::Data::MetaColumn::FDT_INT8; - - case MYSQL_TYPE_SHORT: - if (unsig) return Poco::Data::MetaColumn::FDT_UINT16; - return Poco::Data::MetaColumn::FDT_INT16; - - case MYSQL_TYPE_INT24: - case MYSQL_TYPE_LONG: - if (unsig) return Poco::Data::MetaColumn::FDT_UINT32; - return Poco::Data::MetaColumn::FDT_INT32; - - case MYSQL_TYPE_FLOAT: - return Poco::Data::MetaColumn::FDT_FLOAT; - - case MYSQL_TYPE_DOUBLE: - return Poco::Data::MetaColumn::FDT_DOUBLE; - - case MYSQL_TYPE_LONGLONG: - if (unsig) return Poco::Data::MetaColumn::FDT_UINT64; - return Poco::Data::MetaColumn::FDT_INT64; - - case MYSQL_TYPE_STRING: - case MYSQL_TYPE_VAR_STRING: - return Poco::Data::MetaColumn::FDT_STRING; - - case MYSQL_TYPE_TINY_BLOB: - case MYSQL_TYPE_MEDIUM_BLOB: - case MYSQL_TYPE_LONG_BLOB: - case MYSQL_TYPE_BLOB: - return Poco::Data::MetaColumn::FDT_BLOB; - default: - return Poco::Data::MetaColumn::FDT_UNKNOWN; - } - } -} // namespace - - -namespace Poco { -namespace Data { -namespace MySQL { - -void ResultMetadata::reset() -{ - _columns.resize(0); - _row.resize(0); - _buffer.resize(0); - _lengths.resize(0); - _isNull.resize(0); -} - -void ResultMetadata::init(MYSQL_STMT* stmt) -{ - ResultMetadataHandle h(stmt); - - if (!h) - { - // all right, it is normal - // querys such an "INSERT INTO" just does not have result at all - reset(); - return; - } - - std::size_t count = mysql_num_fields(h); - MYSQL_FIELD* fields = mysql_fetch_fields(h); - - std::size_t commonSize = 0; - _columns.reserve(count); - - {for (std::size_t i = 0; i < count; i++) - { - _columns.push_back(MetaColumn( - i, // position - fields[i].name, // name - fieldType(fields[i]), // type - fieldSize(fields[i]), // length - 0, // TODO: precision - !IS_NOT_NULL(fields[i].flags) // nullable - )); - - commonSize += _columns[i].length(); - }} - - _buffer.resize(commonSize); - _row.resize(count); - _lengths.resize(count); - _isNull.resize(count); - - std::size_t offset = 0; - - {for (std::size_t i = 0; i < count; i++) - { - std::memset(&_row[i], 0, sizeof(MYSQL_BIND)); - - _row[i].buffer_type = fields[i].type; - _row[i].buffer_length = static_cast(_columns[i].length()); - _row[i].buffer = &_buffer[0] + offset; - _row[i].length = &_lengths[i]; - _row[i].is_null = &_isNull[i]; - - offset += _row[i].buffer_length; - }} -} - -std::size_t ResultMetadata::columnsReturned() const -{ - return static_cast(_columns.size()); -} - -const MetaColumn& ResultMetadata::metaColumn(std::size_t pos) const -{ - return _columns[pos]; -} - -MYSQL_BIND* ResultMetadata::row() -{ - return &_row[0]; -} - -std::size_t ResultMetadata::length(std::size_t pos) const -{ - return _lengths[pos]; -} - -const unsigned char* ResultMetadata::rawData(std::size_t pos) const -{ - return reinterpret_cast(_row[pos].buffer); -} - -bool ResultMetadata::isNull(std::size_t pos) const -{ - return (_isNull[pos] != 0); -} - -}}} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/SessionImpl.cpp~ b/Data/MySQL/src/SessionImpl.cpp~ deleted file mode 100644 index 6884fd0f6..000000000 --- a/Data/MySQL/src/SessionImpl.cpp~ +++ /dev/null @@ -1,290 +0,0 @@ -// -// MySQLException.cpp -// -// $Id: //poco/1.4/Data/MySQL/src/SessionImpl.cpp#1 $ -// -// Library: Data -// Package: MySQL -// Module: SessionImpl -// -// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "Poco/Data/MySQL/SessionImpl.h" -#include "Poco/Data/MySQL/MySQLStatementImpl.h" -#include "Poco/Data/Session.h" -#include "Poco/NumberParser.h" -#include "Poco/String.h" - - -namespace -{ - std::string copyStripped(std::string::const_iterator from, std::string::const_iterator to) - { - // skip leading spaces - while ((from != to) && isspace(*from)) from++; - // skip trailing spaces - while ((from != to) && isspace(*(to - 1))) to--; - - return std::string(from, to); - } -} - - -namespace Poco { -namespace Data { -namespace MySQL { - - -const std::string SessionImpl::MYSQL_READ_UNCOMMITTED = "READ UNCOMMITTED"; -const std::string SessionImpl::MYSQL_READ_COMMITTED = "READ COMMITTED"; -const std::string SessionImpl::MYSQL_REPEATABLE_READ = "REPEATABLE READ"; -const std::string SessionImpl::MYSQL_SERIALIZABLE = "SERIALIZABLE"; - - -SessionImpl::SessionImpl(const std::string& connectionString, std::size_t loginTimeout) : - Poco::Data::AbstractSessionImpl(toLower(connectionString), loginTimeout), - _handle(0), - _connected(false), - _inTransaction(false) -{ - addProperty("insertId", - &SessionImpl::setInsertId, - &SessionImpl::getInsertId); - - open(); - setConnectionTimeout(CONNECTION_TIMEOUT_DEFAULT); -} - - -void SessionImpl::open(const std::string& connect) -{ - if (connect != connectionString()) - { - if (isConnected()) - throw InvalidAccessException("Session already connected"); - - if (!connect.empty()) - setConnectionString(connect); - } - - poco_assert_dbg (!connectionString().empty()); - - _handle.init(); - - unsigned int timeout = static_cast(getLoginTimeout()); - _handle.options(MYSQL_OPT_CONNECT_TIMEOUT, timeout); - - std::map options; - - // Default values - options["host"] = "localhost"; - options["port"] = "3306"; - options["user"] = ""; - options["password"] = ""; - options["db"] = ""; - options["compress"] = ""; - options["auto-reconnect"] = ""; - - const std::string& connString = connectionString(); - for (std::string::const_iterator start = connString.begin();;) - { - std::string::const_iterator finish = std::find(start, connString.end(), ';'); - std::string::const_iterator middle = std::find(start, finish, '='); - - if (middle == finish) - throw MySQLException("create session: bad connection string format, can not find '='"); - - options[copyStripped(start, middle)] = copyStripped(middle + 1, finish); - - if ((finish == connString.end()) || (finish + 1 == connString.end())) break; - - start = finish + 1; - } - - if (options["user"] == "") - throw MySQLException("create session: specify user name"); - - const char * db = NULL; - if (!options["db"].empty()) - db = options["db"].c_str(); - - unsigned int port = 0; - if (!NumberParser::tryParseUnsigned(options["port"], port) || 0 == port || port > 65535) - throw MySQLException("create session: specify correct port (numeric in decimal notation)"); - - if (options["compress"] == "true") - _handle.options(MYSQL_OPT_COMPRESS); - else if (options["compress"] == "false") - ; - else if (options["compress"] != "") - throw MySQLException("create session: specify correct compress option (true or false) or skip it"); - - if (options["auto-reconnect"] == "true") - _handle.options(MYSQL_OPT_RECONNECT, true); - else if (options["auto-reconnect"] == "false") - _handle.options(MYSQL_OPT_RECONNECT, false); - else if (options["auto-reconnect"] != "") - throw MySQLException("create session: specify correct auto-reconnect option (true or false) or skip it"); - - // Real connect - _handle.connect(options["host"].c_str(), - options["user"].c_str(), - options["password"].c_str(), - db, - port); - - addFeature("autoCommit", - &SessionImpl::autoCommit, - &SessionImpl::isAutoCommit); - - _connected = true; -} - - -SessionImpl::~SessionImpl() -{ - close(); -} - - -Poco::Data::StatementImpl* SessionImpl::createStatementImpl() -{ - return new MySQLStatementImpl(*this); -} - - -void SessionImpl::begin() -{ - Poco::FastMutex::ScopedLock l(_mutex); - - if (_inTransaction) - throw Poco::InvalidAccessException("Already in transaction."); - - _handle.startTransaction(); - _inTransaction = true; -} - - -void SessionImpl::commit() -{ - _handle.commit(); - _inTransaction = false; -} - - -void SessionImpl::rollback() -{ - _handle.rollback(); - _inTransaction = false; -} - - -void SessionImpl::autoCommit(const std::string&, bool val) -{ - StatementExecutor ex(_handle); - ex.prepare(Poco::format("SET autocommit=%d", val ? 1 : 0)); - ex.execute(); -} - - -bool SessionImpl::isAutoCommit(const std::string&) -{ - int ac = 0; - return 1 == getSetting("autocommit", ac); -} - - -void SessionImpl::setTransactionIsolation(Poco::UInt32 ti) -{ - std::string isolation; - switch (ti) - { - case Session::TRANSACTION_READ_UNCOMMITTED: - isolation = MYSQL_READ_UNCOMMITTED; break; - case Session::TRANSACTION_READ_COMMITTED: - isolation = MYSQL_READ_COMMITTED; break; - case Session::TRANSACTION_REPEATABLE_READ: - isolation = MYSQL_REPEATABLE_READ; break; - case Session::TRANSACTION_SERIALIZABLE: - isolation = MYSQL_SERIALIZABLE; break; - default: - throw Poco::InvalidArgumentException("setTransactionIsolation()"); - } - - StatementExecutor ex(_handle); - ex.prepare(Poco::format("SET SESSION TRANSACTION ISOLATION LEVEL %s", isolation)); - ex.execute(); -} - - -Poco::UInt32 SessionImpl::getTransactionIsolation() -{ - std::string isolation; - getSetting("tx_isolation", isolation); - Poco::replaceInPlace(isolation, "-", " "); - if (MYSQL_READ_UNCOMMITTED == isolation) - return Session::TRANSACTION_READ_UNCOMMITTED; - else if (MYSQL_READ_COMMITTED == isolation) - return Session::TRANSACTION_READ_COMMITTED; - else if (MYSQL_REPEATABLE_READ == isolation) - return Session::TRANSACTION_REPEATABLE_READ; - else if (MYSQL_SERIALIZABLE == isolation) - return Session::TRANSACTION_SERIALIZABLE; - - throw InvalidArgumentException("getTransactionIsolation()"); -} - - -bool SessionImpl::hasTransactionIsolation(Poco::UInt32 ti) -{ - return Session::TRANSACTION_READ_UNCOMMITTED == ti || - Session::TRANSACTION_READ_COMMITTED == ti || - Session::TRANSACTION_REPEATABLE_READ == ti || - Session::TRANSACTION_SERIALIZABLE == ti; -} - - -void SessionImpl::close() -{ - if (_connected) - { - _handle.close(); - _connected = false; - } -} - - -void SessionImpl::setConnectionTimeout(std::size_t timeout) -{ - _handle.options(MYSQL_OPT_READ_TIMEOUT, static_cast(timeout)); - _handle.options(MYSQL_OPT_WRITE_TIMEOUT, static_cast(timeout)); - _timeout = timeout; -} - - -}}} diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp~ b/Data/MySQL/testsuite/src/MySQLTest.cpp~ deleted file mode 100644 index 93e484bb0..000000000 --- a/Data/MySQL/testsuite/src/MySQLTest.cpp~ +++ /dev/null @@ -1,861 +0,0 @@ -// -// MySQLTest.cpp -// -// $Id: //poco/1.4/Data/MySQL/testsuite/src/MySQLTest.cpp#1 $ -// -// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "MySQLTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" -#include "Poco/String.h" -#include "Poco/Format.h" -#include "Poco/Tuple.h" -#include "Poco/NamedTuple.h" -#include "Poco/Exception.h" -#include "Poco/Data/LOB.h" -#include "Poco/Data/StatementImpl.h" -#include "Poco/Data/MySQL/Connector.h" -#include "Poco/Data/MySQL/MySQLException.h" -#include "Poco/Nullable.h" -#include "Poco/Data/DataException.h" -#include - -using namespace Poco::Data; -using namespace Poco::Data::Keywords; -using Poco::Data::MySQL::ConnectionException; -using Poco::Data::MySQL::StatementException; -using Poco::format; -using Poco::NotFoundException; -using Poco::Int32; -using Poco::Nullable; -using Poco::Tuple; -using Poco::NamedTuple; - -Poco::SharedPtr MySQLTest::_pSession = 0; -Poco::SharedPtr MySQLTest::_pExecutor = 0; - -// -// Parameters for barebone-test -#define MYSQL_USER "root" -#define MYSQL_PWD "poco" -#define MYSQL_HOST "192.168.1.33" -#define MYSQL_PORT 3306 -#define MYSQL_DB "test" - -// -// Connection string -std::string MySQLTest::_dbConnString = "host=" MYSQL_HOST - ";user=" MYSQL_USER - ";password=" MYSQL_PWD - ";db=" MYSQL_DB - ";compress=true;auto-reconnect=true"; - - -MySQLTest::MySQLTest(const std::string& name): - CppUnit::TestCase(name) -{ - MySQL::Connector::registerConnector(); -} - - -MySQLTest::~MySQLTest() -{ - MySQL::Connector::unregisterConnector(); -} - - -void MySQLTest::testConnectNoDB() -{ - std::string dbConnString = "host=" MYSQL_HOST - ";user=" MYSQL_USER - ";password=" MYSQL_PWD - ";compress=true;auto-reconnect=true"; - - try - { - Session session(MySQL::Connector::KEY, dbConnString); - std::cout << "Connected to [" << "MySQL" << "] without database. Disconnecting ..." << std::endl; - session.close(); - std::cout << "Disconnected." << std::endl; - } - catch (ConnectionFailedException& ex) - { - std::cout << ex.displayText() << std::endl; - } -} - - -void MySQLTest::testBareboneMySQL() -{ - if (!_pSession) fail ("Test not available."); - - std::string tableCreateString = "CREATE TABLE Test " - "(First VARCHAR(30)," - "Second VARCHAR(30)," - "Third VARBINARY(30)," - "Fourth INTEGER," - "Fifth FLOAT)"; - - _pExecutor->bareboneMySQLTest(MYSQL_HOST, MYSQL_USER, MYSQL_PWD, MYSQL_DB, MYSQL_PORT, tableCreateString.c_str()); -} - - -void MySQLTest::testSimpleAccess() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->simpleAccess(); -} - - -void MySQLTest::testComplexType() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->complexType(); -} - - -void MySQLTest::testSimpleAccessVector() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->simpleAccessVector(); -} - - -void MySQLTest::testComplexTypeVector() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->complexTypeVector(); -} - - -void MySQLTest::testInsertVector() -{ - if (!_pSession) fail ("Test not available."); - - recreateStringsTable(); - _pExecutor->insertVector(); -} - - -void MySQLTest::testInsertEmptyVector() -{ - if (!_pSession) fail ("Test not available."); - - recreateStringsTable(); - _pExecutor->insertEmptyVector(); -} - - -void MySQLTest::testInsertSingleBulk() -{ - if (!_pSession) fail ("Test not available."); - - recreateIntsTable(); - _pExecutor->insertSingleBulk(); -} - - -void MySQLTest::testInsertSingleBulkVec() -{ - if (!_pSession) fail ("Test not available."); - - recreateIntsTable(); - _pExecutor->insertSingleBulkVec(); -} - - -void MySQLTest::testLimit() -{ - if (!_pSession) fail ("Test not available."); - - recreateIntsTable(); - _pExecutor->limits(); -} - - -void MySQLTest::testLimitZero() -{ - if (!_pSession) fail ("Test not available."); - - recreateIntsTable(); - _pExecutor->limitZero(); -} - - -void MySQLTest::testLimitOnce() -{ - if (!_pSession) fail ("Test not available."); - - recreateIntsTable(); - _pExecutor->limitOnce(); - -} - - -void MySQLTest::testLimitPrepare() -{ - if (!_pSession) fail ("Test not available."); - - recreateIntsTable(); - _pExecutor->limitPrepare(); -} - - - -void MySQLTest::testPrepare() -{ - if (!_pSession) fail ("Test not available."); - - recreateIntsTable(); - _pExecutor->prepare(); -} - - -void MySQLTest::testSetSimple() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->setSimple(); -} - - -void MySQLTest::testSetComplex() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->setComplex(); -} - - -void MySQLTest::testSetComplexUnique() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->setComplexUnique(); -} - -void MySQLTest::testMultiSetSimple() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->multiSetSimple(); -} - - -void MySQLTest::testMultiSetComplex() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->multiSetComplex(); -} - - -void MySQLTest::testMapComplex() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->mapComplex(); -} - - -void MySQLTest::testMapComplexUnique() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->mapComplexUnique(); -} - - -void MySQLTest::testMultiMapComplex() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->multiMapComplex(); -} - - -void MySQLTest::testSelectIntoSingle() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->selectIntoSingle(); -} - - -void MySQLTest::testSelectIntoSingleStep() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->selectIntoSingleStep(); -} - - -void MySQLTest::testSelectIntoSingleFail() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->selectIntoSingleFail(); -} - - -void MySQLTest::testLowerLimitOk() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->lowerLimitOk(); -} - - -void MySQLTest::testSingleSelect() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->singleSelect(); -} - - -void MySQLTest::testLowerLimitFail() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->lowerLimitFail(); -} - - -void MySQLTest::testCombinedLimits() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->combinedLimits(); -} - - - -void MySQLTest::testRange() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->ranges(); -} - - -void MySQLTest::testCombinedIllegalLimits() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->combinedIllegalLimits(); -} - - - -void MySQLTest::testIllegalRange() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->illegalRange(); -} - - -void MySQLTest::testEmptyDB() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->emptyDB(); -} - - -void MySQLTest::testBLOB() -{ - if (!_pSession) fail ("Test not available."); - - const std::size_t maxFldSize = 65534; - _pSession->setProperty("maxFieldSize", Poco::Any(maxFldSize-1)); - recreatePersonBLOBTable(); - - try - { - _pExecutor->blob(maxFldSize); - fail ("must fail"); - } - catch (DataException&) - { - _pSession->setProperty("maxFieldSize", Poco::Any(maxFldSize)); - } - - recreatePersonBLOBTable(); - _pExecutor->blob(maxFldSize); - - recreatePersonBLOBTable(); - - try - { - _pExecutor->blob(maxFldSize+1); - fail ("must fail"); - } - catch (DataException&) { } -} - - -void MySQLTest::testBLOBStmt() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonBLOBTable(); - _pExecutor->blobStmt(); -} - - -void MySQLTest::testFloat() -{ - if (!_pSession) fail ("Test not available."); - - recreateFloatsTable(); - _pExecutor->floats(); -} - - -void MySQLTest::testDouble() -{ - if (!_pSession) fail ("Test not available."); - - recreateFloatsTable(); - _pExecutor->doubles(); -} - - -void MySQLTest::testTuple() -{ - if (!_pSession) fail ("Test not available."); - - recreateTuplesTable(); - _pExecutor->tuples(); -} - - -void MySQLTest::testTupleVector() -{ - if (!_pSession) fail ("Test not available."); - - recreateTuplesTable(); - _pExecutor->tupleVector(); -} - - -void MySQLTest::testInternalExtraction() -{ - if (!_pSession) fail ("Test not available."); - - recreateVectorsTable(); - _pExecutor->internalExtraction(); -} - - -void MySQLTest::testNull() -{ - if (!_pSession) fail ("Test not available."); - - recreateVectorsTable(); - _pExecutor->doNull(); -} - - -void MySQLTest::testSessionTransaction() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->sessionTransaction(_dbConnString); -} - - -void MySQLTest::testTransaction() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->transaction(_dbConnString); -} - - -void MySQLTest::testReconnect() -{ - if (!_pSession) fail ("Test not available."); - - recreatePersonTable(); - _pExecutor->reconnect(); -} - - -void MySQLTest::testNullableInt() -{ - if (!_pSession) fail ("Test not available."); - - recreateNullableIntTable(); - - Nullable i1(1); - Nullable i2; - - int id = 1; - *_pSession << "INSERT INTO NullableIntTest VALUES(?, ?)", use(id), use(i1), now; - id = 2; - *_pSession << "INSERT INTO NullableIntTest VALUES(?, ?)", use(id), use(i2), now; - id = 3; - i2 = 3; - *_pSession << "INSERT INTO NullableIntTest VALUES(?, ?)", use(id), use(i2), now; - - int count = 0; - *_pSession << "SELECT COUNT(*) FROM NullableIntTest", into(count), now; - assert (count == 3); - - Nullable ci1; - Nullable ci2; - Nullable ci3; - id = 1; - *_pSession << "SELECT Value FROM NullableIntTest WHERE Id = ?", into(ci1), use(id), now; - assert (ci1 == i1); - id = 2; - *_pSession << "SELECT Value FROM NullableIntTest WHERE Id = ?", into(ci2), use(id), now; - assert (ci2.isNull()); - assert (!(0 == ci2)); - assert (0 != ci2); - assert (!(ci2 == 0)); - assert (ci2 != 0); - ci2 = 10; - assert (10 == ci2); - assert (ci2 == 10); - assert (!ci2.isNull()); - id = 3; - *_pSession << "SELECT Value FROM NullableIntTest WHERE Id = ?", into(ci3), use(id), now; - assert (!ci3.isNull()); - assert (ci3 == 3); - assert (3 == ci3); -} - - -void MySQLTest::testNullableString() -{ - if (!_pSession) fail ("Test not available."); - - recreateNullableStringTable(); - - Int32 id = 0; - Nullable address("Address"); - Nullable age = 10; - *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(id), use(address), use(age), now; - id++; - address = null; - age = null; - *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(id), use(address), use(age), now; - - Nullable resAddress; - Nullable resAge; - *_pSession << "SELECT Address, Age FROM NullableStringTest WHERE Id = ?", into(resAddress), into(resAge), use(id), now; - assert(resAddress == address); - assert(resAge == age); - assert(resAddress.isNull()); - assert(null == resAddress); - assert(resAddress == null); - - resAddress = std::string("Test"); - assert(!resAddress.isNull()); - assert(resAddress == std::string("Test")); - assert(std::string("Test") == resAddress); - assert(null != resAddress); - assert(resAddress != null); -} - - -void MySQLTest::testTupleWithNullable() -{ - if (!_pSession) fail ("Test not available."); - - recreateNullableStringTable(); - - typedef Poco::Tuple, Nullable > Info; - - Info info(0, std::string("Address"), 10); - *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(info), now; - - info.set<0>(info.get<0>()++); - info.set<1>(null); - *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(info), now; - - info.set<0>(info.get<0>()++); - info.set<1>(std::string("Address!")); - info.set<2>(null); - *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(info), now; - - std::vector infos; - infos.push_back(Info(10, std::string("A"), 0)); - infos.push_back(Info(11, null, 12)); - infos.push_back(Info(12, std::string("B"), null)); - - *_pSession << "INSERT INTO NullableStringTest VALUES(?, ?, ?)", use(infos), now; - - std::vector result; - - *_pSession << "SELECT Id, Address, Age FROM NullableStringTest", into(result), now; - - assert(result[0].get<1>() == std::string("Address")); - assert(result[0].get<2>() == 10); - - assert(result[1].get<1>() == null); - assert(result[1].get<2>() == 10); - - assert(result[2].get<1>() == std::string("Address!")); - assert(result[2].get<2>() == null); - - assert(result[3].get<1>() == std::string("A")); - assert(result[3].get<2>() == 0); - - assert(result[4].get<1>() == null); - assert(result[4].get<2>() == 12); - - assert(result[5].get<1>() == std::string("B")); - assert(result[5].get<2>() == null); - -} - - -void MySQLTest::dropTable(const std::string& tableName) -{ - - try { *_pSession << format("DROP TABLE IF EXISTS %s", tableName), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("dropTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("dropTable()"); } -} - - -void MySQLTest::recreatePersonTable() -{ - dropTable("Person"); - try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Age INTEGER)", now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreatePersonTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreatePersonTable()"); } -} - - -void MySQLTest::recreatePersonBLOBTable() -{ - dropTable("Person"); - try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Image BLOB)", now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreatePersonBLOBTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreatePersonBLOBTable()"); } -} - - -void MySQLTest::recreatePersonDateTimeTable() -{ - dropTable("Person"); - try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Birthday DATETIME)", now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreatePersonDateTimeTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreatePersonDateTimeTable()"); } -} - - -void MySQLTest::recreateIntsTable() -{ - dropTable("Strings"); - try { *_pSession << "CREATE TABLE Strings (str INTEGER)", now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateIntsTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateIntsTable()"); } -} - - -void MySQLTest::recreateStringsTable() -{ - dropTable("Strings"); - try { *_pSession << "CREATE TABLE Strings (str VARCHAR(30))", now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateStringsTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateStringsTable()"); } -} - - -void MySQLTest::recreateFloatsTable() -{ - dropTable("Strings"); - try { *_pSession << "CREATE TABLE Strings (str FLOAT)", now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateFloatsTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateFloatsTable()"); } -} - - -void MySQLTest::recreateTuplesTable() -{ - dropTable("Tuples"); - try { *_pSession << "CREATE TABLE Tuples " - "(i0 INTEGER, i1 INTEGER, i2 INTEGER, i3 INTEGER, i4 INTEGER, i5 INTEGER, i6 INTEGER, " - "i7 INTEGER, i8 INTEGER, i9 INTEGER, i10 INTEGER, i11 INTEGER, i12 INTEGER, i13 INTEGER," - "i14 INTEGER, i15 INTEGER, i16 INTEGER, i17 INTEGER, i18 INTEGER, i19 INTEGER)", now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateTuplesTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateTuplesTable()"); } -} - - -void MySQLTest::recreateNullableIntTable() -{ - dropTable("NullableIntTest"); - try { - *_pSession << "CREATE TABLE NullableIntTest (Id INTEGER(10), Value INTEGER(10))", now; - } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateNullableIntTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateNullableIntTable()"); } -} - - -void MySQLTest::recreateNullableStringTable() -{ - dropTable("NullableStringTest"); - try { - *_pSession << "CREATE TABLE NullableStringTest (Id INTEGER(10), Address VARCHAR(30), Age INTEGER(10))", now; - } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateNullableStringTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateNullableStringTable()"); } -} - - -void MySQLTest::recreateVectorsTable() -{ - dropTable("Vectors"); - try { *_pSession << "CREATE TABLE Vectors (i0 INTEGER, flt0 FLOAT, str0 VARCHAR(30))", now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateVectorsTable()"); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateVectorsTable()"); } -} - - -void MySQLTest::setUp() -{ -} - - -void MySQLTest::tearDown() -{ - dropTable("Person"); - dropTable("Strings"); -} - - -CppUnit::Test* MySQLTest::suite() -{ - MySQL::Connector::registerConnector(); - - try - { - _pSession = new Session(MySQL::Connector::KEY, _dbConnString); - } - catch (ConnectionFailedException& ex) - { - std::cout << ex.displayText() << std::endl; - return 0; - } - - std::cout << "*** Connected to [" << "MySQL" << "] test database." << std::endl; - - _pExecutor = new SQLExecutor("MySQL SQL Executor", _pSession); - - CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("MySQLTest"); - - CppUnit_addTest(pSuite, MySQLTest, testConnectNoDB); - CppUnit_addTest(pSuite, MySQLTest, testBareboneMySQL); - CppUnit_addTest(pSuite, MySQLTest, testSimpleAccess); - CppUnit_addTest(pSuite, MySQLTest, testComplexType); - CppUnit_addTest(pSuite, MySQLTest, testSimpleAccessVector); - CppUnit_addTest(pSuite, MySQLTest, testComplexTypeVector); - CppUnit_addTest(pSuite, MySQLTest, testInsertVector); - CppUnit_addTest(pSuite, MySQLTest, testInsertEmptyVector); - CppUnit_addTest(pSuite, MySQLTest, testInsertSingleBulk); - CppUnit_addTest(pSuite, MySQLTest, testInsertSingleBulkVec); - CppUnit_addTest(pSuite, MySQLTest, testLimit); - CppUnit_addTest(pSuite, MySQLTest, testLimitOnce); - CppUnit_addTest(pSuite, MySQLTest, testLimitPrepare); - CppUnit_addTest(pSuite, MySQLTest, testLimitZero); - CppUnit_addTest(pSuite, MySQLTest, testPrepare); - CppUnit_addTest(pSuite, MySQLTest, testSetSimple); - CppUnit_addTest(pSuite, MySQLTest, testSetComplex); - CppUnit_addTest(pSuite, MySQLTest, testSetComplexUnique); - CppUnit_addTest(pSuite, MySQLTest, testMultiSetSimple); - CppUnit_addTest(pSuite, MySQLTest, testMultiSetComplex); - CppUnit_addTest(pSuite, MySQLTest, testMapComplex); - CppUnit_addTest(pSuite, MySQLTest, testMapComplexUnique); - CppUnit_addTest(pSuite, MySQLTest, testMultiMapComplex); - CppUnit_addTest(pSuite, MySQLTest, testSelectIntoSingle); - CppUnit_addTest(pSuite, MySQLTest, testSelectIntoSingleStep); - CppUnit_addTest(pSuite, MySQLTest, testSelectIntoSingleFail); - CppUnit_addTest(pSuite, MySQLTest, testLowerLimitOk); - CppUnit_addTest(pSuite, MySQLTest, testLowerLimitFail); - CppUnit_addTest(pSuite, MySQLTest, testCombinedLimits); - CppUnit_addTest(pSuite, MySQLTest, testCombinedIllegalLimits); - CppUnit_addTest(pSuite, MySQLTest, testRange); - CppUnit_addTest(pSuite, MySQLTest, testIllegalRange); - CppUnit_addTest(pSuite, MySQLTest, testSingleSelect); - CppUnit_addTest(pSuite, MySQLTest, testEmptyDB); - //CppUnit_addTest(pSuite, MySQLTest, testBLOB); - CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt); - CppUnit_addTest(pSuite, MySQLTest, testFloat); - CppUnit_addTest(pSuite, MySQLTest, testDouble); - CppUnit_addTest(pSuite, MySQLTest, testTuple); - CppUnit_addTest(pSuite, MySQLTest, testTupleVector); - CppUnit_addTest(pSuite, MySQLTest, testInternalExtraction); - CppUnit_addTest(pSuite, MySQLTest, testNull); - CppUnit_addTest(pSuite, MySQLTest, testNullableInt); - CppUnit_addTest(pSuite, MySQLTest, testNullableString); - CppUnit_addTest(pSuite, MySQLTest, testTupleWithNullable); - CppUnit_addTest(pSuite, MySQLTest, testSessionTransaction); - CppUnit_addTest(pSuite, MySQLTest, testTransaction); - CppUnit_addTest(pSuite, MySQLTest, testReconnect); - - return pSuite; -} diff --git a/Data/MySQL/testsuite/src/MySQLTest.h~ b/Data/MySQL/testsuite/src/MySQLTest.h~ deleted file mode 100644 index 1132571f9..000000000 --- a/Data/MySQL/testsuite/src/MySQLTest.h~ +++ /dev/null @@ -1,148 +0,0 @@ -// -// ODBCMySQLTest.h -// -// $Id: //poco/1.4/Data/MySQL/testsuite/src/ODBCMySQLTest.h#1 $ -// -// Definition of the MySQLTest class. -// -// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef MySQLTest_INCLUDED -#define MySQLTest_INCLUDED - - -#include "Poco/Data/MySQL/MySQL.h" -#include "Poco/Data/Session.h" -#include "Poco/SharedPtr.h" -#include "CppUnit/TestCase.h" -#include "SQLExecutor.h" - - -class MySQLTest: public CppUnit::TestCase - /// MySQL test class - /// Tested: - /// - /// Driver | DB | OS - /// ----------------+---------------------------+------------------------------------------ - /// 03.51.12.00 | MySQL 5.0.27-community-nt | MS Windows XP Professional x64 v.2003/SP1 - /// - -{ -public: - MySQLTest(const std::string& name); - ~MySQLTest(); - - void testConnectNoDB(); - void testBareboneMySQL(); - - void testSimpleAccess(); - void testComplexType(); - void testSimpleAccessVector(); - void testComplexTypeVector(); - void testInsertVector(); - void testInsertEmptyVector(); - - void testInsertSingleBulk(); - void testInsertSingleBulkVec(); - - void testLimit(); - void testLimitOnce(); - void testLimitPrepare(); - void testLimitZero(); - void testPrepare(); - - void testSetSimple(); - void testSetComplex(); - void testSetComplexUnique(); - void testMultiSetSimple(); - void testMultiSetComplex(); - void testMapComplex(); - void testMapComplexUnique(); - void testMultiMapComplex(); - void testSelectIntoSingle(); - void testSelectIntoSingleStep(); - void testSelectIntoSingleFail(); - void testLowerLimitOk(); - void testLowerLimitFail(); - void testCombinedLimits(); - void testCombinedIllegalLimits(); - void testRange(); - void testIllegalRange(); - void testSingleSelect(); - void testEmptyDB(); - - void testBLOB(); - void testBLOBStmt(); - - void testFloat(); - void testDouble(); - - void testTuple(); - void testTupleVector(); - - void testInternalExtraction(); - - void testNull(); - void testNullVector(); - - void testNullableInt(); - void testNullableString(); - void testTupleWithNullable(); - - void testSessionTransaction(); - void testTransaction(); - - void testReconnect(); - - void setUp(); - void tearDown(); - - static CppUnit::Test* suite(); - -private: - - void dropTable(const std::string& tableName); - void recreatePersonTable(); - void recreatePersonBLOBTable(); - void recreatePersonDateTimeTable(); - void recreateStringsTable(); - void recreateIntsTable(); - void recreateFloatsTable(); - void recreateTuplesTable(); - void recreateVectorsTable(); - void recreateNullableIntTable(); - void recreateNullableStringTable(); - - static std::string _dbConnString; - static Poco::SharedPtr _pSession; - static Poco::SharedPtr _pExecutor; - static const bool bindValues[8]; -}; - - -#endif // MySQLTest_INCLUDED diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp~ b/Data/MySQL/testsuite/src/SQLExecutor.cpp~ deleted file mode 100644 index e120749eb..000000000 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp~ +++ /dev/null @@ -1,1878 +0,0 @@ -// -// SQLExecutor.cpp -// -// $Id: //poco/1.4/Data/MySQL/testsuite/src/SQLExecutor.cpp#1 $ -// -// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "CppUnit/TestCase.h" -#include "SQLExecutor.h" -#include "Poco/String.h" -#include "Poco/Format.h" -#include "Poco/Tuple.h" -#include "Poco/DateTime.h" -#include "Poco/Any.h" -#include "Poco/Exception.h" -#include "Poco/Data/LOB.h" -#include "Poco/Data/StatementImpl.h" -#include "Poco/Data/RecordSet.h" -#include "Poco/Data/Transaction.h" -#include "Poco/Data/MySQL/Connector.h" -#include "Poco/Data/MySQL/MySQLException.h" - -#ifdef _WIN32 -#include -#endif - -#include -#include - - -using namespace Poco::Data; -using namespace Poco::Data::Keywords; -using Poco::Data::MySQL::ConnectionException; -using Poco::Data::MySQL::StatementException; -using Poco::format; -using Poco::Tuple; -using Poco::DateTime; -using Poco::Any; -using Poco::AnyCast; -using Poco::NotFoundException; -using Poco::InvalidAccessException; -using Poco::BadCastException; -using Poco::RangeException; - - -struct Person -{ - std::string lastName; - std::string firstName; - std::string address; - int age; - Person(){age = 0;} - Person(const std::string& ln, const std::string& fn, const std::string& adr, int a):lastName(ln), firstName(fn), address(adr), age(a) - { - } - bool operator==(const Person& other) const - { - return lastName == other.lastName && firstName == other.firstName && address == other.address && age == other.age; - } - - bool operator < (const Person& p) const - { - if (age < p.age) - return true; - if (lastName < p.lastName) - return true; - if (firstName < p.firstName) - return true; - return (address < p.address); - } - - const std::string& operator () () const - /// This method is required so we can extract data to a map! - { - // we choose the lastName as examplary key - return lastName; - } -}; - - -namespace Poco { -namespace Data { - - -template <> -class TypeHandler -{ -public: - static void bind(std::size_t pos, const Person& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Address VARCHAR, Age INTEGER(3)) - poco_assert_dbg (pBinder != 0); - pBinder->bind(pos++, obj.lastName, dir); - pBinder->bind(pos++, obj.firstName, dir); - pBinder->bind(pos++, obj.address, dir); - pBinder->bind(pos++, obj.age, dir); - } - - static void prepare(std::size_t pos, const Person& obj, AbstractPreparator* pPrepare) - { - // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Address VARCHAR, Age INTEGER(3)) - poco_assert_dbg (pPrepare != 0); - pPrepare->prepare(pos++, obj.lastName); - pPrepare->prepare(pos++, obj.firstName); - pPrepare->prepare(pos++, obj.address); - pPrepare->prepare(pos++, obj.age); - } - - static std::size_t size() - { - return 4; - } - - static void extract(std::size_t pos, Person& obj, const Person& defVal, AbstractExtractor* pExt) - { - poco_assert_dbg (pExt != 0); - if (!pExt->extract(pos++, obj.lastName)) - obj.lastName = defVal.lastName; - if (!pExt->extract(pos++, obj.firstName)) - obj.firstName = defVal.firstName; - if (!pExt->extract(pos++, obj.address)) - obj.address = defVal.address; - if (!pExt->extract(pos++, obj.age)) - obj.age = defVal.age; - } - -private: - TypeHandler(); - ~TypeHandler(); - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -} } // namespace Poco::Data - - -SQLExecutor::SQLExecutor(const std::string& name, Poco::Data::Session* pSession): - CppUnit::TestCase(name), - _pSession(pSession) -{ -} - - -SQLExecutor::~SQLExecutor() -{ -} - - -void SQLExecutor::bareboneMySQLTest(const char* host, const char* user, const char* pwd, const char* db, int port, const char* tableCreateString) -{ - int rc; - MYSQL* hsession = mysql_init(0); - assert (hsession != 0); - - MYSQL* tmp = mysql_real_connect(hsession, host, user, pwd, db, port, 0, 0); - assert(tmp == hsession); - - MYSQL_STMT* hstmt = mysql_stmt_init(hsession); - assert(hstmt != 0); - - std::string sql = "DROP TABLE Test"; - mysql_real_query(hsession, sql.c_str(), static_cast(sql.length())); - - sql = tableCreateString; - rc = mysql_stmt_prepare(hstmt, sql.c_str(), static_cast(sql.length())); - assert(rc == 0); - - rc = mysql_stmt_execute(hstmt); - assert(rc == 0); - - sql = "INSERT INTO Test VALUES (?,?,?,?,?)"; - rc = mysql_stmt_prepare(hstmt, sql.c_str(), static_cast(sql.length())); - assert(rc == 0); - - std::string str[3] = { "111", "222", "333" }; - int fourth = 4; - float fifth = 1.5; - - MYSQL_BIND bind_param[5] = {{0}}; - - bind_param[0].buffer = const_cast(str[0].c_str()); - bind_param[0].buffer_length = static_cast(str[0].length()); - bind_param[0].buffer_type = MYSQL_TYPE_STRING; - - bind_param[1].buffer = const_cast(str[1].c_str()); - bind_param[1].buffer_length = static_cast(str[1].length()); - bind_param[1].buffer_type = MYSQL_TYPE_STRING; - - bind_param[2].buffer = const_cast(str[2].c_str()); - bind_param[2].buffer_length = static_cast(str[2].length()); - bind_param[2].buffer_type = MYSQL_TYPE_STRING; - - bind_param[3].buffer = &fourth; - bind_param[3].buffer_type = MYSQL_TYPE_LONG; - - bind_param[4].buffer = &fifth; - bind_param[4].buffer_type = MYSQL_TYPE_FLOAT; - - rc = mysql_stmt_bind_param(hstmt, bind_param); - assert (rc == 0); - - rc = mysql_stmt_execute(hstmt); - assert (rc == 0); - - sql = "SELECT * FROM Test"; - rc = mysql_stmt_prepare(hstmt, sql.c_str(), static_cast(sql.length())); - assert (rc == 0); - - char chr[3][5] = {{ 0 }}; - unsigned long lengths[5] = { 0 }; - fourth = 0; - fifth = 0.0f; - - MYSQL_BIND bind_result[5] = {{0}}; - - bind_result[0].buffer = chr[0]; - bind_result[0].buffer_length = sizeof(chr[0]); - bind_result[0].buffer_type = MYSQL_TYPE_STRING; - bind_result[0].length = &lengths[0]; - - bind_result[1].buffer = chr[1]; - bind_result[1].buffer_length = sizeof(chr[1]); - bind_result[1].buffer_type = MYSQL_TYPE_STRING; - bind_result[1].length = &lengths[1]; - - bind_result[2].buffer = chr[2]; - bind_result[2].buffer_length = sizeof(chr[2]); - bind_result[2].buffer_type = MYSQL_TYPE_STRING; - bind_result[2].length = &lengths[2]; - - bind_result[3].buffer = &fourth; - bind_result[3].buffer_type = MYSQL_TYPE_LONG; - bind_result[3].length = &lengths[3]; - - bind_result[4].buffer = &fifth; - bind_result[4].buffer_type = MYSQL_TYPE_FLOAT; - bind_result[4].length = &lengths[4]; - - rc = mysql_stmt_bind_result(hstmt, bind_result); - assert (rc == 0); - - rc = mysql_stmt_execute(hstmt); - assert (rc == 0); - rc = mysql_stmt_fetch(hstmt); - assert (rc == 0); - - assert (0 == std::strncmp("111", chr[0], 3)); - assert (0 == std::strncmp("222", chr[1], 3)); - assert (0 == std::strncmp("333", chr[2], 3)); - assert (4 == fourth); - assert (1.5 == fifth); - - rc = mysql_stmt_close(hstmt); - assert(rc == 0); - - sql = "DROP TABLE Test"; - rc = mysql_real_query(hsession, sql.c_str(), static_cast(sql.length())); - assert(rc == 0); - - mysql_close(hsession); -} - - -void SQLExecutor::simpleAccess() -{ - std::string funct = "simpleAccess()"; - std::string lastName = "lastName"; - std::string firstName("firstName"); - std::string address("Address"); - int age = 133132; - int count = 0; - std::string result; - - count = 0; - try - { - Statement stmt(*_pSession); - stmt << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age);//, now; - stmt.execute(); - } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - assert (count == 1); - - try { *_pSession << "SELECT LastName FROM Person", into(result), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (lastName == result); - - try { *_pSession << "SELECT Age FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == age); -} - - -void SQLExecutor::complexType() -{ - std::string funct = "complexType()"; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(p1), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(p2), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - - Person c1; - Person c2; - try { *_pSession << "SELECT * FROM Person WHERE LastName = 'LN1'", into(c1), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (c1 == p1); -} - - -void SQLExecutor::simpleAccessVector() -{ - std::string funct = "simpleAccessVector()"; - std::vector lastNames; - std::vector firstNames; - std::vector addresses; - std::vector ages; - std::string tableName("Person"); - lastNames.push_back("LN1"); - lastNames.push_back("LN2"); - firstNames.push_back("FN1"); - firstNames.push_back("FN2"); - addresses.push_back("ADDR1"); - addresses.push_back("ADDR2"); - ages.push_back(1); - ages.push_back(2); - int count = 0; - std::string result; - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - - std::vector lastNamesR; - std::vector firstNamesR; - std::vector addressesR; - std::vector agesR; - try { *_pSession << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (ages == agesR); - assert (lastNames == lastNamesR); - assert (firstNames == firstNamesR); - assert (addresses == addressesR); -} - - -void SQLExecutor::complexTypeVector() -{ - std::string funct = "complexTypeVector()"; - std::vector people; - people.push_back(Person("LN1", "FN1", "ADDR1", 1)); - people.push_back(Person("LN2", "FN2", "ADDR2", 2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - - std::vector result; - try { *_pSession << "SELECT * FROM Person", into(result), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (result == people); -} - - -void SQLExecutor::insertVector() -{ - std::string funct = "insertVector()"; - std::vector str; - str.push_back("s1"); - str.push_back("s2"); - str.push_back("s3"); - str.push_back("s3"); - int count = 100; - - { - Statement stmt((*_pSession << "INSERT INTO Strings VALUES (?)", use(str))); - try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 0); - - try { stmt.execute(); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 4); - } - count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 4); -} - - -void SQLExecutor::insertEmptyVector() -{ - std::string funct = "insertEmptyVector()"; - std::vector str; - - try - { - *_pSession << "INSERT INTO Strings VALUES (?)", use(str), now; - fail("empty collections should not work"); - } - catch (Poco::Exception&) - { - } -} - - -void SQLExecutor::insertSingleBulk() -{ - std::string funct = "insertSingleBulk()"; - int x = 0; - Statement stmt((*_pSession << "INSERT INTO Strings VALUES (?)", use(x))); - - for (x = 0; x < 100; ++x) - { - std::size_t i = stmt.execute(); - assert (i == 0); - } - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 100); - - try { *_pSession << "SELECT SUM(str) FROM Strings", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == ((0+99)*100/2)); -} - - -void SQLExecutor::floats() -{ - std::string funct = "floats()"; - float data = 1.5f; - float ret = 0.0f; - - try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 1); - - try { *_pSession << "SELECT str FROM Strings", into(ret), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (ret == data); -} - - -void SQLExecutor::doubles() -{ - std::string funct = "floats()"; - double data = 1.5; - double ret = 0.0; - - try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 1); - - try { *_pSession << "SELECT str FROM Strings", into(ret), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (ret == data); -} - - -void SQLExecutor::insertSingleBulkVec() -{ - std::string funct = "insertSingleBulkVec()"; - std::vector data; - - for (int x = 0; x < 100; ++x) - data.push_back(x); - - Statement stmt((*_pSession << "INSERT INTO Strings VALUES (?)", use(data))); - stmt.execute(); - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - assert (count == 100); - try { *_pSession << "SELECT SUM(str) FROM Strings", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == ((0+99)*100/2)); -} - - -void SQLExecutor::limits() -{ - std::string funct = "limit()"; - std::vector data; - for (int x = 0; x < 100; ++x) - { - data.push_back(x); - } - - try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - std::vector retData; - try { *_pSession << "SELECT * FROM Strings", into(retData), limit(50), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (retData.size() == 50); - for (int x = 0; x < 50; ++x) - { - assert(data[x] == retData[x]); - } -} - - -void SQLExecutor::limitZero() -{ - std::string funct = "limitZero()"; - std::vector data; - for (int x = 0; x < 100; ++x) - { - data.push_back(x); - } - - try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - std::vector retData; - try { *_pSession << "SELECT * FROM Strings", into(retData), limit(0), now; }// stupid test, but at least we shouldn't crash - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (retData.size() == 0); -} - - -void SQLExecutor::limitOnce() -{ - std::string funct = "limitOnce()"; - std::vector data; - for (int x = 0; x < 101; ++x) - { - data.push_back(x); - } - - try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - std::vector retData; - Statement stmt = (*_pSession << "SELECT * FROM Strings", into(retData), limit(50), now); - assert (!stmt.done()); - assert (retData.size() == 50); - stmt.execute(); - assert (!stmt.done()); - assert (retData.size() == 100); - stmt.execute(); - assert (stmt.done()); - assert (retData.size() == 101); - - for (int x = 0; x < 101; ++x) - { - assert(data[x] == retData[x]); - } -} - - -void SQLExecutor::limitPrepare() -{ - std::string funct = "limitPrepare()"; - std::vector data; - for (int x = 0; x < 100; ++x) - { - data.push_back(x); - } - - try { *_pSession << "INSERT INTO Strings VALUES (?)", use(data), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - std::vector retData; - Statement stmt = (*_pSession << "SELECT * FROM Strings", into(retData), limit(50)); - assert (retData.size() == 0); - assert (!stmt.done()); - - try { stmt.execute(); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (!stmt.done()); - assert (retData.size() == 50); - - try { stmt.execute(); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (stmt.done()); - assert (retData.size() == 100); - - try { stmt.execute(); }// will restart execution! - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (!stmt.done()); - assert (retData.size() == 150); - for (int x = 0; x < 150; ++x) - { - assert(data[x%100] == retData[x]); - } -} - - - -void SQLExecutor::prepare() -{ - std::string funct = "prepare()"; - std::vector data; - for (int x = 0; x < 100; x += 2) - { - data.push_back(x); - } - - { - Statement stmt((*_pSession << "INSERT INTO Strings VALUES (?)", use(data))); - } - // stmt should not have been executed when destroyed - int count = 100; - try { *_pSession << "SELECT COUNT(*) FROM Strings", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 0); -} - - -void SQLExecutor::setSimple() -{ - std::string funct = "setSimple()"; - std::set lastNames; - std::set firstNames; - std::set addresses; - std::set ages; - std::string tableName("Person"); - lastNames.insert("LN1"); - lastNames.insert("LN2"); - firstNames.insert("FN1"); - firstNames.insert("FN2"); - addresses.insert("ADDR1"); - addresses.insert("ADDR2"); - ages.insert(1); - ages.insert(2); - int count = 0; - std::string result; - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - - std::set lastNamesR; - std::set firstNamesR; - std::set addressesR; - std::set agesR; - try { *_pSession << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (ages == agesR); - assert (lastNames == lastNamesR); - assert (firstNames == firstNamesR); - assert (addresses == addressesR); -} - - -void SQLExecutor::setComplex() -{ - std::string funct = "setComplex()"; - std::set people; - people.insert(Person("LN1", "FN1", "ADDR1", 1)); - people.insert(Person("LN2", "FN2", "ADDR2", 2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - - std::set result; - try { *_pSession << "SELECT * FROM Person", into(result), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (result == people); -} - - -void SQLExecutor::setComplexUnique() -{ - std::string funct = "setComplexUnique()"; - std::vector people; - Person p1("LN1", "FN1", "ADDR1", 1); - people.push_back(p1); - people.push_back(p1); - people.push_back(p1); - people.push_back(p1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.push_back(p2); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 5); - - std::set result; - try { *_pSession << "SELECT * FROM Person", into(result), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (result.size() == 2); - assert (*result.begin() == p1); - assert (*++result.begin() == p2); -} - -void SQLExecutor::multiSetSimple() -{ - std::string funct = "multiSetSimple()"; - std::multiset lastNames; - std::multiset firstNames; - std::multiset addresses; - std::multiset ages; - std::string tableName("Person"); - lastNames.insert("LN1"); - lastNames.insert("LN2"); - firstNames.insert("FN1"); - firstNames.insert("FN2"); - addresses.insert("ADDR1"); - addresses.insert("ADDR2"); - ages.insert(1); - ages.insert(2); - int count = 0; - std::string result; - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - - std::multiset lastNamesR; - std::multiset firstNamesR; - std::multiset addressesR; - std::multiset agesR; - try { *_pSession << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (ages.size() == agesR.size()); - assert (lastNames.size() == lastNamesR.size()); - assert (firstNames.size() == firstNamesR.size()); - assert (addresses.size() == addressesR.size()); -} - - -void SQLExecutor::multiSetComplex() -{ - std::string funct = "multiSetComplex()"; - std::multiset people; - Person p1("LN1", "FN1", "ADDR1", 1); - people.insert(p1); - people.insert(p1); - people.insert(p1); - people.insert(p1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(p2); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 5); - - std::multiset result; - try { *_pSession << "SELECT * FROM Person", into(result), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (result.size() == people.size()); -} - - -void SQLExecutor::mapComplex() -{ - std::string funct = "mapComplex()"; - std::map people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN2", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - - std::map result; - try { *_pSession << "SELECT * FROM Person", into(result), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (result == people); -} - - -void SQLExecutor::mapComplexUnique() -{ - std::string funct = "mapComplexUnique()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN2", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 5); - - std::map result; - try { *_pSession << "SELECT * FROM Person", into(result), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (result.size() == 2); -} - - -void SQLExecutor::multiMapComplex() -{ - std::string funct = "multiMapComplex()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN2", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 5); - - std::multimap result; - try { *_pSession << "SELECT * FROM Person", into(result), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (result.size() == people.size()); -} - - -void SQLExecutor::selectIntoSingle() -{ - std::string funct = "selectIntoSingle()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - Person result; - try { *_pSession << "SELECT * FROM Person", into(result), limit(1), now; }// will return 1 object into one single result - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (result == p1); -} - - -void SQLExecutor::selectIntoSingleStep() -{ - std::string funct = "selectIntoSingleStep()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - Person result; - Statement stmt = (*_pSession << "SELECT * FROM Person", into(result), limit(1)); - stmt.execute(); - assert (result == p1); - assert (!stmt.done()); - stmt.execute(); - assert (result == p2); - assert (stmt.done()); -} - - -void SQLExecutor::selectIntoSingleFail() -{ - std::string funct = "selectIntoSingleFail()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), limit(2, true), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - Person result; - try - { - *_pSession << "SELECT * FROM Person", into(result), limit(1, true), now; // will fail now - fail("hardLimit is set: must fail"); - } - catch(Poco::Data::LimitException&) - { - } -} - - -void SQLExecutor::lowerLimitOk() -{ - std::string funct = "lowerLimitOk()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - Person result; - try - { - *_pSession << "SELECT * FROM Person", into(result), lowerLimit(2), now; // will return 2 objects into one single result but only room for one! - fail("Not enough space for results"); - } - catch(Poco::Exception&) - { - } -} - - -void SQLExecutor::singleSelect() -{ - std::string funct = "singleSelect()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - Person result; - Statement stmt = (*_pSession << "SELECT * FROM Person", into(result), limit(1)); - stmt.execute(); - assert (result == p1); - assert (!stmt.done()); - stmt.execute(); - assert (result == p2); - assert (stmt.done()); -} - - -void SQLExecutor::lowerLimitFail() -{ - std::string funct = "lowerLimitFail()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - Person result; - try - { - *_pSession << "SELECT * FROM Person", into(result), lowerLimit(3), now; // will fail - fail("should fail. not enough data"); - } - catch(Poco::Exception&) - { - } -} - - -void SQLExecutor::combinedLimits() -{ - std::string funct = "combinedLimits()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - std::vector result; - try { *_pSession << "SELECT * FROM Person", into(result), lowerLimit(2), upperLimit(2), now; }// will return 2 objects - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (result.size() == 2); - assert (result[0] == p1); - assert (result[1] == p2); -} - - - -void SQLExecutor::ranges() -{ - std::string funct = "range()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - std::vector result; - try { *_pSession << "SELECT * FROM Person", into(result), range(2, 2), now; }// will return 2 objects - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (result.size() == 2); - assert (result[0] == p1); - assert (result[1] == p2); -} - - -void SQLExecutor::combinedIllegalLimits() -{ - std::string funct = "combinedIllegalLimits()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - Person result; - try - { - *_pSession << "SELECT * FROM Person", into(result), lowerLimit(3), upperLimit(2), now; - fail("lower > upper is not allowed"); - } - catch(LimitException&) - { - } -} - - -void SQLExecutor::illegalRange() -{ - std::string funct = "illegalRange()"; - std::multimap people; - Person p1("LN1", "FN1", "ADDR1", 1); - Person p2("LN2", "FN2", "ADDR2", 2); - people.insert(std::make_pair("LN1", p1)); - people.insert(std::make_pair("LN1", p2)); - - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 2); - Person result; - try - { - *_pSession << "SELECT * FROM Person", into(result), range(3, 2), now; - fail("lower > upper is not allowed"); - } - catch(LimitException&) - { - } -} - - -void SQLExecutor::emptyDB() -{ - std::string funct = "emptyDB()"; - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 0); - - Person result; - Statement stmt = (*_pSession << "SELECT * FROM Person", into(result), limit(1)); - stmt.execute(); - assert (result.firstName.empty()); - assert (stmt.done()); -} - - -void SQLExecutor::blob(int bigSize) -{ - std::string funct = "blob()"; - std::string lastName("lastname"); - std::string firstName("firstname"); - std::string address("Address"); - - Poco::Data::CLOB img("0123456789", 10); - int count = 0; - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(img), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 1); - - Poco::Data::CLOB res; - assert (res.size() == 0); - try { *_pSession << "SELECT Image FROM Person", into(res), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (res == img); - - Poco::Data::CLOB big; - std::vector v(bigSize, 'x'); - big.assignRaw(&v[0], (std::size_t) v.size()); - - assert (big.size() == (std::size_t) bigSize); - - try { *_pSession << "DELETE FROM Person", now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - try { *_pSession << "INSERT INTO Person VALUES(?,?,?,?)", use(lastName), use(firstName), use(address), use(big), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - try { *_pSession << "SELECT Image FROM Person", into(res), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (res == big); -} - - -void SQLExecutor::dateTime() -{ - std::string funct = "dateTime()"; - std::string lastName("Bart"); - std::string firstName("Simpson"); - std::string address("Springfield"); - DateTime birthday(1980, 4, 1, 5, 45, 12); - - int count = 0; - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(birthday), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 1); - - DateTime bd; - try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (bd == birthday); - - std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person"); -} - - -void SQLExecutor::blobStmt() -{ - std::string funct = "blobStmt()"; - std::string lastName("lastname"); - std::string firstName("firstname"); - std::string address("Address"); - Poco::Data::CLOB blob("0123456789", 10); - - int count = 0; - Statement ins = (*_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(blob)); - ins.execute(); - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 1); - - Poco::Data::CLOB res; - poco_assert (res.size() == 0); - Statement stmt = (*_pSession << "SELECT Image FROM Person", into(res)); - try { stmt.execute(); } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - poco_assert (res == blob); -} - - -void SQLExecutor::tuples() -{ - typedef Tuple TupleType; - std::string funct = "tuples()"; - TupleType t(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19); - - try { *_pSession << "INSERT INTO Tuples VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", use(t), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - TupleType ret(-10,-11,-12,-13,-14,-15,-16,-17,-18,-19); - assert (ret != t); - try { *_pSession << "SELECT * FROM Tuples", into(ret), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (ret == t); -} - - -void SQLExecutor::tupleVector() -{ - typedef Tuple TupleType; - std::string funct = "tupleVector()"; - TupleType t(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19); - Tuple - t10(10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29); - TupleType t100(100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119); - std::vector v; - v.push_back(t); - v.push_back(t10); - v.push_back(t100); - - try { *_pSession << "INSERT INTO Tuples VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", use(v), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Tuples", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (v.size() == (std::size_t) count); - - std::vector > ret; - try { *_pSession << "SELECT * FROM Tuples", into(ret), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (ret == v); -} - - -void SQLExecutor::internalExtraction() -{ - /*std::string funct = "internalExtraction()"; - std::vector > v; - v.push_back(Tuple(1, 1.5f, "3")); - v.push_back(Tuple(2, 2.5f, "4")); - v.push_back(Tuple(3, 3.5f, "5")); - v.push_back(Tuple(4, 4.5f, "6")); - - try { *_pSession << "INSERT INTO Vectors VALUES (?,?,?)", use(v), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - try - { - Statement stmt = (*_pSession << "SELECT * FROM Vectors", now); - RecordSet rset(stmt); - - assert (3 == rset.columnCount()); - assert (4 == rset.rowCount()); - - int curVal = 3; - do - { - assert (rset["str0"] == curVal); - ++curVal; - } while (rset.moveNext()); - - rset.moveFirst(); - assert (rset["str0"] == "3"); - rset.moveLast(); - assert (rset["str0"] == "6"); - - RecordSet rset2(rset); - assert (3 == rset2.columnCount()); - assert (4 == rset2.rowCount()); - - int i = rset.value(0,0); - assert (1 == i); - - std::string s = rset.value(0,0); - assert ("1" == s); - - int a = rset.value(0,2); - assert (3 == a); - - try - { - double d = rset.value(1,1); - assert (2.5 == d); - } - catch (BadCastException&) - { - float f = rset.value(1,1); - assert (2.5 == f); - } - - s = rset.value(2,2); - assert ("5" == s); - i = rset.value("str0", 2); - assert (5 == i); - - const Column& col = rset.column(0); - Column::Iterator it = col.begin(); - Column::Iterator end = col.end(); - for (int i = 1; it != end; ++it, ++i) - assert (*it == i); - - rset = (*_pSession << "SELECT COUNT(*) AS cnt FROM Vectors", now); - - //various results for COUNT(*) are received from different drivers - try - { - //this is what most drivers will return - int i = rset.value(0,0); - assert (4 == i); - } - catch(BadCastException&) - { - try - { - //this is for Oracle - double i = rset.value(0,0); - assert (4 == int(i)); - } - catch(BadCastException&) - { - //this is for PostgreSQL - Poco::Int64 big = rset.value(0,0); - assert (4 == big); - } - } - - s = rset.value("cnt", 0).convert(); - assert ("4" == s); - - try { const Column& col1 = rset.column(100); fail ("must fail"); } - catch (RangeException&) { } - - try { rset.value(0,0); fail ("must fail"); } - catch (BadCastException&) { } - - stmt = (*_pSession << "DELETE FROM Vectors", now); - rset = stmt; - - try { const Column& col1 = rset.column(0); fail ("must fail"); } - catch (RangeException&) { } - } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } -*/ -} - - -void SQLExecutor::doNull() -{ - std::string funct = "null()"; - - *_pSession << "INSERT INTO Vectors VALUES (?, ?, ?)", - use(Poco::Data::Keywords::null), - use(Poco::Data::Keywords::null), - use(Poco::Data::Keywords::null), now; - - int count = 0; - try { *_pSession << "SELECT COUNT(*) FROM Vectors", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 1); - - int i0 = 0; - Statement stmt1 = (*_pSession << "SELECT i0 FROM Vectors", into(i0, Poco::Data::Position(0), -1)); - try { stmt1.execute(); } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - poco_assert (i0 == -1); - - float flt0 = 0; - Statement stmt2 = (*_pSession << "SELECT flt0 FROM Vectors", into(flt0, Poco::Data::Position(0), 3.25f)); - try { stmt2.execute(); } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - poco_assert (flt0 == 3.25); - - std::string str0("string"); - Statement stmt3 = (*_pSession << "SELECT str0 FROM Vectors", into(str0, Poco::Data::Position(0), std::string("DEFAULT"))); - try { stmt3.execute(); } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - poco_assert (str0 == "DEFAULT"); -} - - -void SQLExecutor::setTransactionIsolation(Session& session, Poco::UInt32 ti) -{ - if (session.hasTransactionIsolation(ti)) - { - std::string funct = "setTransactionIsolation()"; - - try - { - Transaction t(session, false); - t.setIsolation(ti); - - assert (ti == t.getIsolation()); - assert (t.isIsolation(ti)); - - assert (ti == session.getTransactionIsolation()); - assert (session.isTransactionIsolation(ti)); - } - catch(Poco::Exception& e){ std::cout << funct << ':' << e.displayText() << std::endl;} - } - else - { - std::cout << "Transaction isolation not supported: "; - switch (ti) - { - case Session::TRANSACTION_READ_COMMITTED: - std::cout << "READ COMMITTED"; break; - case Session::TRANSACTION_READ_UNCOMMITTED: - std::cout << "READ UNCOMMITTED"; break; - case Session::TRANSACTION_REPEATABLE_READ: - std::cout << "REPEATABLE READ"; break; - case Session::TRANSACTION_SERIALIZABLE: - std::cout << "SERIALIZABLE"; break; - default: - std::cout << "UNKNOWN"; break; - } - std::cout << std::endl; - } -} - - -void SQLExecutor::sessionTransaction(const std::string& connect) -{ - if (!_pSession->canTransact()) - { - std::cout << "Session not capable of transactions." << std::endl; - return; - } - - Session local("mysql", connect); - local.setFeature("autoCommit", true); - - std::string funct = "transaction()"; - std::vector lastNames; - std::vector firstNames; - std::vector addresses; - std::vector ages; - std::string tableName("Person"); - lastNames.push_back("LN1"); - lastNames.push_back("LN2"); - firstNames.push_back("FN1"); - firstNames.push_back("FN2"); - addresses.push_back("ADDR1"); - addresses.push_back("ADDR2"); - ages.push_back(1); - ages.push_back(2); - int count = 0, locCount = 0; - std::string result; - - bool autoCommit = _pSession->getFeature("autoCommit"); - - _pSession->setFeature("autoCommit", true); - assert (!_pSession->isTransaction()); - _pSession->setFeature("autoCommit", false); - assert (!_pSession->isTransaction()); - - setTransactionIsolation((*_pSession), Session::TRANSACTION_READ_UNCOMMITTED); - setTransactionIsolation((*_pSession), Session::TRANSACTION_REPEATABLE_READ); - setTransactionIsolation((*_pSession), Session::TRANSACTION_SERIALIZABLE); - - setTransactionIsolation((*_pSession), Session::TRANSACTION_READ_COMMITTED); - - _pSession->begin(); - assert (_pSession->isTransaction()); - try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (_pSession->isTransaction()); - - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (0 == locCount); - - try { (*_pSession) << "SELECT COUNT(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (2 == count); - assert (_pSession->isTransaction()); - _pSession->rollback(); - assert (!_pSession->isTransaction()); - - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (0 == locCount); - - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (0 == count); - assert (!_pSession->isTransaction()); - - _pSession->begin(); - try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (_pSession->isTransaction()); - - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (0 == locCount); - - _pSession->commit(); - assert (!_pSession->isTransaction()); - - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (2 == locCount); - - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (2 == count); - - _pSession->setFeature("autoCommit", autoCommit); -} - - -void SQLExecutor::transaction(const std::string& connect) -{ - if (!_pSession->canTransact()) - { - std::cout << "Session not transaction-capable." << std::endl; - return; - } - - Session local("mysql", connect); - local.setFeature("autoCommit", true); - - setTransactionIsolation((*_pSession), Session::TRANSACTION_READ_COMMITTED); - setTransactionIsolation(local, Session::TRANSACTION_READ_COMMITTED); - - std::string funct = "transaction()"; - std::vector lastNames; - std::vector firstNames; - std::vector addresses; - std::vector ages; - std::string tableName("Person"); - lastNames.push_back("LN1"); - lastNames.push_back("LN2"); - firstNames.push_back("FN1"); - firstNames.push_back("FN2"); - addresses.push_back("ADDR1"); - addresses.push_back("ADDR2"); - ages.push_back(1); - ages.push_back(2); - int count = 0, locCount = 0; - std::string result; - - bool autoCommit = _pSession->getFeature("autoCommit"); - - _pSession->setFeature("autoCommit", true); - assert (!_pSession->isTransaction()); - _pSession->setFeature("autoCommit", false); - assert (!_pSession->isTransaction()); - _pSession->setTransactionIsolation(Session::TRANSACTION_READ_COMMITTED); - - { - Transaction trans((*_pSession)); - assert (trans.isActive()); - assert (_pSession->isTransaction()); - - try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - assert (_pSession->isTransaction()); - assert (trans.isActive()); - - try { (*_pSession) << "SELECT COUNT(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (2 == count); - assert (_pSession->isTransaction()); - assert (trans.isActive()); - } - assert (!_pSession->isTransaction()); - - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (0 == count); - assert (!_pSession->isTransaction()); - - { - Transaction trans((*_pSession)); - try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (0 == locCount); - - assert (_pSession->isTransaction()); - assert (trans.isActive()); - trans.commit(); - assert (!_pSession->isTransaction()); - assert (!trans.isActive()); - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (2 == locCount); - } - - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (2 == count); - - _pSession->begin(); - try { (*_pSession) << "DELETE FROM PERSON", now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (2 == locCount); - - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (0 == count); - _pSession->commit(); - - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (0 == locCount); - - std::string sql1 = format("INSERT INTO PERSON VALUES ('%s','%s','%s',%d)", lastNames[0], firstNames[0], addresses[0], ages[0]); - std::string sql2 = format("INSERT INTO PERSON VALUES ('%s','%s','%s',%d)", lastNames[1], firstNames[1], addresses[1], ages[1]); - std::vector sql; - sql.push_back(sql1); - sql.push_back(sql2); - - Transaction trans((*_pSession)); - - trans.execute(sql1, false); - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (1 == count); - trans.execute(sql2, false); - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (2 == count); - - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (0 == locCount); - - trans.rollback(); - - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (0 == locCount); - - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (0 == count); - - trans.execute(sql); - - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; - assert (2 == locCount); - - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (2 == count); - - _pSession->setFeature("autoCommit", autoCommit); -} - - -void SQLExecutor::reconnect() -{ - std::string funct = "reconnect()"; - std::string lastName = "lastName"; - std::string firstName("firstName"); - std::string address("Address"); - int age = 133132; - int count = 0; - std::string result; - - try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - - count = 0; - try { (*_pSession) << "SELECT COUNT(*) FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 1); - - assert (_pSession->isConnected()); - _pSession->close(); - assert (!_pSession->isConnected()); - try - { - (*_pSession) << "SELECT LastName FROM PERSON", into(result), now; - fail ("must fail"); - } - catch(NotConnectedException&){ } - assert (!_pSession->isConnected()); - - _pSession->open(); - assert (_pSession->isConnected()); - try { (*_pSession) << "SELECT Age FROM PERSON", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == age); - assert (_pSession->isConnected()); -} diff --git a/Data/MySQL/testsuite/src/SQLExecutor.h~ b/Data/MySQL/testsuite/src/SQLExecutor.h~ deleted file mode 100644 index 1dc64e38e..000000000 --- a/Data/MySQL/testsuite/src/SQLExecutor.h~ +++ /dev/null @@ -1,126 +0,0 @@ -// -// SQLExecutor.h -// -// $Id: //poco/1.4/Data/MySQL/testsuite/src/SQLExecutor.h#1 $ -// -// Definition of the SQLExecutor class. -// -// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef SQLExecutor_INCLUDED -#define SQLExecutor_INCLUDED - - -#include "Poco/Data/MySQL/MySQL.h" -#include "Poco/Data/Session.h" - - -class SQLExecutor: public CppUnit::TestCase -{ -public: - enum DataBinding - { - PB_IMMEDIATE, - PB_AT_EXEC - }; - - enum DataExtraction - { - DE_MANUAL, - DE_BOUND - }; - - SQLExecutor(const std::string& name, Poco::Data::Session* _pSession); - ~SQLExecutor(); - - void bareboneMySQLTest(const char* host, const char* user, const char* pwd, const char* db, int port, const char* tableCreateString); - /// This function uses "bare bone" MySQL API calls (i.e. calls are not - /// "wrapped" in PocoData framework structures). - /// The purpose of the function is to verify that driver behaves - /// correctly. If this test passes, subsequent tests failures are likely ours. - - void simpleAccess(); - void complexType(); - void simpleAccessVector(); - void complexTypeVector(); - void insertVector(); - void insertEmptyVector(); - - void insertSingleBulk(); - void insertSingleBulkVec(); - - void limits(); - void limitOnce(); - void limitPrepare(); - void limitZero(); - void prepare(); - - void setSimple(); - void setComplex(); - void setComplexUnique(); - void multiSetSimple(); - void multiSetComplex(); - void mapComplex(); - void mapComplexUnique(); - void multiMapComplex(); - void selectIntoSingle(); - void selectIntoSingleStep(); - void selectIntoSingleFail(); - void lowerLimitOk(); - void lowerLimitFail(); - void combinedLimits(); - void combinedIllegalLimits(); - void ranges(); - void illegalRange(); - void singleSelect(); - void emptyDB(); - - void blob(int bigSize = 1024); - void blobStmt(); - void dateTime(); - void floats(); - void doubles(); - void tuples(); - void tupleVector(); - - void internalExtraction(); - void doNull(); - - void sessionTransaction(const std::string& connect); - void transaction(const std::string& connect); - - void reconnect(); - -private: - void setTransactionIsolation(Poco::Data::Session& session, Poco::UInt32 ti); - - Poco::Data::Session* _pSession; -}; - - -#endif // SQLExecutor_INCLUDED diff --git a/Data/include/Poco/Data/TypeHandler.h~ b/Data/include/Poco/Data/TypeHandler.h~ deleted file mode 100644 index 5a9fe630c..000000000 --- a/Data/include/Poco/Data/TypeHandler.h~ +++ /dev/null @@ -1,2113 +0,0 @@ -// -// TypeHandler.h -// -// $Id: //poco/Main/Data/include/Poco/Data/TypeHandler.h#13 $ -// -// Library: Data -// Package: DataCore -// Module: TypeHandler -// -// Definition of the TypeHandler class. -// -// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#ifndef Data_TypeHandler_INCLUDED -#define Data_TypeHandler_INCLUDED - - -#include "Poco/Data/Data.h" -#include "Poco/Data/AbstractBinder.h" -#include "Poco/Data/AbstractExtractor.h" -#include "Poco/Data/AbstractPreparator.h" -#include "Poco/Nullable.h" -#include "Poco/Tuple.h" -#include "Poco/AutoPtr.h" -#include "Poco/SharedPtr.h" -#include - - -namespace Poco { -namespace Data { - - -class AbstractTypeHandler - /// Parent class for type handlers. - /// The reason for this class is to prevent instantiations of type handlers. - /// For documentation on type handlers, see TypeHandler class. -{ -protected: - AbstractTypeHandler(); - ~AbstractTypeHandler(); - AbstractTypeHandler(const AbstractTypeHandler&); - AbstractTypeHandler& operator = (const AbstractTypeHandler&); -}; - - -template -class TypeHandler: public AbstractTypeHandler - /// Converts Rows to a Type and the other way around. Provide template specializations to support your own complex types. - /// - /// Take as example the following (simplified) class: - /// class Person - /// { - /// private: - /// std::string _lastName; - /// std::string _firstName; - /// int _age; - /// public: - /// const std::string& getLastName(); - /// [...] // other set/get methods (returning const reference), a default constructor, - /// [...] // optional < operator (for set, multiset) or function operator (for map, multimap) - /// }; - /// - /// The TypeHandler must provide a custom bind, size, prepare and extract method: - /// - /// template <> - /// class TypeHandler - /// { - /// public: - /// static std::size_t size() - /// { - /// return 3; // lastName + firstname + age occupy three columns - /// } - /// - /// static void bind(std::size_t pos, const Person& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) - /// { - /// // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3)) - /// // Note that we advance pos by the number of columns the datatype uses! For string/int this is one. - /// poco_assert_dbg (pBinder != 0); - /// TypeHandler::bind(pos++, obj.getLastName(), pBinder, dir); - /// TypeHandler::bind(pos++, obj.getFirstName(), pBinder, dir); - /// TypeHandler::bind(pos++, obj.getAge(), pBinder); - /// } - /// - /// static void prepare(std::size_t pos, const Person& obj, AbstractPreparator* pPreparator) - /// { - /// // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3)) - /// poco_assert_dbg (pPreparator != 0); - /// TypeHandler::prepare(pos++, obj.getLastName(), pPreparator); - /// TypeHandler::prepare(pos++, obj.getFirstName(), pPreparator); - /// TypeHandler::prepare(pos++, obj.getAge(), pPreparator); - /// } - /// - /// static void extract(std::size_t pos, Person& obj, const Person& defVal, AbstractExtractor* pExt) - /// { - /// // defVal is the default person we should use if we encunter NULL entries, so we take the individual fields - /// // as defaults. You can do more complex checking, ie return defVal if only one single entry of the fields is null etc... - /// poco_assert_dbg (pExt != 0); - /// std::string lastName; - /// std::string firstName; - /// int age = 0; - /// // the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3)) - /// TypeHandler::extract(pos++, lastName, defVal.getLastName(), pExt); - /// TypeHandler::extract(pos++, firstName, defVal.getFirstName(), pExt); - /// TypeHandler::extract(pos++, age, defVal.getAge(), pExt); - /// obj.setLastName(lastName); - /// obj.setFirstName(firstName); - /// obj.setAge(age); - /// } - /// }; - /// - /// Note that the TypeHandler template specialization must always be declared in the namespace Poco::Data. - /// Apart from that no further work is needed. One can now use Person with into and use clauses. -{ -public: - static void bind(std::size_t pos, const T& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert_dbg (pBinder != 0); - pBinder->bind(pos, obj, dir); - } - - static std::size_t size() - { - return 1u; - } - - static void extract(std::size_t pos, T& obj, const T& defVal, AbstractExtractor* pExt) - { - poco_assert_dbg (pExt != 0); - if (!pExt->extract(pos, obj)) obj = defVal; - } - - static void prepare(std::size_t pos, const T& obj, AbstractPreparator* pPreparator) - { - poco_assert_dbg (pPreparator != 0); - pPreparator->prepare(pos, obj); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator = (const TypeHandler&); -}; - - -template -class TypeHandler >: public AbstractTypeHandler - /// Specialization of type handler for std::deque. -{ -public: - static void bind(std::size_t pos, const std::deque& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert_dbg (pBinder != 0); - pBinder->bind(pos, obj, dir); - } - - static std::size_t size() - { - return 1u; - } - - static void extract(std::size_t pos, std::deque& obj, const T& defVal, AbstractExtractor* pExt) - { - poco_assert_dbg (pExt != 0); - if (!pExt->extract(pos, obj)) - obj.assign(obj.size(), defVal); - } - - static void prepare(std::size_t pos, const std::deque& obj, AbstractPreparator* pPreparator) - { - poco_assert_dbg (pPreparator != 0); - pPreparator->prepare(pos, obj); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator = (const TypeHandler&); -}; - - -template -class TypeHandler >: public AbstractTypeHandler - /// Specialization of type handler for std::vector. -{ -public: - static void bind(std::size_t pos, const std::vector& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert_dbg (pBinder != 0); - pBinder->bind(pos, obj, dir); - } - - static std::size_t size() - { - return 1u; - } - - static void extract(std::size_t pos, std::vector& obj, const T& defVal, AbstractExtractor* pExt) - { - poco_assert_dbg (pExt != 0); - if (!pExt->extract(pos, obj)) - obj.assign(obj.size(), defVal); - } - - static void prepare(std::size_t pos, const std::vector& obj, AbstractPreparator* pPreparator) - { - poco_assert_dbg (pPreparator != 0); - pPreparator->prepare(pos, obj); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator = (const TypeHandler&); -}; - - -template -class TypeHandler >: public AbstractTypeHandler - /// Specialization of type handler for std::list. -{ -public: - static void bind(std::size_t pos, const std::list& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert_dbg (pBinder != 0); - pBinder->bind(pos, obj, dir); - } - - static std::size_t size() - { - return 1u; - } - - static void extract(std::size_t pos, std::list& obj, const T& defVal, AbstractExtractor* pExt) - { - poco_assert_dbg (pExt != 0); - if (!pExt->extract(pos, obj)) - obj.assign(obj.size(), defVal); - } - - static void prepare(std::size_t pos, const std::list& obj, AbstractPreparator* pPreparator) - { - poco_assert_dbg (pPreparator != 0); - pPreparator->prepare(pos, obj); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator = (const TypeHandler&); -}; - -template -class TypeHandler > - /// Specialization of type handler for Nullable. -{ -public: - - static void bind(std::size_t pos, const Nullable& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert_dbg (pBinder != 0); - if (obj.isNull()) - { - pBinder->bind(pos++, Poco::Data::Keywords::null, dir); - } - else - { - pBinder->bind(pos++, obj.value(), dir); - } - } - - static void prepare(std::size_t pos, const Nullable& obj, AbstractPreparator* pPreparator) - { - poco_assert_dbg (pPreparator != 0); - if (obj.isNull()) - { - //Poco::Any a(Poco::Data::Keywords::null); - pPreparator->prepare(pos++, Poco::Data::Keywords::null); - } - else - { - pPreparator->prepare(pos++, (T&)obj.value()); - } - } - - static std::size_t size() - { - return 1u; - } - - static void extract(std::size_t pos, Nullable& obj, const Nullable& , AbstractExtractor* pExt) - { - poco_assert_dbg (pExt != 0); - T val; - - if (pExt->extract(pos++, val)) - { - obj = val; - } - else - { - obj.clear(); - } - } - -private: - - TypeHandler(); - ~TypeHandler(); - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -/// Poco::Tuple TypeHandler specializations - -// define this macro to nothing for smaller code size -#define POCO_TUPLE_TYPE_HANDLER_INLINE inline - - -template -POCO_TUPLE_TYPE_HANDLER_INLINE -void tupleBind(std::size_t& pos, TupleType tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) -{ - TypeHandler::bind(pos, tuple.template get(), pBinder, dir); - pos += TypeHandler::size(); -} - - -template -POCO_TUPLE_TYPE_HANDLER_INLINE -void tuplePrepare(std::size_t& pos, TupleType tuple, AbstractPreparator* pPreparator) -{ - TypeHandler::prepare(pos, tuple.template get(), pPreparator); - pos += TypeHandler::size(); -} - - -template -POCO_TUPLE_TYPE_HANDLER_INLINE -void tupleExtract(std::size_t& pos, TupleType tuple, DefValType defVal, AbstractExtractor* pExt) -{ - Poco::Data::TypeHandler::extract(pos, tuple.template get(), - defVal.template get(), pExt); - pos += TypeHandler::size(); -} - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template - class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size() + - TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler > -{ -public: - typedef typename Poco::TypeWrapper >::CONSTREFTYPE TupleConstRef; - typedef typename Poco::TypeWrapper >::REFTYPE TupleRef; - - static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - poco_assert (pBinder != 0); - tupleBind(pos, tuple, pBinder, dir); - } - - static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator* pPreparator) - { - poco_assert (pPreparator != 0); - tuplePrepare(pos, tuple, pPreparator); - } - - static std::size_t size() - { - return TypeHandler::size(); - } - - static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, - AbstractExtractor* pExt) - { - poco_assert (pExt != 0); - tupleExtract(pos, tuple, defVal, pExt); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator=(const TypeHandler&); -}; - - -template -class TypeHandler >: public AbstractTypeHandler -{ -public: - static void bind(std::size_t pos, const std::pair& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - TypeHandler::bind(pos, obj.first, pBinder, dir); - pos += TypeHandler::size(); - TypeHandler::bind(pos, obj.second, pBinder, dir); - } - - static std::size_t size() - { - return static_cast(TypeHandler::size() + TypeHandler::size()); - } - - static void extract(std::size_t pos, std::pair& obj, const std::pair& defVal, AbstractExtractor* pExt) - { - TypeHandler::extract(pos, obj.first, defVal.first, pExt); - pos += TypeHandler::size(); - TypeHandler::extract(pos, obj.second, defVal.second, pExt); - } - - static void prepare(std::size_t pos, const std::pair& obj, AbstractPreparator* pPreparator) - { - TypeHandler::prepare(pos, obj.first, pPreparator); - pos += TypeHandler::size(); - TypeHandler::prepare(pos, obj.second, pPreparator); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator = (const TypeHandler&); -}; - - -template -class TypeHandler >: public AbstractTypeHandler - /// Specialization of type handler for Poco::AutoPtr -{ -public: - static void bind(std::size_t pos, const Poco::AutoPtr& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - // *obj will trigger a nullpointer exception if empty: this is on purpose - TypeHandler::bind(pos, *obj, pBinder, dir); - } - - static std::size_t size() - { - return static_cast(TypeHandler::size()); - } - - static void extract(std::size_t pos, Poco::AutoPtr& obj, const Poco::AutoPtr& defVal, AbstractExtractor* pExt) - { - poco_assert_dbg (pExt != 0); - - obj = Poco::AutoPtr(new T()); - if (defVal) - TypeHandler::extract(pos, *obj, *defVal, pExt); - else - TypeHandler::extract(pos, *obj, *obj, pExt); - } - - static void prepare(std::size_t pos, const Poco::AutoPtr&, AbstractPreparator* pPreparator) - { - poco_assert_dbg (pPreparator != 0); - TypeHandler::prepare(pos, T(), pPreparator); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator = (const TypeHandler&); -}; - - - -template -class TypeHandler >: public AbstractTypeHandler - /// Specialization of type handler for Poco::SharedPtr -{ -public: - static void bind(std::size_t pos, const Poco::SharedPtr& obj, AbstractBinder* pBinder, AbstractBinder::Direction dir) - { - // *obj will trigger a nullpointer exception if empty - TypeHandler::bind(pos, *obj, pBinder, dir); - } - - static std::size_t size() - { - return static_cast(TypeHandler::size()); - } - - static void extract(std::size_t pos, Poco::SharedPtr& obj, const Poco::SharedPtr& defVal, AbstractExtractor* pExt) - { - poco_assert_dbg (pExt != 0); - - obj = Poco::SharedPtr(new T()); - if (defVal) - TypeHandler::extract(pos, *obj, *defVal, pExt); - else - TypeHandler::extract(pos, *obj, *obj, pExt); - } - - static void prepare(std::size_t pos, const Poco::SharedPtr&, AbstractPreparator* pPreparator) - { - poco_assert_dbg (pPreparator != 0); - TypeHandler::prepare(pos, T(), pPreparator); - } - -private: - TypeHandler(const TypeHandler&); - TypeHandler& operator = (const TypeHandler&); -}; - - -} } // namespace Poco::Data - - -#endif // Data_TypeHandler_INCLUDED diff --git a/Data/samples/RecordSet/src/RecordSet.cpp~ b/Data/samples/RecordSet/src/RecordSet.cpp~ deleted file mode 100644 index 1d20d139a..000000000 --- a/Data/samples/RecordSet/src/RecordSet.cpp~ +++ /dev/null @@ -1,103 +0,0 @@ -// -// RecordSet.cpp -// -// $Id: //poco/Main/Data/samples/RecordSet/src/RecordSet.cpp#2 $ -// -// This sample demonstrates the Data library. -// -/// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - - -#include "Poco/SharedPtr.h" -#include "Poco/DateTime.h" -#include "Poco/Data/SessionFactory.h" -#include "Poco/Data/Session.h" -#include "Poco/Data/RecordSet.h" -#include "Poco/Data/Column.h" -#include "Poco/Data/SQLite/Connector.h" -#include - - -using namespace Poco::Data::Keywords; -using Poco::DateTime; -using Poco::Data::Session; -using Poco::Data::Statement; -using Poco::Data::RecordSet; - - -struct Person -{ - std::string name; - std::string address; - int age; -}; - - -int main(int argc, char** argv) -{ - // register SQLite connector - Poco::Data::SQLite::Connector::registerConnector(); - - // create a session - Session session("SQLite", "sample.db"); - - // drop sample table, if it exists - session << "DROP TABLE IF EXISTS Person", now; - - // (re)create table - session << "CREATE TABLE Person (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now; - - // insert some rows - session << "INSERT INTO Person VALUES('Bart Simpson', 'Springfield', 12, ?)", use(DateTime(1980, 4, 1)), now; - session << "INSERT INTO Person VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(DateTime(1982, 5, 9)), now; - - // a simple query - Statement select(session); - select << "SELECT * FROM Person"; - select.execute(); - - // create a RecordSet - RecordSet rs(select); - std::size_t cols = rs.columnCount(); - // print all column names - for (std::size_t col = 0; col < cols; ++col) - { - std::cout << rs.columnName(col) << std::endl; - } - // iterate over all rows and columns - bool more = rs.moveFirst(); - while (more) - { - for (std::size_t col = 0; col < cols; ++col) - { - std::cout << rs[col].convert() << " "; - } - std::cout << std::endl; - more = rs.moveNext(); - } - - return 0; -} diff --git a/Data/samples/RowFormatter/src/RowFormatter.cpp~ b/Data/samples/RowFormatter/src/RowFormatter.cpp~ deleted file mode 100644 index 63a5dc278..000000000 --- a/Data/samples/RowFormatter/src/RowFormatter.cpp~ +++ /dev/null @@ -1,140 +0,0 @@ -// -// RowFormatter.cpp -// -// $Id: //poco/Main/Data/samples/RecordSet/src/RowFormatter.cpp#2 $ -// -// This sample demonstrates the Data library recordset row formatting -// and streaming capabilities. -// -// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - - -#include "Poco/SharedPtr.h" -#include "Poco/DateTime.h" -#include "Poco/Data/SessionFactory.h" -#include "Poco/Data/Session.h" -#include "Poco/Data/Statement.h" -#include "Poco/Data/RecordSet.h" -#include "Poco/Data/RowFormatter.h" -#include "Poco/Data/SQLite/Connector.h" -#include - - -using namespace Poco::Data::Keywords; -using Poco::DateTime; -using Poco::Data::Session; -using Poco::Data::Statement; -using Poco::Data::RecordSet; -using Poco::Data::RowFormatter; - - -class HTMLTableFormatter : public RowFormatter -{ -public: - HTMLTableFormatter() - { - std::ostringstream os; - os << "" << std::endl; - setPrefix(os.str()); - - os.str(""); - os << "
" << std::endl; - setPostfix(os.str()); - } - - std::string& formatNames(const NameVecPtr pNames, std::string& formattedNames) - { - std::ostringstream str; - - str << "\t" << std::endl; - NameVec::const_iterator it = pNames->begin(); - NameVec::const_iterator end = pNames->end(); - for (; it != end; ++it) str << "\t\t" << *it << "" << std::endl; - str << "\t" << std::endl; - - return formattedNames = str.str(); - } - - std::string& formatValues(const ValueVec& vals, std::string& formattedValues) - { - std::ostringstream str; - - str << "\t" << std::endl; - ValueVec::const_iterator it = vals.begin(); - ValueVec::const_iterator end = vals.end(); - for (; it != end; ++it) - { - if (it->isNumeric()) - str << "\t\t"; - else - str << "\t\t"; - - str << it->convert() << "" << std::endl; - } - str << "\t" << std::endl; - - return formattedValues = str.str(); - } -}; - - -int main(int argc, char** argv) -{ - // register SQLite connector - Poco::Data::SQLite::Connector::registerConnector(); - - // create a session - Session session("SQLite", "sample.db"); - - // drop sample table, if it exists - session << "DROP TABLE IF EXISTS Simpsons", now; - - // (re)create table - session << "CREATE TABLE Simpsons (Name VARCHAR(30), Address VARCHAR, Age INTEGER(3), Birthday DATE)", now; - - // insert some rows - DateTime hd(1956, 3, 1), md(1954, 10, 1), bd(1980, 4, 1), ld(1982, 5, 9); - session << "INSERT INTO Simpsons VALUES('Homer Simpson', 'Springfield', 42, ?)", use(hd), now; - session << "INSERT INTO Simpsons VALUES('Marge Simpson', 'Springfield', 38, ?)", use(md), now; - session << "INSERT INTO Simpsons VALUES('Bart Simpson', 'Springfield', 12, ?)", use(bd), now; - session << "INSERT INTO Simpsons VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(ld), now; - - // create a statement and print the column names and data as HTML table - HTMLTableFormatter tf; - Statement stmt = (session << "SELECT * FROM Simpsons", format(tf), now); - RecordSet rs(stmt); - std::cout << rs << std::endl; - - // Note: The code above is divided into individual steps for clarity purpose. - // The four lines can be reduced to the following single line of code: - std::cout << RecordSet(session, "SELECT * FROM Simpsons", new HTMLTableFormatter); - - // simple formatting example (uses the default SimpleRowFormatter provided by framework) - std::cout << std::endl << "Simple formatting:" << std::endl << std::endl; - std::cout << RecordSet(session, "SELECT * FROM Simpsons"); - - return 0; -} diff --git a/JSON/testsuite/src/JSONTest.cpp~ b/JSON/testsuite/src/JSONTest.cpp~ deleted file mode 100644 index 993137971..000000000 --- a/JSON/testsuite/src/JSONTest.cpp~ +++ /dev/null @@ -1,923 +0,0 @@ -// -// JSONTest.cpp -// -// $Id: //poco/1.4/XML/testsuite/src/JSONTest.cpp#1 $ -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - -#include "JSONTest.h" -#include "CppUnit/TestCaller.h" -#include "CppUnit/TestSuite.h" -#include "Poco/JSON/Object.h" -#include "Poco/JSON/Parser.h" -#include "Poco/JSON/Query.h" -#include "Poco/JSON/JSONException.h" -#include "Poco/JSON/Stringifier.h" -#include "Poco/JSON/DefaultHandler.h" -#include "Poco/JSON/Template.h" -#include "Poco/Path.h" -#include "Poco/Environment.h" -#include "Poco/File.h" -#include "Poco/FileStream.h" -#include "Poco/Glob.h" -#include - - -using namespace Poco::JSON; -using namespace Poco::Dynamic; - - -JSONTest::JSONTest(const std::string& name): CppUnit::TestCase("JSON") -{ - -} - - -JSONTest::~JSONTest() -{ - -} - - -void JSONTest::setUp() -{ -} - - -void JSONTest::tearDown() -{ -} - - -void JSONTest::testStringifier() -{ - Object obj; - - Array arr; - Object obj2; - - obj.set("array", arr); - obj.set("obj2", obj2); - - std::ostringstream ostr; - obj.stringify(ostr); - assert (ostr.str() == "{\"array\":[],\"obj2\":{}}"); -} - - -void JSONTest::testNullProperty() -{ - std::string json = "{ \"test\" : null }"; - Parser parser; - - Var result; - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - assert(object->isNull("test")); - Var test = object->get("test"); - assert(test.isEmpty()); -} - - -void JSONTest::testTrueProperty() -{ - std::string json = "{ \"test\" : true }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.type() == typeid(bool)); - bool value = test; - assert(value); -} - - -void JSONTest::testFalseProperty() -{ - std::string json = "{ \"test\" : false }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.type() == typeid(bool)); - bool value = test; - assert(!value); -} - - -void JSONTest::testNumberProperty() -{ - std::string json = "{ \"test\" : 1969 }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isInteger()); - int value = test; - assert(value == 1969); -} - -#if defined(POCO_HAVE_INT64) - - -void JSONTest::testNumber64Property() -{ - std::string json = "{ \"test\" : 5000000000000000 }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isInteger()); - Int64 value = test; - assert(value == 5000000000000000); -} - - -#endif - - -void JSONTest::testStringProperty() -{ - std::string json = "{ \"test\" : \"value\" }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isString()); - std::string value = test.convert(); - assert(value.compare("value") == 0); -} - - -void JSONTest::testEmptyObject() -{ - std::string json = "{}"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - assert(object->size() == 0); -} - - -void JSONTest::testDoubleProperty() -{ - std::string json = "{ \"test\" : 123.45 }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isNumeric()); - double value = test; - assert(value == 123.45); -} - - -void JSONTest::testDouble2Property() -{ - std::string json = "{ \"test\" : 12e34 }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isNumeric()); - double value = test; - assert(value >= 1.99e34 && value <= 12.01e34); -} - - -void JSONTest::testDouble3Property() -{ - std::string json = "{ \"test\" : 12e-34 }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - Var test = object->get("test"); - assert(test.isNumeric()); - double value = test; - assert(value == 12e-34); -} - - -void JSONTest::testObjectProperty() -{ - std::string json = "{ \"test\" : { \"property\" : \"value\" } }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - assert (object->isObject("test")); - assert (!object->isArray("test")); - - Var test = object->get("test"); - assert(test.type() == typeid(Object::Ptr)); - object = test.extract(); - - test = object->get("property"); - assert(test.isString()); - std::string value = test.convert(); - assert(value.compare("value") == 0); -} - - -void JSONTest::testObjectArray() -{ - std::string json = "{ \"test\" : { \"test1\" : [1, 2, 3], \"test2\" : 4 } }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - Object::Ptr object = result.extract(); - assert(object->isObject("test")); - object = object->getObject("test"); - assert(!object->isObject("test1")); - assert(object->isArray("test1")); - assert(!object->isObject("test2")); - assert(!object->isArray("test2")); -} - - -void JSONTest::testEmptyArray() -{ - std::string json = "[]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - assert(array->size() == 0); -} - - -void JSONTest::testNestedArray() -{ - std::string json = "[[[[]]]]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - assert(array->size() == 1); -} - - -void JSONTest::testNullElement() -{ - std::string json = "[ null ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - assert(array->isNull(0)); - Var test = array->get(0); - assert(test.isEmpty()); -} - - -void JSONTest::testTrueElement() -{ - std::string json = "[ true ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Var test = array->get(0); - assert(test.type() == typeid(bool)); - bool value = test; - assert(value); -} - - -void JSONTest::testFalseElement() -{ - std::string json = "[ false ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Var test = array->get(0); - assert(test.type() == typeid(bool)); - bool value = test; - assert(!value); -} - - -void JSONTest::testNumberElement() -{ - std::string json = "[ 1969 ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Var test = array->get(0); - assert(test.isInteger()); - int value = test; - assert(value == 1969); -} - - -void JSONTest::testStringElement() -{ - std::string json = "[ \"value\" ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Var test = array->get(0); - assert(test.isString()); - std::string value = test.convert(); - assert(value.compare("value") == 0); -} - - -void JSONTest::testEmptyObjectElement() -{ - std::string json = "[{}]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Object::Ptr object = array->getObject(0); - assert(object->size() == 0); -} - - -void JSONTest::testDoubleElement() -{ - std::string json = "[ 123.45 ]"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Array::Ptr)); - - Array::Ptr array = result.extract(); - Var test = array->get(0); - assert(test.isNumeric()); - double value = test; - assert(value == 123.45); -} - - -void JSONTest::testOptValue() -{ - std::string json = "{ }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Object::Ptr object = result.extract(); - int n = object->optValue("test", 123); - assert(n == 123); -} - - -void JSONTest::testQuery() -{ - std::string json = "{ \"name\" : \"Franky\", \"children\" : [ \"Jonas\", \"Ellen\" ] }"; - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(json); - result = handler.result(); - } - catch(JSONException& jsone) - { - std::cout << jsone.message() << std::endl; - assert(false); - } - - assert(result.type() == typeid(Object::Ptr)); - - Query query(result); - - std::string firstChild = query.findValue("children[0]", ""); - assert(firstChild.compare("Jonas") == 0); -} - - -void JSONTest::testValidJanssonFiles() -{ - Poco::Path pathPattern(getTestFilesPath("valid")); - - std::set paths; - Poco::Glob::glob(pathPattern, paths); - - for(std::set::iterator it = paths.begin(); it != paths.end(); ++it) - { - Poco::Path filePath(*it, "input"); - - if ( filePath.isFile() ) - { - Poco::File inputFile(filePath); - if ( inputFile.exists() ) - { - Poco::FileInputStream fis(filePath.toString()); - std::cout << filePath.toString() << std::endl; - - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(fis); - result = handler.result(); - std::cout << "Ok!" << std::endl; - } - catch(JSONException& jsone) - { - std::string err = jsone.displayText(); - std::cout << "Failed:" << err << std::endl; - fail (err); - } - catch(Poco::Exception& e) - { - std::string err = e.displayText(); - std::cout << "Failed:" << err << std::endl; - fail (err); - } - } - } - } -} - - -void JSONTest::testInvalidJanssonFiles() -{ - Poco::Path pathPattern(getTestFilesPath("invalid")); - - std::set paths; - Poco::Glob::glob(pathPattern, paths); - - for(std::set::iterator it = paths.begin(); it != paths.end(); ++it) - { - Poco::Path filePath(*it, "input"); - - if ( filePath.isFile() ) - { - Poco::File inputFile(filePath); - if ( inputFile.exists() ) - { - Poco::FileInputStream fis(filePath.toString()); - std::cout << filePath.toString() << std::endl; - - Parser parser; - Var result; - - try - { - DefaultHandler handler; - parser.setHandler(&handler); - parser.parse(fis); - result = handler.result(); - // We shouldn't get here. - std::cout << "We didn't get an exception. This is the result: " << result.convert() << std::endl; - fail(result.convert()); - } - catch(JSONException&) - { - continue; - } - catch(Poco::SyntaxException&) - { } - } - } - } -} - - -void JSONTest::testTemplate() -{ - Template tpl; - tpl.parse("Hello world! From \nYou're too old\n"); - - Object::Ptr data = new Object(); - Object::Ptr person = new Object(); - data->set("person", person); - person->set("name", "Franky"); - person->set("toOld", true); - tpl.render(data, std::cout); -} - - -std::string JSONTest::getTestFilesPath(const std::string& type) -{ - std::ostringstream ostr; - ostr << "data/" << type << '/'; - std::string validDir(ostr.str()); - Poco::Path pathPattern(validDir); - if (Poco::File(pathPattern).exists()) - { - validDir += '*'; - return validDir; - } - - ostr.str(""); - ostr << "/JSON/testsuite/data/" << type << '/'; - validDir = Poco::Environment::get("POCO_BASE") + ostr.str(); - pathPattern = validDir; - - if (Poco::File(pathPattern).exists()) - validDir += '*'; - else - throw Poco::NotFoundException("cannot locate directory containing valid JSON test files"); - - return validDir; -} - - -CppUnit::Test* JSONTest::suite() -{ - CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("JSONTest"); - - CppUnit_addTest(pSuite, JSONTest, testStringifier); - CppUnit_addTest(pSuite, JSONTest, testNullProperty); - CppUnit_addTest(pSuite, JSONTest, testTrueProperty); - CppUnit_addTest(pSuite, JSONTest, testFalseProperty); - CppUnit_addTest(pSuite, JSONTest, testNumberProperty); -#if defined(POCO_HAVE_INT64) - CppUnit_addTest(pSuite, JSONTest, testNumber64Property); -#endif - CppUnit_addTest(pSuite, JSONTest, testStringProperty); - CppUnit_addTest(pSuite, JSONTest, testEmptyObject); - CppUnit_addTest(pSuite, JSONTest, testDoubleProperty); - CppUnit_addTest(pSuite, JSONTest, testDouble2Property); - CppUnit_addTest(pSuite, JSONTest, testDouble3Property); - CppUnit_addTest(pSuite, JSONTest, testObjectProperty); - CppUnit_addTest(pSuite, JSONTest, testObjectArray); - CppUnit_addTest(pSuite, JSONTest, testEmptyArray); - CppUnit_addTest(pSuite, JSONTest, testNestedArray); - CppUnit_addTest(pSuite, JSONTest, testNullElement); - CppUnit_addTest(pSuite, JSONTest, testTrueElement); - CppUnit_addTest(pSuite, JSONTest, testFalseElement); - CppUnit_addTest(pSuite, JSONTest, testNumberElement); - CppUnit_addTest(pSuite, JSONTest, testStringElement); - CppUnit_addTest(pSuite, JSONTest, testEmptyObjectElement); - CppUnit_addTest(pSuite, JSONTest, testDoubleElement); - CppUnit_addTest(pSuite, JSONTest, testOptValue); - CppUnit_addTest(pSuite, JSONTest, testQuery); - CppUnit_addTest(pSuite, JSONTest, testValidJanssonFiles); - CppUnit_addTest(pSuite, JSONTest, testInvalidJanssonFiles); - CppUnit_addTest(pSuite, JSONTest, testTemplate); - - return pSuite; -} From be73b11b54cf8b4cb12531e3b0e75552e0ebd844 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 19:55:46 -0600 Subject: [PATCH 101/165] test db address --- Data/MySQL/testsuite/src/MySQLTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp index a800a7c55..bc4f058e9 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.cpp +++ b/Data/MySQL/testsuite/src/MySQLTest.cpp @@ -64,7 +64,7 @@ Poco::SharedPtr MySQLTest::_pExecutor = 0; // Parameters for barebone-test #define MYSQL_USER "root" #define MYSQL_PWD "poco" -#define MYSQL_HOST "192.168.1.33" +#define MYSQL_HOST "localhost" #define MYSQL_PORT 3306 #define MYSQL_DB "test" From 8832c2e70ec3efc58cf36b0ad1f2dffa02d80a7f Mon Sep 17 00:00:00 2001 From: aleks-f Date: Fri, 14 Dec 2012 19:59:03 -0600 Subject: [PATCH 102/165] updated CHANGELOG --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 763069e39..8e69616dd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -27,6 +27,8 @@ Release 1.5.0 (2012-12-17) - fixed GH #26: Cannot compile on gcc - merged SF #111: FTP Client logging (Marian Krivos) - fixed GH #30: Poco::Path::home() throws when called from Windows Service +- fixed GH #22: MySQL connection string lowercased +- added MySQL support for Date/Time Release 1.5.0 (2012-10-14) ========================== From e8370151766791cc45bb5ba7a7776a0e1945db88 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sat, 15 Dec 2012 10:22:34 -0600 Subject: [PATCH 103/165] separate tests for Date/Time --- .gitignore | 1 + Data/MySQL/src/ResultMetadata.cpp | 5 + Data/MySQL/testsuite/src/MySQLTest.cpp | 22 +++++ Data/MySQL/testsuite/src/MySQLTest.h | 2 + Data/MySQL/testsuite/src/SQLExecutor.cpp | 114 +++++++++++++++++------ Data/MySQL/testsuite/src/SQLExecutor.h | 2 + 6 files changed, 118 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 1f51cd384..26f82f6b3 100644 --- a/.gitignore +++ b/.gitignore @@ -59,6 +59,7 @@ XML/testsuite/rss.xml Icon? ehthumbs.db Thumbs.db +*~ # VS generated files # ###################### diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp index ae43f9f0c..b018b7d46 100644 --- a/Data/MySQL/src/ResultMetadata.cpp +++ b/Data/MySQL/src/ResultMetadata.cpp @@ -130,8 +130,13 @@ namespace case MYSQL_TYPE_LONGLONG: if (unsig) return Poco::Data::MetaColumn::FDT_UINT64; return Poco::Data::MetaColumn::FDT_INT64; + case MYSQL_TYPE_DATE: + return Poco::Data::MetaColumn::FDT_DATE; + case MYSQL_TYPE_TIME: + return Poco::Data::MetaColumn::FDT_TIME; + case MYSQL_TYPE_DATETIME: return Poco::Data::MetaColumn::FDT_TIMESTAMP; diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp index bc4f058e9..f9e457e0a 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.cpp +++ b/Data/MySQL/testsuite/src/MySQLTest.cpp @@ -423,6 +423,10 @@ void MySQLTest::testDateTime() recreatePersonDateTimeTable(); _pExecutor->dateTime(); + recreatePersonDateTable(); + _pExecutor->date(); + recreatePersonTimeTable(); + _pExecutor->time(); } @@ -715,6 +719,24 @@ void MySQLTest::recreatePersonDateTimeTable() } +void MySQLTest::recreatePersonDateTable() +{ + dropTable("Person"); + try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Birthday DATE)", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreatePersonDateTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreatePersonDateTable()"); } +} + + +void MySQLTest::recreatePersonTimeTable() +{ + dropTable("Person"); + try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Birthday TIME)", now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreatePersonTimeTable()"); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreatePersonTimeTable()"); } +} + + void MySQLTest::recreateIntsTable() { dropTable("Strings"); diff --git a/Data/MySQL/testsuite/src/MySQLTest.h b/Data/MySQL/testsuite/src/MySQLTest.h index 3a9fe275c..887f69af1 100644 --- a/Data/MySQL/testsuite/src/MySQLTest.h +++ b/Data/MySQL/testsuite/src/MySQLTest.h @@ -130,6 +130,8 @@ private: void recreatePersonTable(); void recreatePersonBLOBTable(); void recreatePersonDateTimeTable(); + void recreatePersonDateTable(); + void recreatePersonTimeTable(); void recreateStringsTable(); void recreateIntsTable(); void recreateFloatsTable(); diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index 4e63a6109..73b7205c1 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -39,6 +39,8 @@ #include "Poco/Any.h" #include "Poco/Exception.h" #include "Poco/Data/LOB.h" +#include "Poco/Data/Date.h" +#include "Poco/Data/Time.h" #include "Poco/Data/StatementImpl.h" #include "Poco/Data/RecordSet.h" #include "Poco/Data/Transaction.h" @@ -1253,6 +1255,90 @@ void SQLExecutor::emptyDB() } +void SQLExecutor::dateTime() +{ + std::string funct = "dateTime()"; + std::string lastName("Bart"); + std::string firstName("Simpson"); + std::string address("Springfield"); + DateTime birthday(1980, 4, 1, 5, 45, 12); + + int count = 0; + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(birthday), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + DateTime bd; + assert (bd != birthday); + try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (bd == birthday); + + std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person"); +} + + +void SQLExecutor::date() +{ + std::string funct = "date()"; + std::string lastName("Bart"); + std::string firstName("Simpson"); + std::string address("Springfield"); + Date birthday(1980, 4, 1); + + int count = 0; + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(birthday), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + Date bd; + assert (bd != birthday); + try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (bd == birthday); + + std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person"); +} + + +void SQLExecutor::time() +{ + std::string funct = "date()"; + std::string lastName("Bart"); + std::string firstName("Simpson"); + std::string address("Springfield"); + Time birthday(1, 2, 3); + + int count = 0; + try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(birthday), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (count == 1); + + Time bd; + assert (bd != birthday); + try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assert (bd == birthday); + + std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person"); +} + + void SQLExecutor::blob(int bigSize) { std::string funct = "blob()"; @@ -1298,34 +1384,6 @@ void SQLExecutor::blob(int bigSize) } -void SQLExecutor::dateTime() -{ - std::string funct = "dateTime()"; - std::string lastName("Bart"); - std::string firstName("Simpson"); - std::string address("Springfield"); - DateTime birthday(1980, 4, 1, 5, 45, 12); - - int count = 0; - try { *_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(birthday), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (count == 1); - - DateTime bd; - assert (bd != birthday); - try { *_pSession << "SELECT Birthday FROM Person", into(bd), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assert (bd == birthday); - - std::cout << std::endl << RecordSet(*_pSession, "SELECT * FROM Person"); -} - - void SQLExecutor::blobStmt() { std::string funct = "blobStmt()"; diff --git a/Data/MySQL/testsuite/src/SQLExecutor.h b/Data/MySQL/testsuite/src/SQLExecutor.h index 1dc64e38e..ae6e1f3bd 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.h +++ b/Data/MySQL/testsuite/src/SQLExecutor.h @@ -103,6 +103,8 @@ public: void blob(int bigSize = 1024); void blobStmt(); void dateTime(); + void date(); + void time(); void floats(); void doubles(); void tuples(); From e4db0abc68fc4017eef93b12329a3c0ccd0702fe Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Sat, 15 Dec 2012 11:11:48 -0600 Subject: [PATCH 104/165] add static build dirs to .gitignore --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 26f82f6b3..951d94454 100644 --- a/.gitignore +++ b/.gitignore @@ -87,9 +87,13 @@ Thumbs.db *.lastbuildstate *.unsuccessfulbuild release_shared/ -debug_share/ +debug_shared/ release_static/ debug_static/ +release_static_md/ +debug_static_md/ +release_static_mt/ +debug_static_mt/ bin/ bin64/ lib/ From 031302469fb7e3e1c6219f08f188bc42eb66fc08 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Sat, 15 Dec 2012 13:47:22 -0600 Subject: [PATCH 105/165] revise ODBC Unicode string functions http://support.microsoft.com/kb/294169 added Buffer::size/capacityBytes returning length of buffer in bytes only windows Unicode ODBC tested reverting the SF #506 fix (non-conforming driver, causes problems with other ODBC drivers) --- .../include/Poco/Data/ODBC/Unicode_UNIXODBC.h | 2 +- .../include/Poco/Data/ODBC/Unicode_WIN32.h | 24 ++++------- Data/ODBC/src/SessionImpl.cpp | 2 +- Data/ODBC/src/Unicode_UNIXODBC.cpp | 42 +++++++++---------- Data/ODBC/src/Unicode_WIN32.cpp | 36 ++++++++-------- Foundation/include/Poco/Buffer.h | 16 ++++++- Foundation/testsuite/src/CoreTest.cpp | 6 ++- 7 files changed, 67 insertions(+), 61 deletions(-) diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h index f45f3a3f0..5e0746e96 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h @@ -56,7 +56,7 @@ inline void makeUTF16(SQLCHAR* pSQLChar, SQLSMALLINT length, std::string& target } -inline void makeUTF8(Poco::Buffer& buffer, int length, SQLPOINTER pTarget, SQLINTEGER targetLength); +void makeUTF8(Poco::Buffer& buffer, SQLINTEGER length, SQLPOINTER pTarget, SQLINTEGER targetLength); /// Utility function for conversion from UTF-16 to UTF-8. diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h index 33d451a8f..78846ed32 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h @@ -42,7 +42,7 @@ namespace Poco { namespace Data { -namespace ODBC { +namespace ODBC { inline void makeUTF16(SQLCHAR* pSQLChar, SQLINTEGER length, std::wstring& target) @@ -56,16 +56,15 @@ inline void makeUTF16(SQLCHAR* pSQLChar, SQLINTEGER length, std::wstring& target } -inline void makeUTF16(SQLCHAR* pSQLChar, SQLSMALLINT length, std::wstring& target) - /// Utility function for conversion from UTF-8 to UTF-16. +inline void makeUTF8(Poco::Buffer& buffer, SQLINTEGER length, SQLPOINTER pTarget, SQLINTEGER targetLength) + /// Utility function for conversion from UTF-16 to UTF-8. Length is in bytes. { - makeUTF16(pSQLChar, (SQLINTEGER) length, target); -} + if (buffer.sizeBytes() < length) + throw InvalidArgumentException("Specified length exceeds available length."); + else if ((length % 2) != 0) + throw InvalidArgumentException("Length must be an even number."); - -inline void makeUTF8(Poco::Buffer& buffer, int length, SQLPOINTER pTarget, SQLINTEGER targetLength) - /// Utility function for conversion from UTF-16 to UTF-8. -{ + length /= sizeof(wchar_t); std::string result; UnicodeConverter::toUTF8(buffer.begin(), length, result); @@ -74,13 +73,6 @@ inline void makeUTF8(Poco::Buffer& buffer, int length, SQLPOINTER pTarg } -inline void makeUTF8(Poco::Buffer& buffer, int length, SQLPOINTER pTarget, SQLSMALLINT targetLength) - /// Utility function for conversion from UTF-16 to UTF-8. -{ - makeUTF8(buffer, length, pTarget, (SQLINTEGER) targetLength); -} - - } } } // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/SessionImpl.cpp b/Data/ODBC/src/SessionImpl.cpp index 91b704b58..a7b743d2d 100644 --- a/Data/ODBC/src/SessionImpl.cpp +++ b/Data/ODBC/src/SessionImpl.cpp @@ -218,7 +218,7 @@ bool SessionImpl::canTransact() if (ODBC_TXN_CAPABILITY_UNKNOWN == _canTransact) { SQLUSMALLINT ret; - checkError(Poco::Data::ODBC::SQLGetInfo(_db, SQL_TXN_CAPABLE, &ret, sizeof(ret), 0), + checkError(Poco::Data::ODBC::SQLGetInfo(_db, SQL_TXN_CAPABLE, &ret, 0, 0), "Failed to obtain transaction capability info."); _canTransact = (SQL_TC_NONE != ret) ? diff --git a/Data/ODBC/src/Unicode_UNIXODBC.cpp b/Data/ODBC/src/Unicode_UNIXODBC.cpp index c82762860..5e453a529 100644 --- a/Data/ODBC/src/Unicode_UNIXODBC.cpp +++ b/Data/ODBC/src/Unicode_UNIXODBC.cpp @@ -72,14 +72,14 @@ void makeUTF16(SQLCHAR* pSQLChar, SQLINTEGER length, std::string& target) } -void makeUTF8(Poco::Buffer& buffer, int length, SQLPOINTER pTarget, SQLINTEGER targetLength) +void makeUTF8(Poco::Buffer& buffer, SQLINTEGER length, SQLPOINTER pTarget, SQLINTEGER targetLength) { UTF8Encoding utf8Encoding; UTF16Encoding utf16Encoding; TextConverter converter(utf16Encoding, utf8Encoding); std::string result; - if (0 != converter.convert(buffer.begin(), length * sizeof(SQLWCHAR), result)) + if (0 != converter.convert(buffer.begin(), length, result)) throw DataFormatException("Error converting UTF-16 to UTF-8"); std::memset(pTarget, 0, targetLength); @@ -103,7 +103,7 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt, iCol, iField, buffer.begin(), - (SQLSMALLINT) buffer.size() * sizeof(SQLWCHAR), + (SQLSMALLINT) buffer.sizeBytes(), pcbCharAttr, pNumAttr); @@ -157,8 +157,8 @@ SQLRETURN SQLConnect(SQLHDBC hdbc, makeUTF16(szAuthStr, cbAuthStr, sqlPWD); return SQLConnectW(hdbc, - (SQLWCHAR*) sqlDSN.c_str(), cbDSN, - (SQLWCHAR*) sqlUID.c_str(), cbUID, + (SQLWCHAR*) sqlDSN.c_str(), cbDSN, + (SQLWCHAR*) sqlUID.c_str(), cbUID, (SQLWCHAR*) sqlPWD.c_str(), cbAuthStr); } @@ -184,7 +184,7 @@ SQLRETURN SQLDescribeCol(SQLHSTMT hstmt, pibScale, pfNullable); - makeUTF8(buffer, *pcbColName, szColName, cbColNameMax); + makeUTF8(buffer, *pcbColName * sizeof(SQLWCHAR), szColName, cbColNameMax); return rc; } @@ -227,7 +227,7 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc, SQLRETURN rc = SQLGetConnectAttrW(hdbc, fAttribute, buffer.begin(), - (SQLINTEGER) buffer.size() * sizeof(SQLWCHAR), + (SQLINTEGER) buffer.sizeBytes(), pcbValue); makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); @@ -293,7 +293,7 @@ SQLRETURN SQLGetDescField(SQLHDESC hdesc, iRecord, iField, buffer.begin(), - (SQLINTEGER) buffer.size() * sizeof(SQLWCHAR), + (SQLINTEGER) buffer.sizeBytes(), pcbValue); makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); @@ -343,7 +343,7 @@ SQLRETURN SQLGetDiagField(SQLSMALLINT fHandleType, iRecord, fDiagField, buffer.begin(), - (SQLSMALLINT) buffer.size() * sizeof(SQLWCHAR), + (SQLSMALLINT) buffer.sizeBytes(), pcbDiagInfo); makeUTF8(buffer, *pcbDiagInfo, rgbDiagInfo, cbDiagInfoMax); @@ -383,8 +383,8 @@ SQLRETURN SQLGetDiagRec(SQLSMALLINT fHandleType, (SQLSMALLINT) bufErr.size(), pcbErrorMsg); - makeUTF8(bufState, stateLen, szSqlState, stateLen); - makeUTF8(bufErr, *pcbErrorMsg, szErrorMsg, cbErrorMsgMax); + makeUTF8(bufState, stateLen * sizeof(SQLWCHAR), szSqlState, stateLen); + makeUTF8(bufErr, *pcbErrorMsg * sizeof(SQLWCHAR), szErrorMsg, cbErrorMsgMax); return rc; } @@ -462,11 +462,11 @@ SQLRETURN SQLGetStmtAttr(SQLHSTMT hstmt, return SQLGetStmtAttrW(hstmt, fAttribute, (SQLPOINTER) buffer.begin(), - (SQLINTEGER) buffer.size() * sizeof(SQLWCHAR), + (SQLINTEGER) buffer.sizeBytes(), pcbValue); } - return SQLGetStmtAttrW(hstmt, fAttribute, rgbValue, cbValueMax, pcbValue); + return SQLGetStmtAttrW(hstmt, fAttribute, rgbValue, cbValueMax, pcbValue); } @@ -505,7 +505,7 @@ SQLRETURN SQLGetInfo(SQLHDBC hdbc, SQLRETURN rc = SQLGetInfoW(hdbc, fInfoType, (SQLPOINTER) buffer.begin(), - (SQLSMALLINT) buffer.size() * sizeof(SQLWCHAR), + (SQLSMALLINT) buffer.sizeBytes(), pcbInfoValue); makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax); @@ -595,8 +595,8 @@ SQLRETURN SQLDataSources(SQLHENV henv, (SQLSMALLINT) bufDesc.size(), pcbDesc); - makeUTF8(bufDSN, *pcbDSN, szDSN, cbDSNMax); - makeUTF8(bufDesc, *pcbDesc, szDesc, cbDescMax); + makeUTF8(bufDSN, *pcbDSN * sizeof(SQLWCHAR), szDSN, cbDSNMax); + makeUTF8(bufDesc, *pcbDesc * sizeof(SQLWCHAR), szDesc, cbDescMax); return rc; } @@ -628,7 +628,7 @@ SQLRETURN SQLDriverConnect(SQLHDBC hdbc, pcbConnStrOut, fDriverCompletion); - makeUTF8(out, *pcbConnStrOut, pcbConnStrOut, cbConnStrOutMax); + makeUTF8(out, *pcbConnStrOut * sizeof(SQLWCHAR), pcbConnStrOut, cbConnStrOutMax); return rc; } @@ -653,7 +653,7 @@ SQLRETURN SQLBrowseConnect(SQLHDBC hdbc, (SQLSMALLINT) bufConnStrOut.size(), pcbConnStrOut); - makeUTF8(bufConnStrOut, *pcbConnStrOut, szConnStrOut, cbConnStrOutMax); + makeUTF8(bufConnStrOut, *pcbConnStrOut * sizeof(SQLWCHAR), szConnStrOut, cbConnStrOutMax); return rc; } @@ -710,7 +710,7 @@ SQLRETURN SQLNativeSql(SQLHDBC hdbc, (SQLINTEGER) bufSQLOut.size(), pcbSqlStr); - makeUTF8(bufSQLOut, *pcbSqlStr, szSqlStr, cbSqlStrMax); + makeUTF8(bufSQLOut, *pcbSqlStr * sizeof(SQLWCHAR), szSqlStr, cbSqlStrMax); return rc; } @@ -787,8 +787,8 @@ SQLRETURN SQLDrivers(SQLHENV henv, (SQLSMALLINT) bufDriverAttr.size(), pcbDrvrAttr); - makeUTF8(bufDriverDesc, *pcbDriverDesc, szDriverDesc, cbDriverDescMax); - makeUTF8(bufDriverAttr, *pcbDrvrAttr, szDriverAttributes, cbDrvrAttrMax); + makeUTF8(bufDriverDesc, *pcbDriverDesc * sizeof(SQLWCHAR), szDriverDesc, cbDriverDescMax); + makeUTF8(bufDriverAttr, *pcbDrvrAttr * sizeof(SQLWCHAR), szDriverAttributes, cbDrvrAttrMax); return rc; } diff --git a/Data/ODBC/src/Unicode_WIN32.cpp b/Data/ODBC/src/Unicode_WIN32.cpp index e11de14cf..2513e7e16 100644 --- a/Data/ODBC/src/Unicode_WIN32.cpp +++ b/Data/ODBC/src/Unicode_WIN32.cpp @@ -54,7 +54,7 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt, SQLUSMALLINT iCol, SQLUSMALLINT iField, SQLPOINTER pCharAttr, - SQLSMALLINT cbCharAttrMax, + SQLSMALLINT cbCharAttrMax, SQLSMALLINT* pcbCharAttr, NumAttrPtrType pNumAttr) { @@ -66,7 +66,7 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt, iCol, iField, buffer.begin(), - (SQLSMALLINT) buffer.size() * sizeof(wchar_t), + (SQLSMALLINT) buffer.sizeBytes(), pcbCharAttr, pNumAttr); @@ -78,7 +78,7 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt, iCol, iField, pCharAttr, - cbCharAttrMax, + cbCharAttrMax, pcbCharAttr, pNumAttr); } @@ -150,7 +150,7 @@ SQLRETURN SQLDescribeCol(SQLHSTMT hstmt, pibScale, pfNullable); - makeUTF8(buffer, *pcbColName, szColName, cbColNameMax); + makeUTF8(buffer, *pcbColName * sizeof(wchar_t), szColName, cbColNameMax); return rc; } @@ -195,7 +195,7 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc, SQLRETURN rc = SQLGetConnectAttrW(hdbc, fAttribute, buffer.begin(), - (SQLINTEGER) buffer.size() * sizeof(wchar_t), + (SQLINTEGER) buffer.sizeBytes(), pcbValue); makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); @@ -263,7 +263,7 @@ SQLRETURN SQLGetDescField(SQLHDESC hdesc, iRecord, iField, buffer.begin(), - (SQLINTEGER) buffer.size() * sizeof(wchar_t), + (SQLINTEGER) buffer.sizeBytes(), pcbValue); makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); @@ -312,7 +312,7 @@ SQLRETURN SQLGetDiagField(SQLSMALLINT fHandleType, iRecord, fDiagField, buffer.begin(), - (SQLSMALLINT) buffer.size() * sizeof(wchar_t), + (SQLSMALLINT) buffer.sizeBytes(), pcbDiagInfo); makeUTF8(buffer, *pcbDiagInfo, rgbDiagInfo, cbDiagInfoMax); @@ -351,8 +351,8 @@ SQLRETURN SQLGetDiagRec(SQLSMALLINT fHandleType, (SQLSMALLINT) bufErr.size(), pcbErrorMsg); - makeUTF8(bufState, stateLen, szSqlState, stateLen); - makeUTF8(bufErr, *pcbErrorMsg, szErrorMsg, cbErrorMsgMax); + makeUTF8(bufState, stateLen * sizeof(wchar_t), szSqlState, stateLen); + makeUTF8(bufErr, *pcbErrorMsg * sizeof(wchar_t), szErrorMsg, cbErrorMsgMax); return rc; } @@ -438,7 +438,7 @@ SQLRETURN SQLGetStmtAttr(SQLHSTMT hstmt, return SQLGetStmtAttrW(hstmt, fAttribute, (SQLPOINTER) buffer.begin(), - (SQLINTEGER) buffer.size() * sizeof(wchar_t), + (SQLINTEGER) buffer.sizeBytes(), pcbValue); } @@ -485,7 +485,7 @@ SQLRETURN SQLGetInfo(SQLHDBC hdbc, SQLRETURN rc = SQLGetInfoW(hdbc, fInfoType, (SQLPOINTER) buffer.begin(), - (SQLSMALLINT) buffer.size() * sizeof(wchar_t), + (SQLSMALLINT) buffer.sizeBytes(), pcbInfoValue); makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax); @@ -579,8 +579,8 @@ SQLRETURN SQLDataSources(SQLHENV henv, (SQLSMALLINT) bufDesc.size(), pcbDesc); - makeUTF8(bufDSN, *pcbDSN, szDSN, cbDSNMax); - makeUTF8(bufDesc, *pcbDesc, szDesc, cbDescMax); + makeUTF8(bufDSN, *pcbDSN * sizeof(wchar_t), szDSN, cbDSNMax); + makeUTF8(bufDesc, *pcbDesc * sizeof(wchar_t), szDesc, cbDescMax); return rc; } @@ -612,7 +612,7 @@ SQLRETURN SQLDriverConnect(SQLHDBC hdbc, pcbConnStrOut, fDriverCompletion); - makeUTF8(bufOut, *pcbConnStrOut, szConnStrOut, cbConnStrOutMax); + makeUTF8(bufOut, *pcbConnStrOut * sizeof(wchar_t), szConnStrOut, cbConnStrOutMax); return rc; } @@ -637,7 +637,7 @@ SQLRETURN SQLBrowseConnect(SQLHDBC hdbc, (SQLSMALLINT) bufConnStrOut.size(), pcbConnStrOut); - makeUTF8(bufConnStrOut, *pcbConnStrOut, szConnStrOut, cbConnStrOutMax); + makeUTF8(bufConnStrOut, *pcbConnStrOut * sizeof(wchar_t), szConnStrOut, cbConnStrOutMax); return rc; } @@ -694,7 +694,7 @@ SQLRETURN SQLNativeSql(SQLHDBC hdbc, (SQLINTEGER) bufSQLOut.size(), pcbSqlStr); - makeUTF8(bufSQLOut, *pcbSqlStr, szSqlStr, cbSqlStrMax); + makeUTF8(bufSQLOut, *pcbSqlStr * sizeof(wchar_t), szSqlStr, cbSqlStrMax); return rc; } @@ -771,8 +771,8 @@ SQLRETURN SQLDrivers(SQLHENV henv, (SQLSMALLINT) bufDriverAttr.size(), pcbDrvrAttr); - makeUTF8(bufDriverDesc, *pcbDriverDesc, szDriverDesc, cbDriverDescMax); - makeUTF8(bufDriverAttr, *pcbDrvrAttr, szDriverAttributes, cbDrvrAttrMax); + makeUTF8(bufDriverDesc, *pcbDriverDesc * sizeof(wchar_t), szDriverDesc, cbDriverDescMax); + makeUTF8(bufDriverAttr, *pcbDrvrAttr * sizeof(wchar_t), szDriverAttributes, cbDrvrAttrMax); return rc; } diff --git a/Foundation/include/Poco/Buffer.h b/Foundation/include/Poco/Buffer.h index 3f72c87e1..cefdc9267 100644 --- a/Foundation/include/Poco/Buffer.h +++ b/Foundation/include/Poco/Buffer.h @@ -178,11 +178,17 @@ public: } std::size_t capacity() const - /// Returns the allocated memory size. + /// Returns the allocated memory size in elements. { return _capacity; } + std::size_t capacityBytes() const + /// Returns the allocated memory size in bytes. + { + return _capacity * sizeof(T); + } + void swap(Buffer& other) /// Swaps the buffer with another one. { @@ -224,10 +230,16 @@ public: } std::size_t size() const - /// Returns the used size of the buffer. + /// Returns the used size of the buffer in elements. { return _used; } + + std::size_t sizeBytes() const + /// Returns the used size of the buffer in bytes. + { + return _used * sizeof(T); + } T* begin() /// Returns a pointer to the beginning of the buffer. diff --git a/Foundation/testsuite/src/CoreTest.cpp b/Foundation/testsuite/src/CoreTest.cpp index 5e4fe4d06..f96f676eb 100644 --- a/Foundation/testsuite/src/CoreTest.cpp +++ b/Foundation/testsuite/src/CoreTest.cpp @@ -128,10 +128,10 @@ void CoreTest::testFixedLength() assert (sizeof(Poco::UInt16) == 2); assert (sizeof(Poco::Int32) == 4); assert (sizeof(Poco::UInt32) == 4); - #if defined(POCO_HAVE_INT64) +#if defined(POCO_HAVE_INT64) assert (sizeof(Poco::Int64) == 8); assert (sizeof(Poco::UInt64) == 8); - #endif +#endif assert (sizeof(Poco::IntPtr) == sizeof(void*)); assert (sizeof(Poco::UIntPtr) == sizeof(void*)); } @@ -201,7 +201,9 @@ void CoreTest::testBuffer() std::size_t s = 10; Buffer b(s); assert (b.size() == s); + assert (b.sizeBytes() == s * sizeof(int)); assert (b.capacity() == s); + assert (b.capacityBytes() == s * sizeof(int)); std::vector v; for (int i = 0; i < s; ++i) v.push_back(i); From ee70421f64ea8f105db4b8353c6c6e41d24364bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Sat, 15 Dec 2012 23:59:57 -0200 Subject: [PATCH 106/165] Added Travis CI configuration file Travis CI is a free continuous integration service that allows open source projects to check the integrity of their source code by building it after every commit made to the repository. --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..cf06db101 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: cpp +compiler: + - gcc + - clang +script: cmake . \ No newline at end of file From dc9aafa7a1cd545ac63a2a1c68ba7d6b23db0b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Sun, 16 Dec 2012 00:40:40 -0200 Subject: [PATCH 107/165] Moved contributed CMake modules to "cmake" folder By convention CMake project files are placed on a folder called "cmake" and then called from the build system by appending the CMAKE_MODULE_PATH variable --- CMakeLists.txt | 11 +- Data/CMakeLists.txt | 2 +- {contrib/cmake => cmake}/FindAPR.cmake | 0 {contrib/cmake => cmake}/FindApache2.cmake | 0 {contrib/cmake => cmake}/FindMySQL.cmake | 0 {contrib/cmake => cmake}/FindODBC.cmake | 0 {contrib/cmake => cmake}/FindPostgreSQL.cmake | 0 {contrib/cmake => cmake}/PocoConfig.cmake | 0 {contrib/cmake => cmake}/README | 0 .../cmake => cmake}/cmake_uninstall.cmake.in | 0 contrib/cmake/CMakeLists.txt | 121 ------------------ 11 files changed, 8 insertions(+), 126 deletions(-) rename {contrib/cmake => cmake}/FindAPR.cmake (100%) rename {contrib/cmake => cmake}/FindApache2.cmake (100%) rename {contrib/cmake => cmake}/FindMySQL.cmake (100%) rename {contrib/cmake => cmake}/FindODBC.cmake (100%) rename {contrib/cmake => cmake}/FindPostgreSQL.cmake (100%) rename {contrib/cmake => cmake}/PocoConfig.cmake (100%) rename {contrib/cmake => cmake}/README (100%) rename {contrib/cmake => cmake}/cmake_uninstall.cmake.in (100%) delete mode 100644 contrib/cmake/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f1fdad1c..a957f22eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,9 @@ SET(PROJECT_VERSION ${COMPLETE_VERSION}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +# Append our module directory to CMake +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + ################################################################################# # Setup C/C++ compiler options ################################################################################# @@ -98,9 +101,9 @@ include(FindCygwin) include(FindOpenSSL) #include(CMakeDetermineCompilerId) -include(contrib/cmake/FindMySQL.cmake) -include(contrib/cmake/FindAPR.cmake) -include(contrib/cmake/FindApache2.cmake) +include(FindMySQL) +include(FindAPR) +include(FindApache2) # OS Detection if(CMAKE_SYSTEM MATCHES "Windows") @@ -179,7 +182,7 @@ endif(APRUTIL_FOUND AND APACHE_FOUND) ############################################################# # Uninstall stuff see: http://www.vtk.org/Wiki/CMake_FAQ CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/contrib/cmake/cmake_uninstall.cmake.in" + "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt index fdc952e90..5d06678f6 100644 --- a/Data/CMakeLists.txt +++ b/Data/CMakeLists.txt @@ -31,7 +31,7 @@ if(MYSQL_FOUND) add_subdirectory( MySQL ) endif(MYSQL_FOUND) -include(../contrib/cmake/FindODBC.cmake) +include(FindODBC) if(CMAKE_SYSTEM MATCHES "Windows") message(STATUS "Windows native ODBC Support Enabled") diff --git a/contrib/cmake/FindAPR.cmake b/cmake/FindAPR.cmake similarity index 100% rename from contrib/cmake/FindAPR.cmake rename to cmake/FindAPR.cmake diff --git a/contrib/cmake/FindApache2.cmake b/cmake/FindApache2.cmake similarity index 100% rename from contrib/cmake/FindApache2.cmake rename to cmake/FindApache2.cmake diff --git a/contrib/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake similarity index 100% rename from contrib/cmake/FindMySQL.cmake rename to cmake/FindMySQL.cmake diff --git a/contrib/cmake/FindODBC.cmake b/cmake/FindODBC.cmake similarity index 100% rename from contrib/cmake/FindODBC.cmake rename to cmake/FindODBC.cmake diff --git a/contrib/cmake/FindPostgreSQL.cmake b/cmake/FindPostgreSQL.cmake similarity index 100% rename from contrib/cmake/FindPostgreSQL.cmake rename to cmake/FindPostgreSQL.cmake diff --git a/contrib/cmake/PocoConfig.cmake b/cmake/PocoConfig.cmake similarity index 100% rename from contrib/cmake/PocoConfig.cmake rename to cmake/PocoConfig.cmake diff --git a/contrib/cmake/README b/cmake/README similarity index 100% rename from contrib/cmake/README rename to cmake/README diff --git a/contrib/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in similarity index 100% rename from contrib/cmake/cmake_uninstall.cmake.in rename to cmake/cmake_uninstall.cmake.in diff --git a/contrib/cmake/CMakeLists.txt b/contrib/cmake/CMakeLists.txt deleted file mode 100644 index 5776bb759..000000000 --- a/contrib/cmake/CMakeLists.txt +++ /dev/null @@ -1,121 +0,0 @@ -PROJECT (FTPTest) - -SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH - "Single output directory for building all executables.") - -SET( TARGET_BASE_NAME "${PROJECT_NAME}" ) -SET( LIB_NAME "${TARGET_BASE_NAME}Lib" ) - -#----------------------------------------------------------------------------- -# Let's use the highest warning level. -#----------------------------------------------------------------------------- -IF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv|nmake)") - # Use the highest warning level for visual studio. - IF(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") - STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - ELSE(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") - ENDIF(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") - IF(CMAKE_C_FLAGS MATCHES "/W[0-4]") - STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") - ELSE(CMAKE_C_FLAGS MATCHES "/W[0-4]") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") - ENDIF(CMAKE_C_FLAGS MATCHES "/W[0-4]") - # Disable deprecation warnings for standard C functions in VS2005 and later - IF(CMAKE_COMPILER_2005) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) - ENDIF(CMAKE_COMPILER_2005) -ENDIF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv|nmake)") -IF(CMAKE_BUILD_TOOL MATCHES "make") - IF(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") - ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") - IF(NOT CMAKE_C_FLAGS MATCHES "-Wall") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") - ENDIF(NOT CMAKE_C_FLAGS MATCHES "-Wall") -ENDIF(CMAKE_BUILD_TOOL MATCHES "make") - -SET(Poco_DIR ${PROJECT_SOURCE_DIR}) -FIND_PACKAGE(Poco REQUIRED) -IF(${Poco_FOUND}) - INCLUDE_DIRECTORIES(${Poco_INCLUDE_DIRS}) - LINK_DIRECTORIES(${Poco_LIBRARY_DIRS}) -ENDIF(WIN32) -ENDIF(${Poco_FOUND}) - -#----------------------------------------------------------------------------- -SET( EXE_NAME "${TARGET_BASE_NAME}" ) -# Add any source files here. -SET( EXE_SRCS - "My File.cpp" -) -# Add any include files here. -SET( EXE_INCS - "My File.h" -) - -#----------------------------------------------------------------------------- -# The executable. -ADD_EXECUTABLE(${EXE_NAME} ${EXE_SRCS} ${EXE_INCS}) - -TARGET_LINK_LIBRARIES ( ${EXE_NAME} - "optimized" CppUnit - "debug" CppUnitd - "optimized" PocoFoundation - "debug" PocoFoundationd - "optimized" PocoNet - "debug" PocoNetd - "optimized" PocoUtil - "debug" PocoUtild - "optimized" PocoXML - "debug" PocoXMLd -) - -# Copy the DLLS to where the executable is. -# Only do this if you haven't set your path to the Poco DLLs. -IF(WIN32) - SET ( DLL_FILES_DEBUG - ${Poco_BINARY_DIRS}/CppUnitd.dll - ${Poco_BINARY_DIRS}/PocoFoundationd.dll - ${Poco_BINARY_DIRS}/PocoNetd.dll - ${Poco_BINARY_DIRS}/PocoUtild.dll - ${Poco_BINARY_DIRS}/PocoXMLd.dll - ) - - SET ( DLL_FILES_RELEASE - ${Poco_BINARY_DIRS}/CppUnit.dll - ${Poco_BINARY_DIRS}/PocoFoundation.dll - ${Poco_BINARY_DIRS}/PocoNet.dll - ${Poco_BINARY_DIRS}/PocoUtil.dll - ${Poco_BINARY_DIRS}/PocoXML.dll - ) - - # Copy these files to the build tree. - ADD_CUSTOM_TARGET(CopyDll ALL echo "Copying dlls ...") - - FOREACH(file ${DLL_FILES_DEBUG}) - GET_FILENAME_COMPONENT(fn ${file} NAME) - SET(tgt ${EXECUTABLE_OUTPUT_PATH}/Debug/${fn}) - SET(src ${file}) - ADD_CUSTOM_COMMAND( - TARGET CopyDll - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different ${src} ${tgt} - COMMENT "Source copy of dlls" - ) - ENDFOREACH(file) - - FOREACH(file ${DLL_FILES_RELEASE}) - GET_FILENAME_COMPONENT(fn ${file} NAME) - SET(tgt ${EXECUTABLE_OUTPUT_PATH}/Release/${fn}) - SET(src ${file}) - ADD_CUSTOM_COMMAND( - TARGET CopyDll - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different ${src} ${tgt} - COMMENT "Source copy of dlls" - ) - ENDFOREACH(file) - -ENDIF(WIN32) - From 0b4d541b5bccfe9f92b99f92fa3575a80cb75d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A4us=20Mendel?= Date: Sun, 16 Dec 2012 14:30:52 -0200 Subject: [PATCH 108/165] Removed shotgun initialization from some variables Shotgun initialization is when a variable is initialized twice needlessly, leading to performance gaps and/or code inconsistency. --- Net/src/SMTPClientSession.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/Net/src/SMTPClientSession.cpp b/Net/src/SMTPClientSession.cpp index a6df7253c..f0f3067c8 100644 --- a/Net/src/SMTPClientSession.cpp +++ b/Net/src/SMTPClientSession.cpp @@ -148,10 +148,9 @@ void SMTPClientSession::loginUsingCRAMSHA1(const std::string& username, const st void SMTPClientSession::loginUsingCRAM(const std::string& username, const std::string& method, Poco::DigestEngine& hmac) { - int status = 0; std::string response; - - status = sendCommand(std::string("AUTH ") + method, response); + int status = sendCommand(std::string("AUTH ") + method, response); + if (!isPositiveIntermediate(status)) throw SMTPException(std::string("Cannot authenticate using ") + method, response, status); std::string challengeBase64 = response.substr(4); @@ -179,10 +178,8 @@ void SMTPClientSession::loginUsingCRAM(const std::string& username, const std::s void SMTPClientSession::loginUsingLogin(const std::string& username, const std::string& password) { - int status = 0; std::string response; - - status = sendCommand("AUTH LOGIN", response); + int status = sendCommand("AUTH LOGIN", response); if (!isPositiveIntermediate(status)) throw SMTPException("Cannot authenticate using LOGIN", response, status); std::ostringstream usernameBase64; @@ -231,15 +228,13 @@ void SMTPClientSession::loginUsingLogin(const std::string& username, const std:: void SMTPClientSession::loginUsingPlain(const std::string& username, const std::string& password) { - int status = 0; - std::string response; - std::ostringstream credentialsBase64; Base64Encoder credentialsEncoder(credentialsBase64); credentialsEncoder << username << '\0' << password; credentialsEncoder.close(); - status = sendCommand("AUTH PLAIN", credentialsBase64.str(), response); + std::string response; + int status = sendCommand("AUTH PLAIN", credentialsBase64.str(), response); if (!isPositiveCompletion(status)) throw SMTPException("Login using PLAIN failed", response, status); } @@ -381,15 +376,14 @@ void SMTPClientSession::sendMessage(const MailMessage& message, const Recipients void SMTPClientSession::transportMessage(const MailMessage& message) { - std::string response; - int status = 0; - SocketOutputStream socketStream(_socket); MailOutputStream mailStream(socketStream); message.write(mailStream); mailStream.close(); socketStream.flush(); - status = _socket.receiveStatusMessage(response); + + std::string response; + int status = _socket.receiveStatusMessage(response); if (!isPositiveCompletion(status)) throw SMTPException("The server rejected the message", response, status); } From 46cfdf70f0e25227c37d49bf0370d65f7821989a Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 16 Dec 2012 11:21:07 -0600 Subject: [PATCH 109/165] compiler detection macros --- Foundation/include/Poco/Platform.h | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h index a9faf2e16..84c085b0a 100644 --- a/Foundation/include/Poco/Platform.h +++ b/Foundation/include/Poco/Platform.h @@ -211,6 +211,37 @@ #endif +#if defined(_MSC_VER) + #define POCO_COMPILER_MSVC +#elif defined(__clang__) + #define POCO_COMPILER_CLANG +#elif defined (__GNUC__) + #define POCO_COMPILER_GCC +#elif defined (__MINGW32__) || defined (__MINGW64__) + #define POCO_COMPILER_MINGW +#elif defined (__INTEL_COMPILER) || defined(__ICC) || defined(__ECC) || defined(__ICL) + #define POCO_COMPILER_INTEL +#elif defined (__SUNPRO_CC) + #define POCO_COMPILER_SUN +#elif defined (__MWERKS__) || defined(__CWCC__) + #define POCO_COMPILER_CODEWARRIOR +#elif defined (__sgi) || defined(sgi) + #define POCO_COMPILER_SGI +#elif defined (__HP_aCC) + #define POCO_COMPILER_HP_ACC +#elif defined (__BORLANDC__) || defined(__CODEGEARC__) + #define POCO_COMPILER_CBUILDER +#elif defined (__DMC__) + #define POCO_COMPILER_DMARS +#elif defined (__HP_aCC) + #define POCO_COMPILER_HP_ACC +#elif (defined (__xlc__) || defined (__xlC__)) && defined(__IBMCPP__) + #define POCO_COMPILER_IBM_XLC // IBM XL C++ +#elif defined (__IBMCPP__) && defined(__COMPILER_VER__) + #define POCO_COMPILER_IBM_XLC_ZOS // IBM z/OS C++ +#endif + + #if !defined(POCO_ARCH) #error "Unknown Hardware Architecture." #endif From 19ef47474b36256de5cd3c4dd0c6ac229f5f38af Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 16 Dec 2012 13:52:29 -0600 Subject: [PATCH 110/165] silence deprecated iODBC warnings --- CONTRIBUTORS | 1 + Data/ODBC/ODBC.make | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 30956cf0f..a6436f7fd 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -29,6 +29,7 @@ Fabrizio Duhem Patrick White Mike Naquin Roger Meier +Mathaus Mendel -- $Id$ diff --git a/Data/ODBC/ODBC.make b/Data/ODBC/ODBC.make index 30eb5e371..bc24f7937 100644 --- a/Data/ODBC/ODBC.make +++ b/Data/ODBC/ODBC.make @@ -61,6 +61,10 @@ else ifeq (0, $(shell test -e $(POCO_ODBC_LIB)/libiodbc$(LIBLINKEXT); echo $$?)) SYSLIBS += -liodbc -liodbcinst COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc +# TODO: OSX >= 10.8 deprecated non-Unicode ODBC API functions, silence warnings until iODBC Unicode support +COMMONFLAGS += -Wno-deprecated-declarations + else $(error No ODBC library found. Please install unixODBC or iODBC or specify POCO_ODBC_LIB and try again) endif + From e75081af9493943d953d945a0f15e9e73923de42 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 16 Dec 2012 19:45:38 -0600 Subject: [PATCH 111/165] added Token::asInteger64(); ODBC tests fix for case-sensitive DB --- Data/MySQL/testsuite/src/SQLExecutor.cpp | 66 +++--- Data/ODBC/testsuite/src/SQLExecutor.cpp | 276 +++++++++++------------ Data/ODBC/testsuite/src/SQLExecutor.h | 4 +- Foundation/include/Poco/Token.h | 6 +- Foundation/src/Token.cpp | 11 +- JSON/src/Parser.cpp | 2 +- 6 files changed, 179 insertions(+), 186 deletions(-) diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index 73b7205c1..62b17fb09 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -1695,15 +1695,15 @@ void SQLExecutor::sessionTransaction(const std::string& connect) _pSession->begin(); assert (_pSession->isTransaction()); - try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { (*_pSession) << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (_pSession->isTransaction()); - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (0 == locCount); - try { (*_pSession) << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (2 == count); @@ -1711,31 +1711,31 @@ void SQLExecutor::sessionTransaction(const std::string& connect) _pSession->rollback(); assert (!_pSession->isTransaction()); - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (0 == locCount); - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (0 == count); assert (!_pSession->isTransaction()); _pSession->begin(); - try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { (*_pSession) << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (_pSession->isTransaction()); - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (0 == locCount); _pSession->commit(); assert (!_pSession->isTransaction()); - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (2 == locCount); - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (2 == count); @@ -1788,14 +1788,14 @@ void SQLExecutor::transaction(const std::string& connect) assert (trans.isActive()); assert (_pSession->isTransaction()); - try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { (*_pSession) << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (_pSession->isTransaction()); assert (trans.isActive()); - try { (*_pSession) << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (2 == count); @@ -1804,7 +1804,7 @@ void SQLExecutor::transaction(const std::string& connect) } assert (!_pSession->isTransaction()); - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (0 == count); @@ -1812,11 +1812,11 @@ void SQLExecutor::transaction(const std::string& connect) { Transaction trans((*_pSession)); - try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { (*_pSession) << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (0 == locCount); assert (_pSession->isTransaction()); @@ -1824,34 +1824,34 @@ void SQLExecutor::transaction(const std::string& connect) trans.commit(); assert (!_pSession->isTransaction()); assert (!trans.isActive()); - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (2 == locCount); } - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (2 == count); _pSession->begin(); - try { (*_pSession) << "DELETE FROM PERSON", now; } + try { (*_pSession) << "DELETE FROM Person", now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (2 == locCount); - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (0 == count); _pSession->commit(); - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (0 == locCount); - std::string sql1 = format("INSERT INTO PERSON VALUES ('%s','%s','%s',%d)", lastNames[0], firstNames[0], addresses[0], ages[0]); - std::string sql2 = format("INSERT INTO PERSON VALUES ('%s','%s','%s',%d)", lastNames[1], firstNames[1], addresses[1], ages[1]); + std::string sql1 = format("INSERT INTO Person VALUES ('%s','%s','%s',%d)", lastNames[0], firstNames[0], addresses[0], ages[0]); + std::string sql2 = format("INSERT INTO Person VALUES ('%s','%s','%s',%d)", lastNames[1], firstNames[1], addresses[1], ages[1]); std::vector sql; sql.push_back(sql1); sql.push_back(sql2); @@ -1859,35 +1859,35 @@ void SQLExecutor::transaction(const std::string& connect) Transaction trans((*_pSession)); trans.execute(sql1, false); - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (1 == count); trans.execute(sql2, false); - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (2 == count); - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (0 == locCount); trans.rollback(); - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (0 == locCount); - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (0 == count); trans.execute(sql); - local << "SELECT COUNT(*) FROM PERSON", into(locCount), now; + local << "SELECT COUNT(*) FROM Person", into(locCount), now; assert (2 == locCount); - try { (*_pSession) << "SELECT count(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (2 == count); @@ -1906,12 +1906,12 @@ void SQLExecutor::reconnect() int count = 0; std::string result; - try { (*_pSession) << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age), now; } + try { (*_pSession) << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } count = 0; - try { (*_pSession) << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (count == 1); @@ -1921,7 +1921,7 @@ void SQLExecutor::reconnect() assert (!_pSession->isConnected()); try { - (*_pSession) << "SELECT LastName FROM PERSON", into(result), now; + (*_pSession) << "SELECT LastName FROM Person", into(result), now; fail ("must fail"); } catch(NotConnectedException&){ } @@ -1929,7 +1929,7 @@ void SQLExecutor::reconnect() _pSession->open(); assert (_pSession->isConnected()); - try { (*_pSession) << "SELECT Age FROM PERSON", into(count), now; } + try { (*_pSession) << "SELECT Age FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assert (count == age); diff --git a/Data/ODBC/testsuite/src/SQLExecutor.cpp b/Data/ODBC/testsuite/src/SQLExecutor.cpp index 3202f395a..27a18532e 100644 --- a/Data/ODBC/testsuite/src/SQLExecutor.cpp +++ b/Data/ODBC/testsuite/src/SQLExecutor.cpp @@ -968,22 +968,22 @@ void SQLExecutor::simpleAccess() int count = 0; std::string result; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 1); - try { session() << "SELECT LastName FROM PERSON", into(result), now; } + try { session() << "SELECT LastName FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (lastName == result); - try { session() << "SELECT Age FROM PERSON", into(count), now; } + try { session() << "SELECT Age FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == age); @@ -996,22 +996,22 @@ void SQLExecutor::complexType() Person p1("LN1", "FN1", "ADDR1", 1); Person p2("LN2", "FN2", "ADDR2", 2); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(p1), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(p1), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(p2), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(p2), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); Person c1; - try { session() << "SELECT * FROM PERSON WHERE LastName = 'LN1'", into(c1), now; } + try { session() << "SELECT * FROM Person WHERE LastName = 'LN1'", into(c1), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (c1 == p1); @@ -1025,13 +1025,13 @@ void SQLExecutor::complexTypeTuple() Person p2("LN2", "FN2", "ADDR2", 2); Tuple t(p1,p2); - try { *_pSession << "INSERT INTO PERSON VALUES(?,?,?,?,?,?,?,?)", use(t), now; } + try { *_pSession << "INSERT INTO Person VALUES(?,?,?,?,?,?,?,?)", use(t), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } Tuple ret; assert (ret != t); - try { *_pSession << "SELECT * FROM PERSON", into(ret), now; } + try { *_pSession << "SELECT * FROM Person", into(ret), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (ret == t); @@ -1057,11 +1057,11 @@ void SQLExecutor::simpleAccessVector() int count = 0; std::string result; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); @@ -1070,7 +1070,7 @@ void SQLExecutor::simpleAccessVector() std::vector firstNamesR; std::vector addressesR; std::vector agesR; - try { session() << "SELECT * FROM PERSON", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } + try { session() << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (ages == agesR); @@ -1087,18 +1087,18 @@ void SQLExecutor::complexTypeVector() people.push_back(Person("LN1", "FN1", "ADDR1", 1)); people.push_back(Person("LN2", "FN2", "ADDR2", 2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); std::vector result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result == people); @@ -1112,18 +1112,18 @@ void SQLExecutor::sharedPtrComplexTypeVector() people.push_back(new Person("LN1", "FN1", "ADDR1", 1)); people.push_back(new Person("LN2", "FN2", "ADDR2", 2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); std::vector result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (2 == result.size()); @@ -1139,18 +1139,18 @@ void SQLExecutor::autoPtrComplexTypeVector() people.push_back(new RefCountedPerson("LN1", "FN1", "ADDR1", 1)); people.push_back(new RefCountedPerson("LN2", "FN2", "ADDR2", 2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); std::vector result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (2 == result.size()); @@ -1233,11 +1233,11 @@ void SQLExecutor::simpleAccessList() int count = 0; std::string result; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); @@ -1246,7 +1246,7 @@ void SQLExecutor::simpleAccessList() std::list firstNamesR; std::list addressesR; std::list agesR; - try { session() << "SELECT * FROM PERSON", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } + try { session() << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (ages == agesR); @@ -1263,18 +1263,18 @@ void SQLExecutor::complexTypeList() people.push_back(Person("LN1", "FN1", "ADDR1", 1)); people.push_back(Person("LN2", "FN2", "ADDR2", 2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); std::list result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result == people); @@ -1349,11 +1349,11 @@ void SQLExecutor::simpleAccessDeque() int count = 0; std::string result; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); @@ -1362,7 +1362,7 @@ void SQLExecutor::simpleAccessDeque() std::deque firstNamesR; std::deque addressesR; std::deque agesR; - try { session() << "SELECT * FROM PERSON", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } + try { session() << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (ages == agesR); @@ -1379,18 +1379,18 @@ void SQLExecutor::complexTypeDeque() people.push_back(Person("LN1", "FN1", "ADDR1", 1)); people.push_back(Person("LN2", "FN2", "ADDR2", 2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); std::deque result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result == people); @@ -1847,10 +1847,10 @@ void SQLExecutor::setSimple() int count = 0; std::string result; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); @@ -1859,7 +1859,7 @@ void SQLExecutor::setSimple() std::set firstNamesR; std::set addressesR; std::set agesR; - try { session() << "SELECT * FROM PERSON", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } + try { session() << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (ages == agesR); @@ -1876,17 +1876,17 @@ void SQLExecutor::setComplex() people.insert(Person("LN1", "FN1", "ADDR1", 1)); people.insert(Person("LN2", "FN2", "ADDR2", 2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); std::set result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result == people); @@ -1905,17 +1905,17 @@ void SQLExecutor::setComplexUnique() Person p2("LN2", "FN2", "ADDR2", 2); people.push_back(p2); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 5); std::set result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result.size() == 2); @@ -1942,10 +1942,10 @@ void SQLExecutor::multiSetSimple() int count = 0; std::string result; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); @@ -1954,7 +1954,7 @@ void SQLExecutor::multiSetSimple() std::multiset firstNamesR; std::multiset addressesR; std::multiset agesR; - try { session() << "SELECT * FROM PERSON", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } + try { session() << "SELECT * FROM Person", into(lastNamesR), into(firstNamesR), into(addressesR), into(agesR), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (ages.size() == agesR.size()); @@ -1976,17 +1976,17 @@ void SQLExecutor::multiSetComplex() Person p2("LN2", "FN2", "ADDR2", 2); people.insert(p2); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 5); std::multiset result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result.size() == people.size()); @@ -2002,17 +2002,17 @@ void SQLExecutor::mapComplex() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN2", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); std::map result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result == people); @@ -2031,17 +2031,17 @@ void SQLExecutor::mapComplexUnique() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN2", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 5); std::map result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result.size() == 2); @@ -2060,17 +2060,17 @@ void SQLExecutor::multiMapComplex() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN2", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 5); std::multimap result; - try { session() << "SELECT * FROM PERSON", into(result), now; } + try { session() << "SELECT * FROM Person", into(result), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result.size() == people.size()); @@ -2086,16 +2086,16 @@ void SQLExecutor::selectIntoSingle() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN2", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); Person result; - try { session() << "SELECT * FROM PERSON ORDER BY LastName", into(result), limit(1), now; }// will return 1 object into one single result + try { session() << "SELECT * FROM Person ORDER BY LastName", into(result), limit(1), now; }// will return 1 object into one single result catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result == p1); @@ -2111,17 +2111,17 @@ void SQLExecutor::selectIntoSingleStep() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN2", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); Person result; - Statement stmt = (session() << "SELECT * FROM PERSON", into(result), limit(1)); + Statement stmt = (session() << "SELECT * FROM Person", into(result), limit(1)); stmt.execute(); assert (result == p1); assert (!stmt.done()); @@ -2140,18 +2140,18 @@ void SQLExecutor::selectIntoSingleFail() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN2", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), limit(2, true), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), limit(2, true), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); Person result; try { - session() << "SELECT * FROM PERSON", into(result), limit(1, true), now; // will fail now + session() << "SELECT * FROM Person", into(result), limit(1, true), now; // will fail now fail("hardLimit is set: must fail"); } catch(Poco::Data::LimitException&) @@ -2169,19 +2169,19 @@ void SQLExecutor::lowerLimitOk() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN1", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); Person result; try { - session() << "SELECT * FROM PERSON", into(result), lowerLimit(2), now; // will return 2 objects into one single result but only room for one! + session() << "SELECT * FROM Person", into(result), lowerLimit(2), now; // will return 2 objects into one single result but only room for one! fail("Not enough space for results"); } catch(Poco::Exception&) @@ -2199,17 +2199,17 @@ void SQLExecutor::singleSelect() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN1", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); Person result; - Statement stmt = (session() << "SELECT * FROM PERSON", into(result), limit(1)); + Statement stmt = (session() << "SELECT * FROM Person", into(result), limit(1)); stmt.execute(); assert (result == p1); assert (!stmt.done()); @@ -2228,18 +2228,18 @@ void SQLExecutor::lowerLimitFail() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN1", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); Person result; try { - session() << "SELECT * FROM PERSON", into(result), lowerLimit(3), now; // will fail + session() << "SELECT * FROM Person", into(result), lowerLimit(3), now; // will fail fail("should fail. not enough data"); } catch(Poco::Exception&) @@ -2257,16 +2257,16 @@ void SQLExecutor::combinedLimits() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN1", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); std::vector result; - try { session() << "SELECT * FROM PERSON", into(result), lowerLimit(2), upperLimit(2), now; }// will return 2 objects + try { session() << "SELECT * FROM Person", into(result), lowerLimit(2), upperLimit(2), now; }// will return 2 objects catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result.size() == 2); @@ -2285,16 +2285,16 @@ void SQLExecutor::ranges() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN1", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); std::vector result; - try { session() << "SELECT * FROM PERSON", into(result), range(2, 2), now; }// will return 2 objects + try { session() << "SELECT * FROM Person", into(result), range(2, 2), now; }// will return 2 objects catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (result.size() == 2); @@ -2312,18 +2312,18 @@ void SQLExecutor::combinedIllegalLimits() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN1", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); Person result; try { - session() << "SELECT * FROM PERSON", into(result), lowerLimit(3), upperLimit(2), now; + session() << "SELECT * FROM Person", into(result), lowerLimit(3), upperLimit(2), now; fail("lower > upper is not allowed"); } catch(LimitException&) @@ -2341,18 +2341,18 @@ void SQLExecutor::illegalRange() people.insert(std::make_pair("LN1", p1)); people.insert(std::make_pair("LN1", p2)); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(people), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(people), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 2); Person result; try { - session() << "SELECT * FROM PERSON", into(result), range(3, 2), now; + session() << "SELECT * FROM Person", into(result), range(3, 2), now; fail("lower > upper is not allowed"); } catch(LimitException&) @@ -2365,13 +2365,13 @@ void SQLExecutor::emptyDB() { std::string funct = "emptyDB()"; int count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 0); Person result; - Statement stmt = (session() << "SELECT * FROM PERSON", into(result), limit(1)); + Statement stmt = (session() << "SELECT * FROM Person", into(result), limit(1)); stmt.execute(); assert (result.firstName.empty()); assert (stmt.done()); @@ -2391,7 +2391,7 @@ void SQLExecutor::blob(int bigSize, const std::string& blobPlaceholder) use(lastName), use(firstName), use(address), use(img), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 1); @@ -2409,7 +2409,7 @@ void SQLExecutor::blob(int bigSize, const std::string& blobPlaceholder) assert (big.size() == bigSize); - try { session() << "DELETE FROM PERSON", now; } + try { session() << "DELETE FROM Person", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } @@ -2434,9 +2434,9 @@ void SQLExecutor::blobStmt() CLOB blob("0123456789", 10); int count = 0; - Statement ins = (session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(blob)); + Statement ins = (session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(blob)); ins.execute(); - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 1); @@ -2460,10 +2460,10 @@ void SQLExecutor::dateTime() DateTime born(1965, 6, 18, 5, 35, 1); int count = 0; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(born), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(born), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 1); @@ -2491,7 +2491,7 @@ void SQLExecutor::date() Date bornDate(1965, 6, 18); int count = 0; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), @@ -2499,7 +2499,7 @@ void SQLExecutor::date() now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 1); @@ -2530,7 +2530,7 @@ void SQLExecutor::time() Time bornTime (5, 35, 1); int count = 0; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), @@ -2538,7 +2538,7 @@ void SQLExecutor::time() now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 1); @@ -3510,14 +3510,14 @@ void SQLExecutor::sessionTransaction(const std::string& connect) session().begin(); assert (session().isTransaction()); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (session().isTransaction()); - Statement stmt = (local << "SELECT COUNT(*) FROM PERSON", into(locCount), async, now); + Statement stmt = (local << "SELECT COUNT(*) FROM Person", into(locCount), async, now); - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (2 == count); @@ -3528,19 +3528,19 @@ void SQLExecutor::sessionTransaction(const std::string& connect) stmt.wait(); assert (0 == locCount); - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (0 == count); assert (!session().isTransaction()); session().begin(); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (session().isTransaction()); - Statement stmt1 = (local << "SELECT COUNT(*) FROM PERSON", into(locCount), async, now); + Statement stmt1 = (local << "SELECT COUNT(*) FROM Person", into(locCount), async, now); session().commit(); assert (!session().isTransaction()); @@ -3548,7 +3548,7 @@ void SQLExecutor::sessionTransaction(const std::string& connect) stmt1.wait(); assert (2 == locCount); - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (2 == count); @@ -3604,14 +3604,14 @@ void SQLExecutor::transaction(const std::string& connect) assert (trans.isActive()); assert (session().isTransaction()); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (session().isTransaction()); assert (trans.isActive()); - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (2 == count); @@ -3620,7 +3620,7 @@ void SQLExecutor::transaction(const std::string& connect) } assert (!session().isTransaction()); - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (0 == count); @@ -3628,11 +3628,11 @@ void SQLExecutor::transaction(const std::string& connect) { Transaction trans(session()); - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - Statement stmt1 = (local << "SELECT COUNT(*) FROM PERSON", into(locCount), async, now); + Statement stmt1 = (local << "SELECT COUNT(*) FROM Person", into(locCount), async, now); assert (session().isTransaction()); assert (trans.isActive()); @@ -3644,18 +3644,18 @@ void SQLExecutor::transaction(const std::string& connect) assert (2 == locCount); } - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (2 == count); - try { session() << "DELETE FROM PERSON", now; } + try { session() << "DELETE FROM Person", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - Statement stmt1 = (local << "SELECT count(*) FROM PERSON", into(locCount), async, now); + Statement stmt1 = (local << "SELECT count(*) FROM Person", into(locCount), async, now); - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (0 == count); @@ -3671,12 +3671,12 @@ void SQLExecutor::transaction(const std::string& connect) if (local.getTransactionIsolation() == Session::TRANSACTION_READ_COMMITTED) { stmt1.wait(); - local << "SELECT count(*) FROM PERSON", into(locCount), now; + local << "SELECT count(*) FROM Person", into(locCount), now; assert (0 == locCount); } - std::string sql1 = format("INSERT INTO PERSON VALUES ('%s','%s','%s',%d)", lastNames[0], firstNames[0], addresses[0], ages[0]); - std::string sql2 = format("INSERT INTO PERSON VALUES ('%s','%s','%s',%d)", lastNames[1], firstNames[1], addresses[1], ages[1]); + std::string sql1 = format("INSERT INTO Person VALUES ('%s','%s','%s',%d)", lastNames[0], firstNames[0], addresses[0], ages[0]); + std::string sql2 = format("INSERT INTO Person VALUES ('%s','%s','%s',%d)", lastNames[1], firstNames[1], addresses[1], ages[1]); std::vector sql; sql.push_back(sql1); sql.push_back(sql2); @@ -3684,34 +3684,34 @@ void SQLExecutor::transaction(const std::string& connect) Transaction trans(session()); trans.execute(sql1, false); - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (1 == count); trans.execute(sql2, false); - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (2 == count); - Statement stmt2 = (local << "SELECT COUNT(*) FROM PERSON", into(locCount), async, now); + Statement stmt2 = (local << "SELECT COUNT(*) FROM Person", into(locCount), async, now); trans.rollback(); stmt2.wait(); assert (0 == locCount); - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (0 == count); trans.execute(sql); - Statement stmt3 = (local << "SELECT COUNT(*) FROM PERSON", into(locCount), now); + Statement stmt3 = (local << "SELECT COUNT(*) FROM Person", into(locCount), now); assert (2 == locCount); - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (2 == count); @@ -3724,7 +3724,7 @@ struct TestCommitTransactor { void operator () (Session& session) const { - session << "INSERT INTO PERSON VALUES ('lastName','firstName','address',10)", now; + session << "INSERT INTO Person VALUES ('lastName','firstName','address',10)", now; } }; @@ -3733,7 +3733,7 @@ struct TestRollbackTransactor { void operator () (Session& session) const { - session << "INSERT INTO PERSON VALUES ('lastName','firstName','address',10)", now; + session << "INSERT INTO Person VALUES ('lastName','firstName','address',10)", now; throw Poco::Exception("test"); } }; @@ -3751,16 +3751,16 @@ void SQLExecutor::transactor() TestCommitTransactor ct; Transaction t1(session(), ct); - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (1 == count); - try { session() << "DELETE FROM PERSON", now; session().commit();} + try { session() << "DELETE FROM Person", now; session().commit();} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (0 == count); @@ -3772,7 +3772,7 @@ void SQLExecutor::transactor() fail ("must fail"); } catch (Poco::Exception&) { } - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (0 == count); @@ -3785,7 +3785,7 @@ void SQLExecutor::transactor() fail ("must fail"); } catch (Poco::Exception&) { } - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (0 == count); @@ -3798,7 +3798,7 @@ void SQLExecutor::transactor() fail ("must fail"); } catch (Poco::Exception&) { } - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (0 == count); @@ -3811,7 +3811,7 @@ void SQLExecutor::transactor() fail ("must fail"); } catch (Poco::Exception&) { } - try { session() << "SELECT count(*) FROM PERSON", into(count), now; } + try { session() << "SELECT count(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (0 == count); @@ -3880,12 +3880,12 @@ void SQLExecutor::reconnect() int count = 0; std::string result; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } count = 0; - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == 1); @@ -3895,7 +3895,7 @@ void SQLExecutor::reconnect() assert (!session().isConnected()); try { - session() << "SELECT LastName FROM PERSON", into(result), now; + session() << "SELECT LastName FROM Person", into(result), now; fail ("must fail"); } catch(NotConnectedException&){ } @@ -3903,7 +3903,7 @@ void SQLExecutor::reconnect() session().open(); assert (session().isConnected()); - try { session() << "SELECT Age FROM PERSON", into(count), now; } + try { session() << "SELECT Age FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == age); diff --git a/Data/ODBC/testsuite/src/SQLExecutor.h b/Data/ODBC/testsuite/src/SQLExecutor.h index 1a76858f2..1bdec261c 100644 --- a/Data/ODBC/testsuite/src/SQLExecutor.h +++ b/Data/ODBC/testsuite/src/SQLExecutor.h @@ -467,10 +467,10 @@ public: C1 address(size, "Address"); C2 img(size, CLOB("0123456789", 10)); int count = 0; - try { session() << "INSERT INTO PERSON VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(img), now; } + try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(img), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } - try { session() << "SELECT COUNT(*) FROM PERSON", into(count), now; } + try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); } assert (count == size); diff --git a/Foundation/include/Poco/Token.h b/Foundation/include/Poco/Token.h index dea7faa1b..fa99385d9 100644 --- a/Foundation/include/Poco/Token.h +++ b/Foundation/include/Poco/Token.h @@ -106,12 +106,12 @@ public: /// Returns a string representation of the token. #if defined(POCO_HAVE_INT64) - virtual Int64 asInteger() const; + virtual Int64 asInteger64() const; /// Returns a 64-bit integer representation of the token. -#else +#endif + virtual int asInteger() const; /// Returns an integer representation of the token. -#endif virtual double asFloat() const; /// Returns a floating-point representation of the token. diff --git a/Foundation/src/Token.cpp b/Foundation/src/Token.cpp index d63386958..d8ac16047 100644 --- a/Foundation/src/Token.cpp +++ b/Foundation/src/Token.cpp @@ -77,15 +77,11 @@ std::string Token::asString() const #if defined(POCO_HAVE_INT64) - - -Int64 Token::asInteger() const +Int64 Token::asInteger64() const { return NumberParser::parse64(_value); } - - -#else +#endif int Token::asInteger() const @@ -94,9 +90,6 @@ int Token::asInteger() const } -#endif - - double Token::asFloat() const { return NumberParser::parseFloat(_value); diff --git a/JSON/src/Parser.cpp b/JSON/src/Parser.cpp index 99aeb413a..54fe97239 100644 --- a/JSON/src/Parser.cpp +++ b/JSON/src/Parser.cpp @@ -576,7 +576,7 @@ void Parser::readValue(const Token* token) if ( _handler != NULL ) { #if defined(POCO_HAVE_INT64) - Int64 value = token->asInteger(); + Int64 value = token->asInteger64(); // if number is 32-bit, then handle as such if ( value > std::numeric_limits::max() || value < std::numeric_limits::min() ) From 7e1374a004b3157e298f9302742fbe0d979312bf Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 16 Dec 2012 22:06:03 -0600 Subject: [PATCH 112/165] remove unecessary toLower() make SessionFactory map keys case insensitive nad remove unnecessary toLower() calls --- Data/ODBC/src/SessionImpl.cpp | 4 ++-- Data/SQLite/src/SessionImpl.cpp | 2 +- Data/include/Poco/Data/SessionFactory.h | 14 ++++++++++++-- Data/include/Poco/Data/SessionImpl.h | 2 +- Data/include/Poco/Data/TypeHandler.h | 2 +- Data/samples/RowFormatter/src/RowFormatter.cpp | 12 ++++++------ Data/src/SessionFactory.cpp | 6 +++--- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/Data/ODBC/src/SessionImpl.cpp b/Data/ODBC/src/SessionImpl.cpp index a7b743d2d..74a82957b 100644 --- a/Data/ODBC/src/SessionImpl.cpp +++ b/Data/ODBC/src/SessionImpl.cpp @@ -55,7 +55,7 @@ SessionImpl::SessionImpl(const std::string& connect, bool autoBind, bool autoExtract): Poco::Data::AbstractSessionImpl(connect, loginTimeout), - _connector(toLower(Connector::KEY)), + _connector(Connector::KEY), _maxFieldSize(maxFieldSize), _autoBind(autoBind), _autoExtract(autoExtract), @@ -73,7 +73,7 @@ SessionImpl::SessionImpl(const std::string& connect, bool enforceCapability, bool autoBind, bool autoExtract): Poco::Data::AbstractSessionImpl(connect), - _connector(toLower(Connector::KEY)), + _connector(Connector::KEY), _maxFieldSize(maxFieldSize), _autoBind(autoBind), _autoExtract(autoExtract), diff --git a/Data/SQLite/src/SessionImpl.cpp b/Data/SQLite/src/SessionImpl.cpp index 07252d0cf..91bbb0029 100644 --- a/Data/SQLite/src/SessionImpl.cpp +++ b/Data/SQLite/src/SessionImpl.cpp @@ -60,7 +60,7 @@ const std::string SessionImpl::ABORT_TRANSACTION("ROLLBACK"); SessionImpl::SessionImpl(const std::string& fileName, std::size_t loginTimeout): Poco::Data::AbstractSessionImpl(fileName, loginTimeout), - _connector(toLower(Connector::KEY)), + _connector(Connector::KEY), _pDB(0), _connected(false), _isTransaction(false) diff --git a/Data/include/Poco/Data/SessionFactory.h b/Data/include/Poco/Data/SessionFactory.h index c546f2391..680ebe008 100644 --- a/Data/include/Poco/Data/SessionFactory.h +++ b/Data/include/Poco/Data/SessionFactory.h @@ -45,6 +45,7 @@ #include "Poco/Data/Session.h" #include "Poco/Mutex.h" #include "Poco/SharedPtr.h" +#include "Poco/String.h" #include @@ -71,6 +72,7 @@ class Data_API SessionFactory /// Session ses("SQLite", "dummy.db"); { public: + static SessionFactory& instance(); /// returns the static instance of the singleton. @@ -92,7 +94,7 @@ public: Session create(const std::string& uri, std::size_t timeout = Session::LOGIN_TIMEOUT_DEFAULT); /// Creates a Session for the given URI (must be in key:///connectionString format). - /// Throws an Poco:Data::UnknownDataBaseException if no Connector is registered for the key. + /// Throws a Poco:Data::UnknownDataBaseException if no Connector is registered for the key. private: SessionFactory(); @@ -107,7 +109,15 @@ private: SessionInfo(Connector* pSI); }; - typedef std::map Connectors; + struct ILT + { + bool operator() (const std::string& s1, const std::string& s2) const + { + return Poco::icompare(s1, s2) < 0; + } + }; + + typedef std::map Connectors; Connectors _connectors; Poco::FastMutex _mutex; }; diff --git a/Data/include/Poco/Data/SessionImpl.h b/Data/include/Poco/Data/SessionImpl.h index 81c515474..292d01305 100644 --- a/Data/include/Poco/Data/SessionImpl.h +++ b/Data/include/Poco/Data/SessionImpl.h @@ -227,7 +227,7 @@ inline std::size_t SessionImpl::getLoginTimeout() const inline std::string SessionImpl::uri(const std::string& connector, const std::string& connectionString) { - return format("%s:///%s", toLower(connector), connectionString); + return format("%s:///%s", connector, connectionString); } diff --git a/Data/include/Poco/Data/TypeHandler.h b/Data/include/Poco/Data/TypeHandler.h index 3a94b6352..c3e5032bf 100644 --- a/Data/include/Poco/Data/TypeHandler.h +++ b/Data/include/Poco/Data/TypeHandler.h @@ -103,7 +103,7 @@ class TypeHandler: public AbstractTypeHandler /// poco_assert_dbg (pBinder != 0); /// TypeHandler::bind(pos++, obj.getLastName(), pBinder, dir); /// TypeHandler::bind(pos++, obj.getFirstName(), pBinder, dir); - /// TypeHandler::bind(pos++, obj.getAge(), pBinder); + /// TypeHandler::bind(pos++, obj.getAge(), pBinder, dir); /// } /// /// static void prepare(std::size_t pos, const Person& obj, AbstractPreparator* pPreparator) diff --git a/Data/samples/RowFormatter/src/RowFormatter.cpp b/Data/samples/RowFormatter/src/RowFormatter.cpp index f2b93cb19..37da2ac10 100644 --- a/Data/samples/RowFormatter/src/RowFormatter.cpp +++ b/Data/samples/RowFormatter/src/RowFormatter.cpp @@ -118,12 +118,12 @@ int main(int argc, char** argv) // insert some rows DateTime hd(1956, 3, 1); session << "INSERT INTO Simpsons VALUES('Homer Simpson', 'Springfield', 42, ?)", use(hd), now; - DateTime md(1954, 10, 1); - session << "INSERT INTO Simpsons VALUES('Marge Simpson', 'Springfield', 38, ?)", use(md), now; - DateTime bd(1980, 4, 1); - session << "INSERT INTO Simpsons VALUES('Bart Simpson', 'Springfield', 12, ?)", use(bd), now; - DateTime ld(1982, 5, 9); - session << "INSERT INTO Simpsons VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(ld), now; + hd.assign(1954, 10, 1); + session << "INSERT INTO Simpsons VALUES('Marge Simpson', 'Springfield', 38, ?)", use(hd), now; + hd.assign(1980, 4, 1); + session << "INSERT INTO Simpsons VALUES('Bart Simpson', 'Springfield', 12, ?)", use(hd), now; + hd.assign(1982, 5, 9); + session << "INSERT INTO Simpsons VALUES('Lisa Simpson', 'Springfield', 10, ?)", use(hd), now; // create a statement and print the column names and data as HTML table HTMLTableFormatter tf; diff --git a/Data/src/SessionFactory.cpp b/Data/src/SessionFactory.cpp index 23fa393ed..b957bef04 100644 --- a/Data/src/SessionFactory.cpp +++ b/Data/src/SessionFactory.cpp @@ -65,7 +65,7 @@ void SessionFactory::add(Connector* pIn) Poco::FastMutex::ScopedLock lock(_mutex); SessionInfo info(pIn); std::pair res = - _connectors.insert(std::make_pair(toLower(pIn->name()), info)); + _connectors.insert(std::make_pair(pIn->name(), info)); if (!res.second) res.first->second.cnt++; } @@ -73,7 +73,7 @@ void SessionFactory::add(Connector* pIn) void SessionFactory::remove(const std::string& key) { Poco::FastMutex::ScopedLock lock(_mutex); - Connectors::iterator it = _connectors.find(toLower(key)); + Connectors::iterator it = _connectors.find(key); poco_assert (_connectors.end() != it); --(it->second.cnt); @@ -86,7 +86,7 @@ Session SessionFactory::create(const std::string& key, std::size_t timeout) { Poco::FastMutex::ScopedLock lock(_mutex); - Connectors::iterator it = _connectors.find(toLower(key)); + Connectors::iterator it = _connectors.find(key); poco_assert (_connectors.end() != it); return Session(it->second.ptrSI->createSession(connectionString, timeout)); From 634132455b86e6bacce01ce69f2da7b1dd581b59 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 16 Dec 2012 22:41:41 -0600 Subject: [PATCH 113/165] remove bad char at file beginning --- Foundation/testsuite/src/StringTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index 0e61197ae..c04374ce4 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -1,4 +1,4 @@ -// +// // StringTest.cpp // // $Id: //poco/1.4/Foundation/testsuite/src/StringTest.cpp#1 $ From 52bbcfc9c279893681ab5120214317977ba503a3 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 16 Dec 2012 22:55:16 -0600 Subject: [PATCH 114/165] update version numbers --- Foundation/include/Poco/Version.h | 2 +- VERSION | 2 +- libversion | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Foundation/include/Poco/Version.h b/Foundation/include/Poco/Version.h index b8433080a..2b3ea9b5e 100644 --- a/Foundation/include/Poco/Version.h +++ b/Foundation/include/Poco/Version.h @@ -54,7 +54,7 @@ // Ax are alpha releases // Bx are beta releases // -#define POCO_VERSION 0x01050000 +#define POCO_VERSION 0x010501D0 #endif // Foundation_Version_INCLUDED diff --git a/VERSION b/VERSION index 3e1ad720b..8e03717dc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.0 \ No newline at end of file +1.5.1 \ No newline at end of file diff --git a/libversion b/libversion index 209e3ef4b..aabe6ec39 100644 --- a/libversion +++ b/libversion @@ -1 +1 @@ -20 +21 From b38e5bf3df98f51b9660013f341bd3288a044518 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 16 Dec 2012 23:56:33 -0600 Subject: [PATCH 115/165] replaced spaces with tab --- Data/ODBC/testsuite/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/ODBC/testsuite/Makefile b/Data/ODBC/testsuite/Makefile index 2fe7e4340..abe9b085b 100644 --- a/Data/ODBC/testsuite/Makefile +++ b/Data/ODBC/testsuite/Makefile @@ -30,7 +30,7 @@ objects = ODBCTestSuite Driver \ ODBCSQLiteTest ODBCSQLServerTest ODBCTest SQLExecutor ifeq ($(POCO_CONFIG),MinGW) - objects += ODBCAccessTest + objects += ODBCAccessTest endif target = testrunner From 8fe3a398afb0ec35b6aa23c6dbd34b1c8eb79b7d Mon Sep 17 00:00:00 2001 From: aleks-f Date: Wed, 19 Dec 2012 00:38:18 -0600 Subject: [PATCH 116/165] Net Windows automatic (un)initialize automatic network (un)initialization on windows NumericString 64-bit compile/warning fixes --- Foundation/include/Poco/NumericString.h | 12 +-- Foundation/src/NumberFormatter.cpp | 60 ++++++------ Foundation/src/NumericString.cpp | 4 +- Foundation/src/StringTokenizer.cpp | 2 +- Net/Net_CE_vs90.vcproj | 2 + Net/Net_vs100.vcxproj | 1 + Net/Net_vs100.vcxproj.filters | 3 + Net/Net_vs110.vcxproj | 1 + Net/Net_vs110.vcxproj.filters | 3 + Net/Net_vs71.vcproj | 2 + Net/Net_vs80.vcproj | 2 + Net/Net_vs90.vcproj | 2 + Net/Net_x64_vs100.vcxproj | 1 + Net/Net_x64_vs100.vcxproj.filters | 3 + Net/Net_x64_vs110.vcxproj | 1 + Net/Net_x64_vs110.vcxproj.filters | 3 + Net/Net_x64_vs90.vcproj | 2 + Net/include/Poco/Net/Net.h | 44 +++++---- Net/src/DNS.cpp | 28 ------ Net/src/IPAddress.cpp | 6 -- Net/src/Net.cpp | 117 ++++++++++++++++++++++++ Net/src/SocketAddress.cpp | 6 -- Net/src/SocketImpl.cpp | 9 -- 23 files changed, 207 insertions(+), 107 deletions(-) create mode 100644 Net/src/Net.cpp diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h index ddc006718..e12e26d31 100644 --- a/Foundation/include/Poco/NumericString.h +++ b/Foundation/include/Poco/NumericString.h @@ -221,7 +221,7 @@ namespace Impl { /// Class ensures increment/decrement remain within boundaries. { public: - Ptr(char* ptr, unsigned offset): _beg(ptr), _cur(ptr), _end(ptr + offset) + Ptr(char* ptr, std::size_t offset): _beg(ptr), _cur(ptr), _end(ptr + offset) { } @@ -268,7 +268,7 @@ namespace Impl { return _cur; } - unsigned span() const + std::size_t span() const { return _end - _beg; } @@ -291,7 +291,7 @@ template bool intToStr(T value, unsigned short base, char* result, - unsigned& size, + std::size_t& size, bool prefix = false, int width = -1, char fill = ' ', @@ -369,7 +369,7 @@ template bool uIntToStr(T value, unsigned short base, char* result, - unsigned& size, + std::size_t& size, bool prefix = false, int width = -1, char fill = ' ', @@ -446,7 +446,7 @@ bool intToStr (T number, unsigned short base, std::string& result, bool prefix = /// bool intToStr(T, unsigned short, char*, int, int, char, char) implementation. { char res[POCO_MAX_INT_STRING_LEN] = {0}; - unsigned size = POCO_MAX_INT_STRING_LEN; + std::size_t size = POCO_MAX_INT_STRING_LEN; bool ret = intToStr(number, base, res, size, prefix, width, fill, thSep); result.assign(res, size); return ret; @@ -459,7 +459,7 @@ bool uIntToStr (T number, unsigned short base, std::string& result, bool prefix /// bool uIntToStr(T, unsigned short, char*, int, int, char, char) implementation. { char res[POCO_MAX_INT_STRING_LEN] = {0}; - unsigned size = POCO_MAX_INT_STRING_LEN; + std::size_t size = POCO_MAX_INT_STRING_LEN; bool ret = uIntToStr(number, base, res, size, prefix, width, fill, thSep); result.assign(res, size); return ret; diff --git a/Foundation/src/NumberFormatter.cpp b/Foundation/src/NumberFormatter.cpp index d736adfc0..44ba0db1d 100644 --- a/Foundation/src/NumberFormatter.cpp +++ b/Foundation/src/NumberFormatter.cpp @@ -79,7 +79,7 @@ std::string NumberFormatter::format(bool value, BoolFormat format) void NumberFormatter::append(std::string& str, int value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz); str.append(result, sz); } @@ -88,7 +88,7 @@ void NumberFormatter::append(std::string& str, int value) void NumberFormatter::append(std::string& str, int value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width); str.append(result, sz); } @@ -97,7 +97,7 @@ void NumberFormatter::append(std::string& str, int value, int width) void NumberFormatter::append0(std::string& str, int value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -106,7 +106,7 @@ void NumberFormatter::append0(std::string& str, int value, int width) void NumberFormatter::appendHex(std::string& str, int value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(static_cast(value), 0x10, result, sz); str.append(result, sz); } @@ -115,7 +115,7 @@ void NumberFormatter::appendHex(std::string& str, int value) void NumberFormatter::appendHex(std::string& str, int value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(static_cast(value), 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -124,7 +124,7 @@ void NumberFormatter::appendHex(std::string& str, int value, int width) void NumberFormatter::append(std::string& str, unsigned value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 10, result, sz); str.append(result, sz); } @@ -133,7 +133,7 @@ void NumberFormatter::append(std::string& str, unsigned value) void NumberFormatter::append(std::string& str, unsigned value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 10, result, sz, false, width); str.append(result, sz); } @@ -142,7 +142,7 @@ void NumberFormatter::append(std::string& str, unsigned value, int width) void NumberFormatter::append0(std::string& str, unsigned int value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -151,7 +151,7 @@ void NumberFormatter::append0(std::string& str, unsigned int value, int width) void NumberFormatter::appendHex(std::string& str, unsigned value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -160,7 +160,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned value) void NumberFormatter::appendHex(std::string& str, unsigned value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -169,7 +169,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned value, int width) void NumberFormatter::append(std::string& str, long value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz); str.append(result, sz); } @@ -178,7 +178,7 @@ void NumberFormatter::append(std::string& str, long value) void NumberFormatter::append(std::string& str, long value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width); str.append(result, sz); } @@ -187,7 +187,7 @@ void NumberFormatter::append(std::string& str, long value, int width) void NumberFormatter::append0(std::string& str, long value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -196,7 +196,7 @@ void NumberFormatter::append0(std::string& str, long value, int width) void NumberFormatter::appendHex(std::string& str, long value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(static_cast(value), 0x10, result, sz); str.append(result, sz); } @@ -205,7 +205,7 @@ void NumberFormatter::appendHex(std::string& str, long value) void NumberFormatter::appendHex(std::string& str, long value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(static_cast(value), 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -214,7 +214,7 @@ void NumberFormatter::appendHex(std::string& str, long value, int width) void NumberFormatter::append(std::string& str, unsigned long value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 10, result, sz); str.append(result, sz); } @@ -223,7 +223,7 @@ void NumberFormatter::append(std::string& str, unsigned long value) void NumberFormatter::append(std::string& str, unsigned long value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -232,7 +232,7 @@ void NumberFormatter::append(std::string& str, unsigned long value, int width) void NumberFormatter::append0(std::string& str, unsigned long value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -241,7 +241,7 @@ void NumberFormatter::append0(std::string& str, unsigned long value, int width) void NumberFormatter::appendHex(std::string& str, unsigned long value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -250,7 +250,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned long value) void NumberFormatter::appendHex(std::string& str, unsigned long value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -262,7 +262,7 @@ void NumberFormatter::appendHex(std::string& str, unsigned long value, int width void NumberFormatter::append(std::string& str, Int64 value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz); str.append(result, sz); } @@ -271,7 +271,7 @@ void NumberFormatter::append(std::string& str, Int64 value) void NumberFormatter::append(std::string& str, Int64 value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -280,7 +280,7 @@ void NumberFormatter::append(std::string& str, Int64 value, int width) void NumberFormatter::append0(std::string& str, Int64 value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; intToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -289,7 +289,7 @@ void NumberFormatter::append0(std::string& str, Int64 value, int width) void NumberFormatter::appendHex(std::string& str, Int64 value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(static_cast(value), 0x10, result, sz); str.append(result, sz); } @@ -298,7 +298,7 @@ void NumberFormatter::appendHex(std::string& str, Int64 value) void NumberFormatter::appendHex(std::string& str, Int64 value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(static_cast(value), 0x10, result, sz, false, width, '0'); str.append(result, sz); } @@ -307,7 +307,7 @@ void NumberFormatter::appendHex(std::string& str, Int64 value, int width) void NumberFormatter::append(std::string& str, UInt64 value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 10, result, sz); str.append(result, sz); } @@ -316,7 +316,7 @@ void NumberFormatter::append(std::string& str, UInt64 value) void NumberFormatter::append(std::string& str, UInt64 value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -325,7 +325,7 @@ void NumberFormatter::append(std::string& str, UInt64 value, int width) void NumberFormatter::append0(std::string& str, UInt64 value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 10, result, sz, false, width, '0'); str.append(result, sz); } @@ -334,7 +334,7 @@ void NumberFormatter::append0(std::string& str, UInt64 value, int width) void NumberFormatter::appendHex(std::string& str, UInt64 value) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 0x10, result, sz); str.append(result, sz); } @@ -343,7 +343,7 @@ void NumberFormatter::appendHex(std::string& str, UInt64 value) void NumberFormatter::appendHex(std::string& str, UInt64 value, int width) { char result[NF_MAX_INT_STRING_LEN]; - unsigned sz = NF_MAX_INT_STRING_LEN; + std::size_t sz = NF_MAX_INT_STRING_LEN; uIntToStr(value, 0x10, result, sz, false, width, '0'); str.append(result, sz); } diff --git a/Foundation/src/NumericString.cpp b/Foundation/src/NumericString.cpp index ca72260f8..f8806be5d 100644 --- a/Foundation/src/NumericString.cpp +++ b/Foundation/src/NumericString.cpp @@ -175,7 +175,7 @@ float strToFloat(const char* str) int flags = StringToDoubleConverter::ALLOW_LEADING_SPACES | StringToDoubleConverter::ALLOW_TRAILING_SPACES; StringToDoubleConverter converter(flags, 0.0, Single::NaN(), POCO_FLT_INF, POCO_FLT_NAN); - float result = converter.StringToFloat(str, strlen(str), &processed); + float result = converter.StringToFloat(str, static_cast(strlen(str)), &processed); return result; } @@ -187,7 +187,7 @@ double strToDouble(const char* str) int flags = StringToDoubleConverter::ALLOW_LEADING_SPACES | StringToDoubleConverter::ALLOW_TRAILING_SPACES; StringToDoubleConverter converter(flags, 0.0, Double::NaN(), POCO_FLT_INF, POCO_FLT_NAN); - double result = converter.StringToDouble(str, strlen(str), &processed); + double result = converter.StringToDouble(str, static_cast(strlen(str)), &processed); return result; } diff --git a/Foundation/src/StringTokenizer.cpp b/Foundation/src/StringTokenizer.cpp index 43dc8d875..4bf714c79 100644 --- a/Foundation/src/StringTokenizer.cpp +++ b/Foundation/src/StringTokenizer.cpp @@ -83,7 +83,7 @@ StringTokenizer::~StringTokenizer() void StringTokenizer::trim (std::string& token) { - int front = 0, back = 0, length = token.length(); + std::size_t front = 0, back = 0, length = token.length(); std::string::const_iterator tIt = token.begin(); std::string::const_iterator tEnd = token.end(); for (; tIt != tEnd; ++tIt, ++front) diff --git a/Net/Net_CE_vs90.vcproj b/Net/Net_CE_vs90.vcproj index a29ae64e6..d2584bc6d 100644 --- a/Net/Net_CE_vs90.vcproj +++ b/Net/Net_CE_vs90.vcproj @@ -457,6 +457,8 @@ RelativePath=".\src\HostEntry.cpp"/> + + diff --git a/Net/Net_vs100.vcxproj.filters b/Net/Net_vs100.vcxproj.filters index 99be453f5..71b7a15e8 100644 --- a/Net/Net_vs100.vcxproj.filters +++ b/Net/Net_vs100.vcxproj.filters @@ -686,6 +686,9 @@ WebSocket\Source Files + + NetCore\Source Files + diff --git a/Net/Net_vs110.vcxproj b/Net/Net_vs110.vcxproj index e134b16c4..7dcfc157d 100644 --- a/Net/Net_vs110.vcxproj +++ b/Net/Net_vs110.vcxproj @@ -373,6 +373,7 @@ + diff --git a/Net/Net_vs110.vcxproj.filters b/Net/Net_vs110.vcxproj.filters index 2a58dba21..41af8129f 100644 --- a/Net/Net_vs110.vcxproj.filters +++ b/Net/Net_vs110.vcxproj.filters @@ -425,6 +425,9 @@ NetCore\Source Files + + NetCore\Source Files + NetCore\Source Files diff --git a/Net/Net_vs71.vcproj b/Net/Net_vs71.vcproj index 1984e5bb4..1f5542aaa 100644 --- a/Net/Net_vs71.vcproj +++ b/Net/Net_vs71.vcproj @@ -389,6 +389,8 @@ RelativePath=".\src\HostEntry.cpp"/> + + + + diff --git a/Net/Net_x64_vs100.vcxproj.filters b/Net/Net_x64_vs100.vcxproj.filters index da1dbebd0..a7683d6af 100644 --- a/Net/Net_x64_vs100.vcxproj.filters +++ b/Net/Net_x64_vs100.vcxproj.filters @@ -425,6 +425,9 @@ NetCore\Source Files + + NetCore\Source Files + NetCore\Source Files diff --git a/Net/Net_x64_vs110.vcxproj b/Net/Net_x64_vs110.vcxproj index e6ddb8154..57b417a95 100644 --- a/Net/Net_x64_vs110.vcxproj +++ b/Net/Net_x64_vs110.vcxproj @@ -371,6 +371,7 @@ + diff --git a/Net/Net_x64_vs110.vcxproj.filters b/Net/Net_x64_vs110.vcxproj.filters index a867c7081..75be7142b 100644 --- a/Net/Net_x64_vs110.vcxproj.filters +++ b/Net/Net_x64_vs110.vcxproj.filters @@ -425,6 +425,9 @@ NetCore\Source Files + + NetCore\Source Files + NetCore\Source Files diff --git a/Net/Net_x64_vs90.vcproj b/Net/Net_x64_vs90.vcproj index c8bdcaa38..d0f8ea8e4 100644 --- a/Net/Net_x64_vs90.vcproj +++ b/Net/Net_x64_vs90.vcproj @@ -414,6 +414,8 @@ RelativePath=".\src\HostEntry.cpp"/> + Date: Wed, 19 Dec 2012 00:57:44 -0600 Subject: [PATCH 117/165] fixed test compile on Mac/clang --- Foundation/testsuite/src/StringTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index c04374ce4..2024f6831 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -950,7 +950,7 @@ void StringTest::testIntToString() try { char pResult[POCO_MAX_INT_STRING_LEN]; - unsigned sz = POCO_MAX_INT_STRING_LEN; + std::size_t sz = POCO_MAX_INT_STRING_LEN; intToStr(0, 10, pResult, sz, false, sz + 1, ' '); fail ("must throw RangeException"); } catch (RangeException&) { } From 79549f85ddddf6655c971eb3e12a9184808764c0 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Wed, 19 Dec 2012 21:48:26 -0600 Subject: [PATCH 118/165] Base64Decoder drops 0x0d characters on windows SF #605 Base64Decoder drops 0x0d characters on windows --- Foundation/include/Poco/Platform.h | 12 +++++++----- Foundation/src/Base32Decoder.cpp | 3 +++ Foundation/src/Base64Decoder.cpp | 3 +++ Foundation/testsuite/src/Base32Test.cpp | 16 ++++++++++++++++ Foundation/testsuite/src/Base32Test.h | 1 + Foundation/testsuite/src/Base64Test.cpp | 16 ++++++++++++++++ Foundation/testsuite/src/Base64Test.h | 1 + 7 files changed, 47 insertions(+), 5 deletions(-) diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h index 84c085b0a..9fee21c3d 100644 --- a/Foundation/include/Poco/Platform.h +++ b/Foundation/include/Poco/Platform.h @@ -211,6 +211,11 @@ #endif +#if !defined(POCO_ARCH) + #error "Unknown or Unsupported Hardware Architecture." +#endif + + #if defined(_MSC_VER) #define POCO_COMPILER_MSVC #elif defined(__clang__) @@ -239,11 +244,8 @@ #define POCO_COMPILER_IBM_XLC // IBM XL C++ #elif defined (__IBMCPP__) && defined(__COMPILER_VER__) #define POCO_COMPILER_IBM_XLC_ZOS // IBM z/OS C++ -#endif - - -#if !defined(POCO_ARCH) - #error "Unknown Hardware Architecture." +#else + #error "Unknown or Unsupported Compiler." #endif diff --git a/Foundation/src/Base32Decoder.cpp b/Foundation/src/Base32Decoder.cpp index 4e49effe4..135269037 100644 --- a/Foundation/src/Base32Decoder.cpp +++ b/Foundation/src/Base32Decoder.cpp @@ -171,6 +171,9 @@ Base32DecoderBuf* Base32DecoderIOS::rdbuf() Base32Decoder::Base32Decoder(std::istream& istr): Base32DecoderIOS(istr), std::istream(&_buf) { +#ifdef POCO_OS_FAMILY_WINDOWS + unsetf(std::ios_base::skipws); +#endif } diff --git a/Foundation/src/Base64Decoder.cpp b/Foundation/src/Base64Decoder.cpp index 73695a573..b9c4be3d9 100644 --- a/Foundation/src/Base64Decoder.cpp +++ b/Foundation/src/Base64Decoder.cpp @@ -147,6 +147,9 @@ Base64DecoderBuf* Base64DecoderIOS::rdbuf() Base64Decoder::Base64Decoder(std::istream& istr): Base64DecoderIOS(istr), std::istream(&_buf) { +#ifdef POCO_OS_FAMILY_WINDOWS + unsetf(std::ios_base::skipws); +#endif } diff --git a/Foundation/testsuite/src/Base32Test.cpp b/Foundation/testsuite/src/Base32Test.cpp index 37a6fab7e..4d53aa200 100644 --- a/Foundation/testsuite/src/Base32Test.cpp +++ b/Foundation/testsuite/src/Base32Test.cpp @@ -37,6 +37,8 @@ #include "Poco/Base32Decoder.h" #include "Poco/Exception.h" #include +#include +#include using Poco::Base32Encoder; @@ -182,6 +184,19 @@ void Base32Test::testEncodeDecode() } +void Base32Test::testDecodeCR() +{ + std::istringstream input("BU======"); + Poco::Base32Decoder decoder(input); + std::vector result; + typedef std::istream_iterator istream_iterator_type; + istream_iterator_type eos; + std::copy(istream_iterator_type(decoder), eos, std::back_inserter(result)); + assert(1 == result.size()); + assert(0x0d == result[0]); +} + + void Base32Test::setUp() { } @@ -199,6 +214,7 @@ CppUnit::Test* Base32Test::suite() CppUnit_addTest(pSuite, Base32Test, testEncoder); CppUnit_addTest(pSuite, Base32Test, testDecoder); CppUnit_addTest(pSuite, Base32Test, testEncodeDecode); + CppUnit_addTest(pSuite, Base32Test, testDecodeCR); return pSuite; } diff --git a/Foundation/testsuite/src/Base32Test.h b/Foundation/testsuite/src/Base32Test.h index 509c19954..b3f34f3e0 100644 --- a/Foundation/testsuite/src/Base32Test.h +++ b/Foundation/testsuite/src/Base32Test.h @@ -49,6 +49,7 @@ public: void testEncoder(); void testDecoder(); void testEncodeDecode(); + void testDecodeCR(); void setUp(); void tearDown(); diff --git a/Foundation/testsuite/src/Base64Test.cpp b/Foundation/testsuite/src/Base64Test.cpp index cb099c33c..f21485929 100644 --- a/Foundation/testsuite/src/Base64Test.cpp +++ b/Foundation/testsuite/src/Base64Test.cpp @@ -37,6 +37,8 @@ #include "Poco/Base64Decoder.h" #include "Poco/Exception.h" #include +#include +#include using Poco::Base64Encoder; @@ -177,6 +179,19 @@ void Base64Test::testEncodeDecode() } +void Base64Test::testDecodeCR() +{ + std::istringstream input("DQ=="); + Poco::Base64Decoder decoder(input); + std::vector result; + typedef std::istream_iterator istream_iterator_type; + istream_iterator_type eos; + std::copy(istream_iterator_type(decoder), eos, std::back_inserter(result)); + assert(1 == result.size()); + assert(0x0d == result[0]); +} + + void Base64Test::setUp() { } @@ -194,6 +209,7 @@ CppUnit::Test* Base64Test::suite() CppUnit_addTest(pSuite, Base64Test, testEncoder); CppUnit_addTest(pSuite, Base64Test, testDecoder); CppUnit_addTest(pSuite, Base64Test, testEncodeDecode); + CppUnit_addTest(pSuite, Base64Test, testDecodeCR); return pSuite; } diff --git a/Foundation/testsuite/src/Base64Test.h b/Foundation/testsuite/src/Base64Test.h index f7b85de83..dc80ca2eb 100644 --- a/Foundation/testsuite/src/Base64Test.h +++ b/Foundation/testsuite/src/Base64Test.h @@ -49,6 +49,7 @@ public: void testEncoder(); void testDecoder(); void testEncodeDecode(); + void testDecodeCR(); void setUp(); void tearDown(); From 9c851f0d1bae34013394474b95e0894d21b5e4a4 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 19 Dec 2012 22:06:33 -0600 Subject: [PATCH 119/165] enable skipws --- Foundation/src/Base32Decoder.cpp | 2 -- Foundation/src/Base64Decoder.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/Foundation/src/Base32Decoder.cpp b/Foundation/src/Base32Decoder.cpp index 135269037..8d6be3ecd 100644 --- a/Foundation/src/Base32Decoder.cpp +++ b/Foundation/src/Base32Decoder.cpp @@ -171,9 +171,7 @@ Base32DecoderBuf* Base32DecoderIOS::rdbuf() Base32Decoder::Base32Decoder(std::istream& istr): Base32DecoderIOS(istr), std::istream(&_buf) { -#ifdef POCO_OS_FAMILY_WINDOWS unsetf(std::ios_base::skipws); -#endif } diff --git a/Foundation/src/Base64Decoder.cpp b/Foundation/src/Base64Decoder.cpp index b9c4be3d9..decd6b41f 100644 --- a/Foundation/src/Base64Decoder.cpp +++ b/Foundation/src/Base64Decoder.cpp @@ -147,9 +147,7 @@ Base64DecoderBuf* Base64DecoderIOS::rdbuf() Base64Decoder::Base64Decoder(std::istream& istr): Base64DecoderIOS(istr), std::istream(&_buf) { -#ifdef POCO_OS_FAMILY_WINDOWS unsetf(std::ios_base::skipws); -#endif } From a4e781f4878843df253d2bbb3abf2d6977ed9bc4 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Thu, 20 Dec 2012 20:04:46 -0600 Subject: [PATCH 120/165] Revert "enable skipws" This reverts commit 9c851f0d1bae34013394474b95e0894d21b5e4a4. --- Foundation/src/Base32Decoder.cpp | 2 ++ Foundation/src/Base64Decoder.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Foundation/src/Base32Decoder.cpp b/Foundation/src/Base32Decoder.cpp index 8d6be3ecd..135269037 100644 --- a/Foundation/src/Base32Decoder.cpp +++ b/Foundation/src/Base32Decoder.cpp @@ -171,7 +171,9 @@ Base32DecoderBuf* Base32DecoderIOS::rdbuf() Base32Decoder::Base32Decoder(std::istream& istr): Base32DecoderIOS(istr), std::istream(&_buf) { +#ifdef POCO_OS_FAMILY_WINDOWS unsetf(std::ios_base::skipws); +#endif } diff --git a/Foundation/src/Base64Decoder.cpp b/Foundation/src/Base64Decoder.cpp index decd6b41f..b9c4be3d9 100644 --- a/Foundation/src/Base64Decoder.cpp +++ b/Foundation/src/Base64Decoder.cpp @@ -147,7 +147,9 @@ Base64DecoderBuf* Base64DecoderIOS::rdbuf() Base64Decoder::Base64Decoder(std::istream& istr): Base64DecoderIOS(istr), std::istream(&_buf) { +#ifdef POCO_OS_FAMILY_WINDOWS unsetf(std::ios_base::skipws); +#endif } From 9a67596f0057e75a6a0cdc5c3c4e93343d92b12f Mon Sep 17 00:00:00 2001 From: aleks-f Date: Thu, 20 Dec 2012 20:05:10 -0600 Subject: [PATCH 121/165] Revert "Base64Decoder drops 0x0d characters on windows" This reverts commit 79549f85ddddf6655c971eb3e12a9184808764c0. --- Foundation/include/Poco/Platform.h | 12 +++++------- Foundation/src/Base32Decoder.cpp | 3 --- Foundation/src/Base64Decoder.cpp | 3 --- Foundation/testsuite/src/Base32Test.cpp | 16 ---------------- Foundation/testsuite/src/Base32Test.h | 1 - Foundation/testsuite/src/Base64Test.cpp | 16 ---------------- Foundation/testsuite/src/Base64Test.h | 1 - 7 files changed, 5 insertions(+), 47 deletions(-) diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h index 9fee21c3d..84c085b0a 100644 --- a/Foundation/include/Poco/Platform.h +++ b/Foundation/include/Poco/Platform.h @@ -211,11 +211,6 @@ #endif -#if !defined(POCO_ARCH) - #error "Unknown or Unsupported Hardware Architecture." -#endif - - #if defined(_MSC_VER) #define POCO_COMPILER_MSVC #elif defined(__clang__) @@ -244,8 +239,11 @@ #define POCO_COMPILER_IBM_XLC // IBM XL C++ #elif defined (__IBMCPP__) && defined(__COMPILER_VER__) #define POCO_COMPILER_IBM_XLC_ZOS // IBM z/OS C++ -#else - #error "Unknown or Unsupported Compiler." +#endif + + +#if !defined(POCO_ARCH) + #error "Unknown Hardware Architecture." #endif diff --git a/Foundation/src/Base32Decoder.cpp b/Foundation/src/Base32Decoder.cpp index 135269037..4e49effe4 100644 --- a/Foundation/src/Base32Decoder.cpp +++ b/Foundation/src/Base32Decoder.cpp @@ -171,9 +171,6 @@ Base32DecoderBuf* Base32DecoderIOS::rdbuf() Base32Decoder::Base32Decoder(std::istream& istr): Base32DecoderIOS(istr), std::istream(&_buf) { -#ifdef POCO_OS_FAMILY_WINDOWS - unsetf(std::ios_base::skipws); -#endif } diff --git a/Foundation/src/Base64Decoder.cpp b/Foundation/src/Base64Decoder.cpp index b9c4be3d9..73695a573 100644 --- a/Foundation/src/Base64Decoder.cpp +++ b/Foundation/src/Base64Decoder.cpp @@ -147,9 +147,6 @@ Base64DecoderBuf* Base64DecoderIOS::rdbuf() Base64Decoder::Base64Decoder(std::istream& istr): Base64DecoderIOS(istr), std::istream(&_buf) { -#ifdef POCO_OS_FAMILY_WINDOWS - unsetf(std::ios_base::skipws); -#endif } diff --git a/Foundation/testsuite/src/Base32Test.cpp b/Foundation/testsuite/src/Base32Test.cpp index 4d53aa200..37a6fab7e 100644 --- a/Foundation/testsuite/src/Base32Test.cpp +++ b/Foundation/testsuite/src/Base32Test.cpp @@ -37,8 +37,6 @@ #include "Poco/Base32Decoder.h" #include "Poco/Exception.h" #include -#include -#include using Poco::Base32Encoder; @@ -184,19 +182,6 @@ void Base32Test::testEncodeDecode() } -void Base32Test::testDecodeCR() -{ - std::istringstream input("BU======"); - Poco::Base32Decoder decoder(input); - std::vector result; - typedef std::istream_iterator istream_iterator_type; - istream_iterator_type eos; - std::copy(istream_iterator_type(decoder), eos, std::back_inserter(result)); - assert(1 == result.size()); - assert(0x0d == result[0]); -} - - void Base32Test::setUp() { } @@ -214,7 +199,6 @@ CppUnit::Test* Base32Test::suite() CppUnit_addTest(pSuite, Base32Test, testEncoder); CppUnit_addTest(pSuite, Base32Test, testDecoder); CppUnit_addTest(pSuite, Base32Test, testEncodeDecode); - CppUnit_addTest(pSuite, Base32Test, testDecodeCR); return pSuite; } diff --git a/Foundation/testsuite/src/Base32Test.h b/Foundation/testsuite/src/Base32Test.h index b3f34f3e0..509c19954 100644 --- a/Foundation/testsuite/src/Base32Test.h +++ b/Foundation/testsuite/src/Base32Test.h @@ -49,7 +49,6 @@ public: void testEncoder(); void testDecoder(); void testEncodeDecode(); - void testDecodeCR(); void setUp(); void tearDown(); diff --git a/Foundation/testsuite/src/Base64Test.cpp b/Foundation/testsuite/src/Base64Test.cpp index f21485929..cb099c33c 100644 --- a/Foundation/testsuite/src/Base64Test.cpp +++ b/Foundation/testsuite/src/Base64Test.cpp @@ -37,8 +37,6 @@ #include "Poco/Base64Decoder.h" #include "Poco/Exception.h" #include -#include -#include using Poco::Base64Encoder; @@ -179,19 +177,6 @@ void Base64Test::testEncodeDecode() } -void Base64Test::testDecodeCR() -{ - std::istringstream input("DQ=="); - Poco::Base64Decoder decoder(input); - std::vector result; - typedef std::istream_iterator istream_iterator_type; - istream_iterator_type eos; - std::copy(istream_iterator_type(decoder), eos, std::back_inserter(result)); - assert(1 == result.size()); - assert(0x0d == result[0]); -} - - void Base64Test::setUp() { } @@ -209,7 +194,6 @@ CppUnit::Test* Base64Test::suite() CppUnit_addTest(pSuite, Base64Test, testEncoder); CppUnit_addTest(pSuite, Base64Test, testDecoder); CppUnit_addTest(pSuite, Base64Test, testEncodeDecode); - CppUnit_addTest(pSuite, Base64Test, testDecodeCR); return pSuite; } diff --git a/Foundation/testsuite/src/Base64Test.h b/Foundation/testsuite/src/Base64Test.h index dc80ca2eb..f7b85de83 100644 --- a/Foundation/testsuite/src/Base64Test.h +++ b/Foundation/testsuite/src/Base64Test.h @@ -49,7 +49,6 @@ public: void testEncoder(); void testDecoder(); void testEncodeDecode(); - void testDecodeCR(); void setUp(); void tearDown(); From 16533ef73b7d4b68c0fac5247769aed800704bc0 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Thu, 20 Dec 2012 21:18:06 -0600 Subject: [PATCH 122/165] fix XP/VS2003 tests --- Foundation/testsuite/src/NumberParserTest.cpp | 7 +++++-- Foundation/testsuite/src/StringTest.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Foundation/testsuite/src/NumberParserTest.cpp b/Foundation/testsuite/src/NumberParserTest.cpp index 0e46e069f..4b1135960 100644 --- a/Foundation/testsuite/src/NumberParserTest.cpp +++ b/Foundation/testsuite/src/NumberParserTest.cpp @@ -230,8 +230,11 @@ void NumberParserTest::testLimits() void NumberParserTest::testParseError() { - const char dp = decimalSeparator(); - const char ts = thousandSeparator(); + char dp = decimalSeparator(); + if (dp == 0) dp = '.'; + char ts = thousandSeparator(); + if (ts == 0) ts = ','; + assert (dp != ts); try { diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp index 2024f6831..33fbcac1b 100644 --- a/Foundation/testsuite/src/StringTest.cpp +++ b/Foundation/testsuite/src/StringTest.cpp @@ -665,8 +665,11 @@ void StringTest::testStringToDouble() void StringTest::testStringToFloatError() { - const char ds = decimalSeparator(); - const char ts = thousandSeparator(); + char ds = decimalSeparator(); + if (ds == 0) ds = '.'; + char ts = thousandSeparator(); + if (ts == 0) ts = ','; + assert (ds != ts); double result = 0.0; assert (!strToDouble(format("a12%c3", ds), result)); From 760fa4bbb02c76108e9265e8f4f5a39ed166ee7a Mon Sep 17 00:00:00 2001 From: aleks-f Date: Sun, 23 Dec 2012 02:36:01 -0600 Subject: [PATCH 123/165] see CHANGELOG - upgraded SQLite to version 3.7.15.1 (2012-12-19) - fixed SQLite affectedRows reporting and added tests - added SQLite::Utility::isThreadSafe() function - added SQLite::Utility::setThreadMode(int mode) function - fixed GH #41: Buffer::resize crash --- CHANGELOG | 5 + Data/SQLite/include/Poco/Data/SQLite/SQLite.h | 12 + .../SQLite/include/Poco/Data/SQLite/Utility.h | 12 + Data/SQLite/src/SQLiteStatementImpl.cpp | 13 +- Data/SQLite/src/Utility.cpp | 16 + Data/SQLite/src/sqlite3.c | 6490 ++++++++++------- Data/SQLite/src/sqlite3.h | 71 +- Data/SQLite/testsuite/src/SQLiteTest.cpp | 59 +- Data/SQLite/testsuite/src/SQLiteTest.h | 2 + Data/include/Poco/Data/Binding.h | 6 +- Data/include/Poco/Data/Extraction.h | 2 +- Foundation/include/Poco/Buffer.h | 4 +- 12 files changed, 3969 insertions(+), 2723 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8e69616dd..e7ca3eb0c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,6 +29,11 @@ Release 1.5.0 (2012-12-17) - fixed GH #30: Poco::Path::home() throws when called from Windows Service - fixed GH #22: MySQL connection string lowercased - added MySQL support for Date/Time +- upgraded SQLite to version 3.7.15.1 (2012-12-19) +- fixed SQLite affectedRows reporting and added tests +- added SQLite::Utility::isThreadSafe() function +- added SQLite::Utility::setThreadMode(int mode) function +- fixed GH #41: Buffer::resize crash Release 1.5.0 (2012-10-14) ========================== diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLite.h b/Data/SQLite/include/Poco/Data/SQLite/SQLite.h index a971d57a7..aeae70f88 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/SQLite.h +++ b/Data/SQLite/include/Poco/Data/SQLite/SQLite.h @@ -80,4 +80,16 @@ #endif #endif + +// +// Thread safety mode defaults to "serialized". +// See http://www.sqlite.org/threadsafe.html for details. +// Threading mode significantly affects performance +// (see TestSuite::benchmarkThreadModesTiming) +// +#ifndef SQLITE_THREADSAFE + #define SQLITE_THREADSAFE 1 +#endif + + #endif // SQLite_SQLite_INCLUDED diff --git a/Data/SQLite/include/Poco/Data/SQLite/Utility.h b/Data/SQLite/include/Poco/Data/SQLite/Utility.h index c48decf5e..bd44ce25f 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Utility.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Utility.h @@ -63,6 +63,10 @@ public: static const std::string SQLITE_TIME_FORMAT; typedef std::map TypeMap; + static const int THREAD_MODE_SINGLE; + static const int THREAD_MODE_MULTI; + static const int THREAD_MODE_SERIAL; + Utility(); /// Maps SQLite column declared types to Poco::Data types through /// static TypeMap member. @@ -92,6 +96,14 @@ public: /// /// Returns true if succesful + static bool isThreadSafe(); + /// Returns true if SQLite was compiled in thread or serialized mode. + /// See http://www.sqlite.org/c3ref/threadsafe.html for details. + + static bool setThreadMode(int mode); + /// Sets the threading mode to single, multi or serialized. + /// See http://www.sqlite.org/threadsafe.html for details. + private: static TypeMap _types; Poco::FastMutex _mutex; diff --git a/Data/SQLite/src/SQLiteStatementImpl.cpp b/Data/SQLite/src/SQLiteStatementImpl.cpp index f9b2897b4..6077d0723 100644 --- a/Data/SQLite/src/SQLiteStatementImpl.cpp +++ b/Data/SQLite/src/SQLiteStatementImpl.cpp @@ -215,14 +215,15 @@ void SQLiteStatementImpl::bindImpl() else if (bindCount > remainingBindCount) throw ParameterCountMismatchException(); + std::size_t boundRowCount; if (_bindBegin != bindings().end()) { - _affectedRowCount = (*_bindBegin)->numOfRowsHandled(); + boundRowCount = (*_bindBegin)->numOfRowsHandled(); Bindings::iterator oldBegin = _bindBegin; for (std::size_t pos = 1; _bindBegin != bindEnd && (*_bindBegin)->canBind(); ++_bindBegin) { - if (_affectedRowCount != (*_bindBegin)->numOfRowsHandled()) + if (boundRowCount != (*_bindBegin)->numOfRowsHandled()) throw BindingException("Size mismatch in Bindings. All Bindings MUST have the same size"); (*_bindBegin)->bind(pos); @@ -270,6 +271,9 @@ bool SQLiteStatementImpl::hasNext() _stepCalled = true; _nextResponse = sqlite3_step(_pStmt); + if (_affectedRowCount == POCO_SQLITE_INV_ROW_CNT) _affectedRowCount = 0; + _affectedRowCount += sqlite3_changes(_pDB); + if (_nextResponse != SQLITE_ROW && _nextResponse != SQLITE_OK && _nextResponse != SQLITE_DONE) Utility::throwException(_nextResponse); @@ -296,6 +300,8 @@ std::size_t SQLiteStatementImpl::next() _isExtracted = true; } _stepCalled = false; + if (_affectedRowCount == POCO_SQLITE_INV_ROW_CNT) _affectedRowCount = 0; + _affectedRowCount += (*extracts.begin())->numOfRowsHandled(); } else if (SQLITE_DONE == _nextResponse) { @@ -303,8 +309,7 @@ std::size_t SQLiteStatementImpl::next() } else { - int rc = _nextResponse; - Utility::throwException(rc, std::string("Iterator Error: trying to access the next value")); + Utility::throwException(_nextResponse, std::string("Iterator Error: trying to access the next value")); } return 1u; diff --git a/Data/SQLite/src/Utility.cpp b/Data/SQLite/src/Utility.cpp index 526a64b4e..2e36fedb7 100644 --- a/Data/SQLite/src/Utility.cpp +++ b/Data/SQLite/src/Utility.cpp @@ -53,6 +53,10 @@ namespace Data { namespace SQLite { +const int Utility::THREAD_MODE_SINGLE = SQLITE_CONFIG_SINGLETHREAD; +const int Utility::THREAD_MODE_MULTI = SQLITE_CONFIG_MULTITHREAD; +const int Utility::THREAD_MODE_SERIAL = SQLITE_CONFIG_SERIALIZED; + const std::string Utility::SQLITE_DATE_FORMAT = "%Y-%m-%d"; const std::string Utility::SQLITE_TIME_FORMAT = "%H:%M:%S"; Utility::TypeMap Utility::_types; @@ -255,4 +259,16 @@ bool Utility::memoryToFile(const std::string& fileName, sqlite3* pInMemory) } +bool Utility::isThreadSafe() +{ + return 0 != sqlite3_threadsafe; +} + + +bool Utility::setThreadMode(int mode) +{ + return SQLITE_OK == sqlite3_config((int) mode); +} + + } } } // namespace Poco::Data::SQLite diff --git a/Data/SQLite/src/sqlite3.c b/Data/SQLite/src/sqlite3.c index 55039b963..e877d771c 100644 --- a/Data/SQLite/src/sqlite3.c +++ b/Data/SQLite/src/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.7.14.1. By combining all the individual C code files into this +** version 3.7.15.1. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -673,9 +673,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.7.14.1" -#define SQLITE_VERSION_NUMBER 3007014 -#define SQLITE_SOURCE_ID "2012-10-04 19:37:12 091570e46d04e84b67228e0bdbcd6e1fb60c6bdb" +#define SQLITE_VERSION "3.7.15.1" +#define SQLITE_VERSION_NUMBER 3007015 +#define SQLITE_SOURCE_ID "2012-12-19 20:39:10 6b85b767d0ff7975146156a99ad673f2c1a23318" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -1040,10 +1040,12 @@ SQLITE_API int sqlite3_exec( #define SQLITE_IOERR_SHMLOCK (SQLITE_IOERR | (20<<8)) #define SQLITE_IOERR_SHMMAP (SQLITE_IOERR | (21<<8)) #define SQLITE_IOERR_SEEK (SQLITE_IOERR | (22<<8)) +#define SQLITE_IOERR_DELETE_NOENT (SQLITE_IOERR | (23<<8)) #define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1<<8)) #define SQLITE_BUSY_RECOVERY (SQLITE_BUSY | (1<<8)) #define SQLITE_CANTOPEN_NOTEMPDIR (SQLITE_CANTOPEN | (1<<8)) #define SQLITE_CANTOPEN_ISDIR (SQLITE_CANTOPEN | (2<<8)) +#define SQLITE_CANTOPEN_FULLPATH (SQLITE_CANTOPEN | (3<<8)) #define SQLITE_CORRUPT_VTAB (SQLITE_CORRUPT | (1<<8)) #define SQLITE_READONLY_RECOVERY (SQLITE_READONLY | (1<<8)) #define SQLITE_READONLY_CANTLOCK (SQLITE_READONLY | (2<<8)) @@ -1421,6 +1423,26 @@ struct sqlite3_io_methods { ** compilation of the PRAGMA fails with an error. ^The [SQLITE_FCNTL_PRAGMA] ** file control occurs at the beginning of pragma statement analysis and so ** it is able to override built-in [PRAGMA] statements. +** +**
  • [[SQLITE_FCNTL_BUSYHANDLER]] +** ^This file-control may be invoked by SQLite on the database file handle +** shortly after it is opened in order to provide a custom VFS with access +** to the connections busy-handler callback. The argument is of type (void **) +** - an array of two (void *) values. The first (void *) actually points +** to a function of type (int (*)(void *)). In order to invoke the connections +** busy-handler, this function should be invoked with the second (void *) in +** the array as the only argument. If it returns non-zero, then the operation +** should be retried. If it returns zero, the custom VFS should abandon the +** current operation. +** +**
  • [[SQLITE_FCNTL_TEMPFILENAME]] +** ^Application can invoke this file-control to have SQLite generate a +** temporary filename using the same algorithm that is followed to generate +** temporary filenames for TEMP tables and other internal uses. The +** argument should be a char** which will be filled with the filename +** written into memory obtained from [sqlite3_malloc()]. The caller should +** invoke [sqlite3_free()] on the result to avoid a memory leak. +** ** */ #define SQLITE_FCNTL_LOCKSTATE 1 @@ -1437,6 +1459,8 @@ struct sqlite3_io_methods { #define SQLITE_FCNTL_VFSNAME 12 #define SQLITE_FCNTL_POWERSAFE_OVERWRITE 13 #define SQLITE_FCNTL_PRAGMA 14 +#define SQLITE_FCNTL_BUSYHANDLER 15 +#define SQLITE_FCNTL_TEMPFILENAME 16 /* ** CAPI3REF: Mutex Handle @@ -2133,11 +2157,39 @@ struct sqlite3_mem_methods { ** disabled. The default value may be changed by compiling with the ** [SQLITE_USE_URI] symbol defined. ** +** [[SQLITE_CONFIG_COVERING_INDEX_SCAN]]
    SQLITE_CONFIG_COVERING_INDEX_SCAN +**
    This option takes a single integer argument which is interpreted as +** a boolean in order to enable or disable the use of covering indices for +** full table scans in the query optimizer. The default setting is determined +** by the [SQLITE_ALLOW_COVERING_INDEX_SCAN] compile-time option, or is "on" +** if that compile-time option is omitted. +** The ability to disable the use of covering indices for full table scans +** is because some incorrectly coded legacy applications might malfunction +** malfunction when the optimization is enabled. Providing the ability to +** disable the optimization allows the older, buggy application code to work +** without change even with newer versions of SQLite. +** ** [[SQLITE_CONFIG_PCACHE]] [[SQLITE_CONFIG_GETPCACHE]] **
    SQLITE_CONFIG_PCACHE and SQLITE_CONFIG_GETPCACHE **
    These options are obsolete and should not be used by new code. ** They are retained for backwards compatibility but are now no-ops. ** +** +** [[SQLITE_CONFIG_SQLLOG]] +**
    SQLITE_CONFIG_SQLLOG +**
    This option is only available if sqlite is compiled with the +** SQLITE_ENABLE_SQLLOG pre-processor macro defined. The first argument should +** be a pointer to a function of type void(*)(void*,sqlite3*,const char*, int). +** The second should be of type (void*). The callback is invoked by the library +** in three separate circumstances, identified by the value passed as the +** fourth parameter. If the fourth parameter is 0, then the database connection +** passed as the second argument has just been opened. The third argument +** points to a buffer containing the name of the main database file. If the +** fourth parameter is 1, then the SQL statement that the third parameter +** points to has just been executed. Or, if the fourth parameter is 2, then +** the connection being passed as the second parameter is being closed. The +** third parameter is passed NULL In this case. +** */ #define SQLITE_CONFIG_SINGLETHREAD 1 /* nil */ #define SQLITE_CONFIG_MULTITHREAD 2 /* nil */ @@ -2158,6 +2210,8 @@ struct sqlite3_mem_methods { #define SQLITE_CONFIG_URI 17 /* int */ #define SQLITE_CONFIG_PCACHE2 18 /* sqlite3_pcache_methods2* */ #define SQLITE_CONFIG_GETPCACHE2 19 /* sqlite3_pcache_methods2* */ +#define SQLITE_CONFIG_COVERING_INDEX_SCAN 20 /* int */ +#define SQLITE_CONFIG_SQLLOG 21 /* xSqllog, void* */ /* ** CAPI3REF: Database Connection Configuration Options @@ -3166,7 +3220,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** an error)^. ** ^If "ro" is specified, then the database is opened for read-only ** access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the -** third argument to sqlite3_prepare_v2(). ^If the mode option is set to +** third argument to sqlite3_open_v2(). ^If the mode option is set to ** "rw", then the database is opened for read-write (but not create) ** access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had ** been set. ^Value "rwc" is equivalent to setting both @@ -3318,6 +3372,11 @@ SQLITE_API sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int ** However, the error string might be overwritten or deallocated by ** subsequent calls to other SQLite interface functions.)^ ** +** ^The sqlite3_errstr() interface returns the English-language text +** that describes the [result code], as UTF-8. +** ^(Memory to hold the error message string is managed internally +** and must not be freed by the application)^. +** ** When the serialized [threading mode] is in use, it might be the ** case that a second error occurs on a separate thread in between ** the time of the first error and the call to these interfaces. @@ -3336,6 +3395,7 @@ SQLITE_API int sqlite3_errcode(sqlite3 *db); SQLITE_API int sqlite3_extended_errcode(sqlite3 *db); SQLITE_API const char *sqlite3_errmsg(sqlite3*); SQLITE_API const void *sqlite3_errmsg16(sqlite3*); +SQLITE_API const char *sqlite3_errstr(int); /* ** CAPI3REF: SQL Statement Object @@ -5298,6 +5358,9 @@ SQLITE_API void *sqlite3_update_hook( ** future releases of SQLite. Applications that care about shared ** cache setting should set it explicitly. ** +** This interface is threadsafe on processors where writing a +** 32-bit integer is atomic. +** ** See Also: [SQLite Shared-Cache Mode] */ SQLITE_API int sqlite3_enable_shared_cache(int); @@ -8263,6 +8326,7 @@ typedef struct Parse Parse; typedef struct RowSet RowSet; typedef struct Savepoint Savepoint; typedef struct Select Select; +typedef struct SelectDest SelectDest; typedef struct SrcList SrcList; typedef struct StrAccum StrAccum; typedef struct Table Table; @@ -8359,6 +8423,9 @@ SQLITE_PRIVATE int sqlite3BtreeMaxPageCount(Btree*,int); SQLITE_PRIVATE u32 sqlite3BtreeLastPage(Btree*); SQLITE_PRIVATE int sqlite3BtreeSecureDelete(Btree*,int); SQLITE_PRIVATE int sqlite3BtreeGetReserve(Btree*); +#if defined(SQLITE_HAS_CODEC) || defined(SQLITE_DEBUG) +SQLITE_PRIVATE int sqlite3BtreeGetReserveNoMutex(Btree *p); +#endif SQLITE_PRIVATE int sqlite3BtreeSetAutoVacuum(Btree *, int); SQLITE_PRIVATE int sqlite3BtreeGetAutoVacuum(Btree *); SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree*,int); @@ -8402,6 +8469,8 @@ SQLITE_PRIVATE void sqlite3BtreeTripAllCursors(Btree*, int); SQLITE_PRIVATE void sqlite3BtreeGetMeta(Btree *pBtree, int idx, u32 *pValue); SQLITE_PRIVATE int sqlite3BtreeUpdateMeta(Btree*, int idx, u32 value); +SQLITE_PRIVATE int sqlite3BtreeNewDb(Btree *p); + /* ** The second parameter to sqlite3BtreeGetMeta or sqlite3BtreeUpdateMeta ** should be one of the following values. The integer values are assigned @@ -8869,7 +8938,7 @@ typedef struct VdbeOpList VdbeOpList; #define OPFLG_OUT3 0x0040 /* out3: P3 is an output */ #define OPFLG_INITIALIZER {\ /* 0 */ 0x00, 0x01, 0x01, 0x04, 0x04, 0x10, 0x00, 0x02,\ -/* 8 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x24, 0x24,\ +/* 8 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x24,\ /* 16 */ 0x00, 0x00, 0x00, 0x24, 0x04, 0x05, 0x04, 0x00,\ /* 24 */ 0x00, 0x01, 0x01, 0x05, 0x05, 0x00, 0x00, 0x00,\ /* 32 */ 0x02, 0x00, 0x00, 0x00, 0x02, 0x10, 0x00, 0x00,\ @@ -8916,7 +8985,7 @@ SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe*, int); SQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe*); SQLITE_PRIVATE void sqlite3VdbeRunOnlyOnce(Vdbe*); SQLITE_PRIVATE void sqlite3VdbeDelete(Vdbe*); -SQLITE_PRIVATE void sqlite3VdbeDeleteObject(sqlite3*,Vdbe*); +SQLITE_PRIVATE void sqlite3VdbeClearObject(sqlite3*,Vdbe*); SQLITE_PRIVATE void sqlite3VdbeMakeReady(Vdbe*,Parse*); SQLITE_PRIVATE int sqlite3VdbeFinalize(Vdbe*); SQLITE_PRIVATE void sqlite3VdbeResolveLabel(Vdbe*, int); @@ -9106,11 +9175,14 @@ SQLITE_PRIVATE int sqlite3PagerOpenSavepoint(Pager *pPager, int n); SQLITE_PRIVATE int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint); SQLITE_PRIVATE int sqlite3PagerSharedLock(Pager *pPager); -SQLITE_PRIVATE int sqlite3PagerCheckpoint(Pager *pPager, int, int*, int*); -SQLITE_PRIVATE int sqlite3PagerWalSupported(Pager *pPager); -SQLITE_PRIVATE int sqlite3PagerWalCallback(Pager *pPager); -SQLITE_PRIVATE int sqlite3PagerOpenWal(Pager *pPager, int *pisOpen); -SQLITE_PRIVATE int sqlite3PagerCloseWal(Pager *pPager); +#ifndef SQLITE_OMIT_WAL +SQLITE_PRIVATE int sqlite3PagerCheckpoint(Pager *pPager, int, int*, int*); +SQLITE_PRIVATE int sqlite3PagerWalSupported(Pager *pPager); +SQLITE_PRIVATE int sqlite3PagerWalCallback(Pager *pPager); +SQLITE_PRIVATE int sqlite3PagerOpenWal(Pager *pPager, int *pisOpen); +SQLITE_PRIVATE int sqlite3PagerCloseWal(Pager *pPager); +#endif + #ifdef SQLITE_ENABLE_ZIPVFS SQLITE_PRIVATE int sqlite3PagerWalFramesize(Pager *pPager); #endif @@ -9128,6 +9200,7 @@ SQLITE_PRIVATE void *sqlite3PagerTempSpace(Pager*); SQLITE_PRIVATE int sqlite3PagerIsMemdb(Pager*); SQLITE_PRIVATE void sqlite3PagerCacheStat(Pager *, int, int, int *); SQLITE_PRIVATE void sqlite3PagerClearCache(Pager *); +SQLITE_PRIVATE int sqlite3SectorSize(sqlite3_file *); /* Functions used to truncate the database file. */ SQLITE_PRIVATE void sqlite3PagerTruncateImage(Pager*,Pgno); @@ -9825,6 +9898,7 @@ struct sqlite3 { unsigned int openFlags; /* Flags passed to sqlite3_vfs.xOpen() */ int errCode; /* Most recent error code (SQLITE_*) */ int errMask; /* & result codes with this before returning */ + u16 dbOptFlags; /* Flags to enable/disable optimizations */ u8 autoCommit; /* The auto-commit flag. */ u8 temp_store; /* 1: file 2: memory 0: default */ u8 mallocFailed; /* True if we have seen a malloc failure */ @@ -9929,48 +10003,59 @@ struct sqlite3 { /* ** Possible values for the sqlite3.flags. */ -#define SQLITE_VdbeTrace 0x00000100 /* True to trace VDBE execution */ -#define SQLITE_InternChanges 0x00000200 /* Uncommitted Hash table changes */ -#define SQLITE_FullColNames 0x00000400 /* Show full column names on SELECT */ -#define SQLITE_ShortColNames 0x00000800 /* Show short columns names */ -#define SQLITE_CountRows 0x00001000 /* Count rows changed by INSERT, */ +#define SQLITE_VdbeTrace 0x00000001 /* True to trace VDBE execution */ +#define SQLITE_InternChanges 0x00000002 /* Uncommitted Hash table changes */ +#define SQLITE_FullColNames 0x00000004 /* Show full column names on SELECT */ +#define SQLITE_ShortColNames 0x00000008 /* Show short columns names */ +#define SQLITE_CountRows 0x00000010 /* Count rows changed by INSERT, */ /* DELETE, or UPDATE and return */ /* the count using a callback. */ -#define SQLITE_NullCallback 0x00002000 /* Invoke the callback once if the */ +#define SQLITE_NullCallback 0x00000020 /* Invoke the callback once if the */ /* result set is empty */ -#define SQLITE_SqlTrace 0x00004000 /* Debug print SQL as it executes */ -#define SQLITE_VdbeListing 0x00008000 /* Debug listings of VDBE programs */ -#define SQLITE_WriteSchema 0x00010000 /* OK to update SQLITE_MASTER */ - /* 0x00020000 Unused */ -#define SQLITE_IgnoreChecks 0x00040000 /* Do not enforce check constraints */ -#define SQLITE_ReadUncommitted 0x0080000 /* For shared-cache mode */ -#define SQLITE_LegacyFileFmt 0x00100000 /* Create new databases in format 1 */ -#define SQLITE_FullFSync 0x00200000 /* Use full fsync on the backend */ -#define SQLITE_CkptFullFSync 0x00400000 /* Use full fsync for checkpoint */ -#define SQLITE_RecoveryMode 0x00800000 /* Ignore schema errors */ -#define SQLITE_ReverseOrder 0x01000000 /* Reverse unordered SELECTs */ -#define SQLITE_RecTriggers 0x02000000 /* Enable recursive triggers */ -#define SQLITE_ForeignKeys 0x04000000 /* Enforce foreign key constraints */ -#define SQLITE_AutoIndex 0x08000000 /* Enable automatic indexes */ -#define SQLITE_PreferBuiltin 0x10000000 /* Preference to built-in funcs */ -#define SQLITE_LoadExtension 0x20000000 /* Enable load_extension */ -#define SQLITE_EnableTrigger 0x40000000 /* True to enable triggers */ +#define SQLITE_SqlTrace 0x00000040 /* Debug print SQL as it executes */ +#define SQLITE_VdbeListing 0x00000080 /* Debug listings of VDBE programs */ +#define SQLITE_WriteSchema 0x00000100 /* OK to update SQLITE_MASTER */ + /* 0x00000200 Unused */ +#define SQLITE_IgnoreChecks 0x00000400 /* Do not enforce check constraints */ +#define SQLITE_ReadUncommitted 0x0000800 /* For shared-cache mode */ +#define SQLITE_LegacyFileFmt 0x00001000 /* Create new databases in format 1 */ +#define SQLITE_FullFSync 0x00002000 /* Use full fsync on the backend */ +#define SQLITE_CkptFullFSync 0x00004000 /* Use full fsync for checkpoint */ +#define SQLITE_RecoveryMode 0x00008000 /* Ignore schema errors */ +#define SQLITE_ReverseOrder 0x00010000 /* Reverse unordered SELECTs */ +#define SQLITE_RecTriggers 0x00020000 /* Enable recursive triggers */ +#define SQLITE_ForeignKeys 0x00040000 /* Enforce foreign key constraints */ +#define SQLITE_AutoIndex 0x00080000 /* Enable automatic indexes */ +#define SQLITE_PreferBuiltin 0x00100000 /* Preference to built-in funcs */ +#define SQLITE_LoadExtension 0x00200000 /* Enable load_extension */ +#define SQLITE_EnableTrigger 0x00400000 /* True to enable triggers */ /* -** Bits of the sqlite3.flags field that are used by the -** sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS,...) interface. -** These must be the low-order bits of the flags field. +** Bits of the sqlite3.dbOptFlags field that are used by the +** sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS,...) interface to +** selectively disable various optimizations. */ -#define SQLITE_QueryFlattener 0x01 /* Disable query flattening */ -#define SQLITE_ColumnCache 0x02 /* Disable the column cache */ -#define SQLITE_IndexSort 0x04 /* Disable indexes for sorting */ -#define SQLITE_IndexSearch 0x08 /* Disable indexes for searching */ -#define SQLITE_IndexCover 0x10 /* Disable index covering table */ -#define SQLITE_GroupByOrder 0x20 /* Disable GROUPBY cover of ORDERBY */ -#define SQLITE_FactorOutConst 0x40 /* Disable factoring out constants */ -#define SQLITE_IdxRealAsInt 0x80 /* Store REAL as INT in indices */ -#define SQLITE_DistinctOpt 0x80 /* DISTINCT using indexes */ -#define SQLITE_OptMask 0xff /* Mask of all disablable opts */ +#define SQLITE_QueryFlattener 0x0001 /* Query flattening */ +#define SQLITE_ColumnCache 0x0002 /* Column cache */ +#define SQLITE_GroupByOrder 0x0004 /* GROUPBY cover of ORDERBY */ +#define SQLITE_FactorOutConst 0x0008 /* Constant factoring */ +#define SQLITE_IdxRealAsInt 0x0010 /* Store REAL as INT in indices */ +#define SQLITE_DistinctOpt 0x0020 /* DISTINCT using indexes */ +#define SQLITE_CoverIdxScan 0x0040 /* Covering index scans */ +#define SQLITE_OrderByIdxJoin 0x0080 /* ORDER BY of joins via index */ +#define SQLITE_SubqCoroutine 0x0100 /* Evaluate subqueries as coroutines */ +#define SQLITE_AllOpts 0xffff /* All optimizations */ + +/* +** Macros for testing whether or not optimizations are enabled or disabled. +*/ +#ifndef SQLITE_OMIT_BUILTIN_TEST +#define OptimizationDisabled(db, mask) (((db)->dbOptFlags&(mask))!=0) +#define OptimizationEnabled(db, mask) (((db)->dbOptFlags&(mask))==0) +#else +#define OptimizationDisabled(db, mask) 0 +#define OptimizationEnabled(db, mask) 1 +#endif /* ** Possible values for the sqlite.magic field. @@ -10121,32 +10206,22 @@ struct Column { char *zDflt; /* Original text of the default value */ char *zType; /* Data type for this column */ char *zColl; /* Collating sequence. If NULL, use the default */ - u8 notNull; /* True if there is a NOT NULL constraint */ - u8 isPrimKey; /* True if this column is part of the PRIMARY KEY */ + u8 notNull; /* An OE_ code for handling a NOT NULL constraint */ char affinity; /* One of the SQLITE_AFF_... values */ -#ifndef SQLITE_OMIT_VIRTUALTABLE - u8 isHidden; /* True if this column is 'hidden' */ -#endif + u16 colFlags; /* Boolean properties. See COLFLAG_ defines below */ }; +/* Allowed values for Column.colFlags: +*/ +#define COLFLAG_PRIMKEY 0x0001 /* Column is part of the primary key */ +#define COLFLAG_HIDDEN 0x0002 /* A hidden column in a virtual table */ + /* ** A "Collating Sequence" is defined by an instance of the following ** structure. Conceptually, a collating sequence consists of a name and ** a comparison routine that defines the order of that sequence. ** -** There may two separate implementations of the collation function, one -** that processes text in UTF-8 encoding (CollSeq.xCmp) and another that -** processes text encoded in UTF-16 (CollSeq.xCmp16), using the machine -** native byte order. When a collation sequence is invoked, SQLite selects -** the version that will require the least expensive encoding -** translations, if any. -** -** The CollSeq.pUser member variable is an extra parameter that passed in -** as the first argument to the UTF-8 comparison function, xCmp. -** CollSeq.pUser16 is the equivalent for the UTF-16 comparison function, -** xCmp16. -** -** If both CollSeq.xCmp and CollSeq.xCmp16 are NULL, it means that the +** If CollSeq.xCmp is NULL, it means that the ** collating sequence is undefined. Indices built on an undefined ** collating sequence may not be read or written. */ @@ -10284,28 +10359,28 @@ struct VTable { */ struct Table { char *zName; /* Name of the table or view */ - int iPKey; /* If not negative, use aCol[iPKey] as the primary key */ - int nCol; /* Number of columns in this table */ Column *aCol; /* Information about each column */ Index *pIndex; /* List of SQL indexes on this table. */ - int tnum; /* Root BTree node for this table (see note above) */ - tRowcnt nRowEst; /* Estimated rows in table - from sqlite_stat1 table */ Select *pSelect; /* NULL for tables. Points to definition if a view. */ - u16 nRef; /* Number of pointers to this Table */ - u8 tabFlags; /* Mask of TF_* values */ - u8 keyConf; /* What to do in case of uniqueness conflict on iPKey */ FKey *pFKey; /* Linked list of all foreign keys in this table */ char *zColAff; /* String defining the affinity of each column */ #ifndef SQLITE_OMIT_CHECK ExprList *pCheck; /* All CHECK constraints */ #endif + tRowcnt nRowEst; /* Estimated rows in table - from sqlite_stat1 table */ + int tnum; /* Root BTree node for this table (see note above) */ + i16 iPKey; /* If not negative, use aCol[iPKey] as the primary key */ + i16 nCol; /* Number of columns in this table */ + u16 nRef; /* Number of pointers to this Table */ + u8 tabFlags; /* Mask of TF_* values */ + u8 keyConf; /* What to do in case of uniqueness conflict on iPKey */ #ifndef SQLITE_OMIT_ALTERTABLE int addColOffset; /* Offset in CREATE TABLE stmt to add a new column */ #endif #ifndef SQLITE_OMIT_VIRTUALTABLE - VTable *pVTable; /* List of VTable objects. */ int nModuleArg; /* Number of arguments to the module */ char **azModuleArg; /* Text of all module args. [0] is module name */ + VTable *pVTable; /* List of VTable objects. */ #endif Trigger *pTrigger; /* List of triggers stored in pSchema */ Schema *pSchema; /* Schema that contains this table */ @@ -10329,7 +10404,7 @@ struct Table { */ #ifndef SQLITE_OMIT_VIRTUALTABLE # define IsVirtual(X) (((X)->tabFlags & TF_Virtual)!=0) -# define IsHiddenColumn(X) ((X)->isHidden) +# define IsHiddenColumn(X) (((X)->colFlags & COLFLAG_HIDDEN)!=0) #else # define IsVirtual(X) 0 # define IsHiddenColumn(X) 0 @@ -10674,13 +10749,15 @@ struct Expr { ExprList *pList; /* Function arguments or in " IN ( IN (