generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 11:31:53 +01:00
Code Issues Projects Releases Wiki Activity

- added GH #445: Add flag to force POCO to preserve manually #defined target Windows versions

Browse Source 
- fixed SQLite and MySQL broken builds
This commit is contained in:
Alex Fabijanic
2014-05-21 04:47:24 -05:00
parent b7884c6d8c
commit 9d47f3ced8
8 changed files with 154 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Data/include/Poco/Data/AbstractBinder.h
View File

@@ -247,17 +247,17 @@ public:
virtual void bind(std::size_t pos, const std::list<std::string>& val, Direction dir = PD_IN); virtual void bind(std::size_t pos, const std::list<std::string>& val, Direction dir = PD_IN);
/// Binds a string list. /// Binds a string list.
virtual void bind(std::size_t pos, const UTF16String& val, Direction dir = PD_IN) = 0; virtual void bind(std::size_t pos, const UTF16String& val, Direction dir = PD_IN);
/// Binds a string. /// Binds a UTF-16 Unicode string.
virtual void bind(std::size_t pos, const std::vector<UTF16String>& val, Direction dir = PD_IN); virtual void bind(std::size_t pos, const std::vector<UTF16String>& val, Direction dir = PD_IN);
/// Binds a string vector. /// Binds a UTF-16 Unicode string vector.
virtual void bind(std::size_t pos, const std::deque<UTF16String>& val, Direction dir = PD_IN); virtual void bind(std::size_t pos, const std::deque<UTF16String>& val, Direction dir = PD_IN);
/// Binds a string deque. /// Binds a UTF-16 Unicode string deque.
virtual void bind(std::size_t pos, const std::list<UTF16String>& val, Direction dir = PD_IN); virtual void bind(std::size_t pos, const std::list<UTF16String>& val, Direction dir = PD_IN);
/// Binds a string list. /// Binds a UTF-16 Unicode string list.
virtual void bind(std::size_t pos, const BLOB& val, Direction dir = PD_IN) = 0; virtual void bind(std::size_t pos, const BLOB& val, Direction dir = PD_IN) = 0;
/// Binds a BLOB. /// Binds a BLOB.

10
Data/include/Poco/Data/AbstractExtractor.h
View File

@@ -234,17 +234,17 @@ public:
virtual bool extract(std::size_t pos, std::list<std::string>& val); virtual bool extract(std::size_t pos, std::list<std::string>& val);
/// Extracts a string list. /// Extracts a string list.
virtual bool extract(std::size_t pos, UTF16String& val) = 0; virtual bool extract(std::size_t pos, UTF16String& val);
/// Extracts a string. Returns false if null was received. /// Extracts a UTF16String. Returns false if null was received.
virtual bool extract(std::size_t pos, std::vector<UTF16String>& val); virtual bool extract(std::size_t pos, std::vector<UTF16String>& val);
/// Extracts a string vector. /// Extracts a UTF16String vector.
virtual bool extract(std::size_t pos, std::deque<UTF16String>& val); virtual bool extract(std::size_t pos, std::deque<UTF16String>& val);
/// Extracts a string deque. /// Extracts a UTF16String deque.
virtual bool extract(std::size_t pos, std::list<UTF16String>& val); virtual bool extract(std::size_t pos, std::list<UTF16String>& val);
/// Extracts a string list. /// Extracts a UTF16String list.
virtual bool extract(std::size_t pos, BLOB& val) = 0; virtual bool extract(std::size_t pos, BLOB& val) = 0;
/// Extracts a BLOB. Returns false if null was received. /// Extracts a BLOB. Returns false if null was received.

12
Data/include/Poco/Data/AbstractPreparator.h
View File

@@ -238,19 +238,19 @@ public:
/// Prepares a string deque. /// Prepares a string deque.
virtual void prepare(std::size_t pos, const std::list<std::string>& val); virtual void prepare(std::size_t pos, const std::list<std::string>& val);
/// Prepares a character list. /// Prepares a character list.
virtual void prepare(std::size_t pos, const UTF16String&) = 0; virtual void prepare(std::size_t pos, const UTF16String&);
/// Prepares a string. /// Prepares a UTF16String.
virtual void prepare(std::size_t pos, const std::vector<UTF16String>& val); virtual void prepare(std::size_t pos, const std::vector<UTF16String>& val);
/// Prepares a string vector. /// Prepares a UTF16String vector.
virtual void prepare(std::size_t pos, const std::deque<UTF16String>& val); virtual void prepare(std::size_t pos, const std::deque<UTF16String>& val);
/// Prepares a string deque. /// Prepares a UTF16String deque.
virtual void prepare(std::size_t pos, const std::list<UTF16String>& val); virtual void prepare(std::size_t pos, const std::list<UTF16String>& val);
/// Prepares a string list. /// Prepares a UTF16String list.
virtual void prepare(std::size_t pos, const BLOB&) = 0; virtual void prepare(std::size_t pos, const BLOB&) = 0;
/// Prepares a BLOB. /// Prepares a BLOB.

6
Data/src/AbstractBinder.cpp
View File

@@ -292,6 +292,12 @@ void AbstractBinder::bind(std::size_t pos, const std::list<std::string>& val, Di
} }
void AbstractBinder::bind(std::size_t pos, const UTF16String& val, Direction dir)
{
throw NotImplementedException("UTF16String binder must be implemented.");
}
void AbstractBinder::bind(std::size_t pos, const std::vector<UTF16String>& val, Direction dir) void AbstractBinder::bind(std::size_t pos, const std::vector<UTF16String>& val, Direction dir)
{ {
throw NotImplementedException("std::vector binder must be implemented."); throw NotImplementedException("std::vector binder must be implemented.");

12
Data/src/AbstractExtractor.cpp
View File

@@ -286,21 +286,27 @@ bool AbstractExtractor::extract(std::size_t pos, std::list<std::string>& val)
} }
bool AbstractExtractor::extract(std::size_t pos, UTF16String& val)
{
throw NotImplementedException("UTF16String extractor must be implemented.");
}
bool AbstractExtractor::extract(std::size_t pos, std::vector<UTF16String>& val) bool AbstractExtractor::extract(std::size_t pos, std::vector<UTF16String>& val)
{ {
throw NotImplementedException("std::vector extractor must be implemented."); throw NotImplementedException("std::vector<UTF16String> extractor must be implemented.");
} }
bool AbstractExtractor::extract(std::size_t pos, std::deque<UTF16String>& val) bool AbstractExtractor::extract(std::size_t pos, std::deque<UTF16String>& val)
{ {
throw NotImplementedException("std::deque extractor must be implemented."); throw NotImplementedException("std::deque<UTF16String> extractor must be implemented.");
} }
bool AbstractExtractor::extract(std::size_t pos, std::list<UTF16String>& val) bool AbstractExtractor::extract(std::size_t pos, std::list<UTF16String>& val)
{ {
throw NotImplementedException("std::list extractor must be implemented."); throw NotImplementedException("std::list<UTF16String> extractor must be implemented.");
} }

12
Data/src/AbstractPreparator.cpp
View File

@@ -287,21 +287,27 @@ void AbstractPreparator::prepare(std::size_t pos, const std::list<std::string>&
} }
void AbstractPreparator::prepare(std::size_t pos, const UTF16String& val)
{
throw NotImplementedException("UTF16String preparator must be implemented.");
}
void AbstractPreparator::prepare(std::size_t pos, const std::vector<UTF16String>& val) void AbstractPreparator::prepare(std::size_t pos, const std::vector<UTF16String>& val)
{ {
throw NotImplementedException("std::vector preparator must be implemented."); throw NotImplementedException("std::vector<UTF16String> preparator must be implemented.");
} }
void AbstractPreparator::prepare(std::size_t pos, const std::deque<UTF16String>& val) void AbstractPreparator::prepare(std::size_t pos, const std::deque<UTF16String>& val)
{ {
throw NotImplementedException("std::deque preparator must be implemented."); throw NotImplementedException("std::deque<UTF16String> preparator must be implemented.");
} }
void AbstractPreparator::prepare(std::size_t pos, const std::list<UTF16String>& val) void AbstractPreparator::prepare(std::size_t pos, const std::list<UTF16String>& val)
{ {
throw NotImplementedException("std::list preparator must be implemented."); throw NotImplementedException("std::list<UTF16String> preparator must be implemented.");
} }

207
Foundation/include/Poco/Platform_WIN32.h
View File

@@ -24,110 +24,111 @@
#include "Poco/UnWindows.h" #include "Poco/UnWindows.h"
// Determine the real version. #ifndef POCO_FORCE_MIN_WINDOWS_OS_SUPPORT
// This setting can be forced from UnWindows.h // Determine the real version.
#if defined (_WIN32_WINNT_WINBLUE) // This setting can be forced from UnWindows.h
//Windows 8.1 _WIN32_WINNT_WINBLUE (0x0602) #if defined (_WIN32_WINNT_WINBLUE)
#ifdef _WIN32_WINNT //Windows 8.1 _WIN32_WINNT_WINBLUE (0x0602)
#undef _WIN32_WINNT #ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WINBLUE
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WINBLUE
#elif defined (_WIN32_WINNT_WIN8)
//Windows 8 _WIN32_WINNT_WIN8 (0x0602)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WIN8
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WIN8
#elif defined (_WIN32_WINNT_WIN7)
//Windows 7 _WIN32_WINNT_WIN7 (0x0601)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WIN7
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WIN7
#elif defined (_WIN32_WINNT_WS08)
//Windows Server 2008 _WIN32_WINNT_WS08 (0x0600)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WS08
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WS08
#elif defined (_WIN32_WINNT_VISTA)
//Windows Vista _WIN32_WINNT_VISTA (0x0600)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_VISTA
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_VISTA
#elif defined (_WIN32_WINNT_LONGHORN)
//Windows Vista and server 2008 Development _WIN32_WINNT_LONGHORN (0x0600)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_LONGHORN
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION 0x06000000 // hardcoded, VS90 can't find NTDDI_* macros
#elif defined (_WIN32_WINNT_WS03)
//Windows Server 2003 with SP1,
//Windows XP with SP2 _WIN32_WINNT_WS03 (0x0502)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WS03
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WS03
#elif defined (_WIN32_WINNT_WINXP)
//Windows Server 2003, Windows XP _WIN32_WINNT_WINXP (0x0501)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WINXP
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WINXP
#elif defined (_WIN32_WINNT_WIN2K)
//Windows 2000 _WIN32_WINNT_WIN2K (0x0500)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WIN2K
#elif defined (WINVER)
// fail back on WINVER
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT WINVER
#elif !defined(_WIN32_WINNT)
// last resort = Win XP, SP1 is minimum supported
#define _WIN32_WINNT 0x0501
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION 0x05010100
#endif #endif
#define _WIN32_WINNT _WIN32_WINNT_WINBLUE #endif // POCO_FORCE_MIN_WINDOWS_OS_SUPPORT
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WINBLUE
#elif defined (_WIN32_WINNT_WIN8)
//Windows 8 _WIN32_WINNT_WIN8 (0x0602)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WIN8
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WIN8
#elif defined (_WIN32_WINNT_WIN7)
//Windows 7 _WIN32_WINNT_WIN7 (0x0601)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WIN7
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WIN7
#elif defined (_WIN32_WINNT_WS08)
//Windows Server 2008 _WIN32_WINNT_WS08 (0x0600)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WS08
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WS08
#elif defined (_WIN32_WINNT_VISTA)
//Windows Vista _WIN32_WINNT_VISTA (0x0600)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_VISTA
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_VISTA
#elif defined (_WIN32_WINNT_LONGHORN)
//Windows Vista and server 2008 Development _WIN32_WINNT_LONGHORN (0x0600)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_LONGHORN
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION 0x06000000 // hardcoded, VS90 can't find NTDDI_* macros
#elif defined (_WIN32_WINNT_WS03)
//Windows Server 2003 with SP1,
//Windows XP with SP2 _WIN32_WINNT_WS03 (0x0502)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WS03
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WS03
#elif defined (_WIN32_WINNT_WINXP)
//Windows Server 2003, Windows XP _WIN32_WINNT_WINXP (0x0501)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WINXP
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION NTDDI_WINXP
#elif defined (_WIN32_WINNT_WIN2K)
//Windows 2000 _WIN32_WINNT_WIN2K (0x0500)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_WIN2K
#elif defined (WINVER)
// fail back on WINVER
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT WINVER
#elif !defined(_WIN32_WINNT)
// last resort = Win XP, SP1 is minimum supported
#define _WIN32_WINNT 0x0501
#ifdef NTDDI_VERSION
#undef NTDDI_VERSION
#endif
#define NTDDI_VERSION 0x05010100
#endif
#if defined(_MSC_VER) && !defined(POCO_MSVC_SECURE_WARNINGS) && !defined(_CRT_SECURE_NO_DEPRECATE) #if defined(_MSC_VER) && !defined(POCO_MSVC_SECURE_WARNINGS) && !defined(_CRT_SECURE_NO_DEPRECATE)
#define _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE

12
Foundation/include/Poco/UnWindows.h
View File

@@ -57,6 +57,7 @@
// the header file that contains the definition for conditional // the header file that contains the definition for conditional
// definitions.) For more information, see SdkDdkVer.h. // definitions.) For more information, see SdkDdkVer.h.
#if defined(_WIN32_WINNT) #if defined(_WIN32_WINNT)
#if (_WIN32_WINNT < 0x0501) #if (_WIN32_WINNT < 0x0501)
#error Unsupported Windows version. #error Unsupported Windows version.
@@ -68,8 +69,9 @@
#elif !defined(_WIN32_WINNT) #elif !defined(_WIN32_WINNT)
// Define minimum supported version. // Define minimum supported version.
// This can be changed, if needed. // This can be changed, if needed.
// Otherwise, the Platform_WIN32.h will do // If allowed (see POCO_MIN_WINDOWS_OS_SUPPORT
// its best to determine the appropriate values // below), Platform_WIN32.h will do its
// best to determine the appropriate values
// and may redefine these. See Platform_WIN32.h // and may redefine these. See Platform_WIN32.h
// for details. // for details.
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0501
@@ -77,6 +79,12 @@
#endif #endif
// To prevent Platform_WIN32.h to modify version defines,
// uncomment this, otherwise versions will be automatically
// discovered in Platform_WIN32.h.
// #define POCO_FORCE_MIN_WINDOWS_OS_SUPPORT
#include <windows.h> #include <windows.h>