generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-17 03:03:23 +02:00
Code Issues Projects Releases Wiki Activity

- VS 80 build & OS version detection

Browse Source 
- SF #3564756: iOS trunk compile fix
This commit is contained in:
Aleksandar Fabijanic
2012-09-11 02:02:23 +00:00
parent 70dbe84a31
commit 69be5d7e98
25 changed files with 177 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Data/MySQL/include/Poco/Data/MySQL/Binder.h
View File

@@ -88,6 +88,9 @@ public:
#ifndef POCO_LONG_IS_64_BIT
virtual void bind(std::size_t pos, const long& val, Direction dir = PD_IN);
/// Binds a long.
virtual void bind(std::size_t pos, const unsigned long& val, Direction dir = PD_IN);
/// Binds an unsigned long.
#endif
virtual void bind(std::size_t pos, const bool& val, Direction dir);

4
Data/MySQL/include/Poco/Data/MySQL/Extractor.h
View File

@@ -95,6 +95,10 @@ public:
#ifndef POCO_LONG_IS_64_BIT
virtual bool extract(std::size_t pos, long& val);
/// Extracts a long. Returns false if null was received.
virtual bool extract(std::size_t pos, unsigned long& val);
/// Extracts an unsigned long. Returns false if null was received.
#endif
virtual bool extract(std::size_t pos, bool& val);

7
Data/MySQL/src/Binder.cpp
View File

@@ -114,6 +114,13 @@ void Binder::bind(std::size_t pos, const long& val, Direction dir)
poco_assert(dir == PD_IN);
realBind(pos, MYSQL_TYPE_LONGLONG, &val, 0);
}
void Binder::bind(std::size_t pos, const unsigned long& val, Direction dir)
{
poco_assert(dir == PD_IN);
realBind(pos, MYSQL_TYPE_LONGLONG, &val, 0);
}
#endif

9
Data/MySQL/src/Extractor.cpp
View File

@@ -104,9 +104,14 @@ bool Extractor::extract(std::size_t pos, Poco::UInt64& val)
#ifndef POCO_LONG_IS_64_BIT
bool Extractor::extract(std::size_t pos, long& val)
/// Extracts a long. Returns false if null was received.
{
return realExtractFixed(pos, MYSQL_TYPE_LONGLONG, &val);
return realExtractFixed(pos, MYSQL_TYPE_LONG, &val);
}
bool Extractor::extract(std::size_t pos, unsigned long& val)
{
return realExtractFixed(pos, MYSQL_TYPE_LONG, &val);
}
#endif

9
Data/ODBC/include/Poco/Data/ODBC/Binder.h
View File

@@ -199,6 +199,9 @@ public:
void bind(std::size_t pos, const long& val, Direction dir);
/// Binds a long.
void bind(std::size_t pos, const unsigned long& val, Direction dir);
/// Binds an unsigned long.
void bind(std::size_t pos, const std::vector<long>& val, Direction dir);
/// Binds a long vector.
@@ -1120,6 +1123,12 @@ inline void Binder::bind(std::size_t pos, const long& val, Direction dir)
}
inline void Binder::bind(std::size_t pos, const unsigned long& val, Direction dir)
{
bindImpl(pos, val, SQL_C_SLONG, dir);
}
inline void Binder::bind(std::size_t pos, const std::vector<long>& val, Direction dir)
{
bindImplVec(pos, val, SQL_C_SLONG, dir);

3
Data/ODBC/include/Poco/Data/ODBC/Extractor.h
View File

@@ -177,6 +177,9 @@ public:
bool extract(std::size_t pos, long& val);
/// Extracts a long.
bool extract(std::size_t pos, unsigned long& val);
/// Extracts an unsigned long.
bool extract(std::size_t pos, std::vector<long>& val);
/// Extracts a long vector.

9
Data/ODBC/include/Poco/Data/ODBC/Preparator.h
View File

@@ -226,6 +226,9 @@ public:
void prepare(std::size_t pos, const long& val);
/// Prepares a long.
void prepare(std::size_t pos, const unsigned long& val);
/// Prepares an unsigned long.
void prepare(std::size_t pos, const std::vector<long>& val);
/// Prepares a long vector.
@@ -875,6 +878,12 @@ inline void Preparator::prepare(std::size_t pos, const long&)
}
inline void Preparator::prepare(std::size_t pos, const unsigned long&)
{
prepareFixedSize<long>(pos, SQL_C_SLONG);
}
inline void Preparator::prepare(std::size_t pos, const std::vector<long>& val)
{
prepareFixedSize<long>(pos, SQL_C_SLONG, val.size());

9
Data/ODBC/src/Extractor.cpp
View File

@@ -517,6 +517,15 @@ bool Extractor::extract(std::size_t pos, long& val)
}
bool Extractor::extract(std::size_t pos, unsigned long& val)
{
if (Preparator::DE_MANUAL == _dataExtraction)
return extractManualImpl(pos, val, SQL_C_SLONG);
else
return extractBoundImpl(pos, val);
}
bool Extractor::extract(std::size_t pos, std::vector<long>& val)
{
if (Preparator::DE_BOUND == _dataExtraction)

3
Data/SQLite/include/Poco/Data/SQLite/Binder.h
View File

@@ -90,6 +90,9 @@ public:
#ifndef POCO_LONG_IS_64_BIT
void bind(std::size_t pos, const long &val, Direction dir);
/// Binds a long
void bind(std::size_t pos, const unsigned long &val, Direction dir);
/// Binds an unsigned long
#endif
void bind(std::size_t pos, const bool &val, Direction dir);

3
Data/SQLite/include/Poco/Data/SQLite/Extractor.h
View File

@@ -99,6 +99,9 @@ public:
#ifndef POCO_LONG_IS_64_BIT
bool extract(std::size_t pos, long& val);
/// Extracts a long.
bool extract(std::size_t pos, unsigned long& val);
/// Extracts an unsigned long.
#endif
bool extract(std::size_t pos, bool& val);

7
Data/SQLite/src/Binder.cpp
View File

@@ -85,6 +85,13 @@ void Binder::bind(std::size_t pos, const long &val, Direction dir)
int rc = sqlite3_bind_int(_pStmt, (int) pos, tmp);
checkReturn(rc);
}
void Binder::bind(std::size_t pos, const unsigned long &val, Direction dir)
{
long tmp = static_cast<long>(val);
int rc = sqlite3_bind_int(_pStmt, (int) pos, tmp);
checkReturn(rc);
}
#endif

8
Data/SQLite/src/Extractor.cpp
View File

@@ -92,6 +92,14 @@ bool Extractor::extract(std::size_t pos, long& val)
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

2
Data/SQLite/testsuite/src/SQLiteTest.cpp
View File

@@ -288,7 +288,7 @@ void SQLiteTest::testBinding()
tmp << "SELECT name FROM sqlite_master WHERE tbl_name=?", use(tableName), into(result), now;
assert (result == tableName);
// following will not compile:
// following should not compile:
//tmp << "INSERT INTO Simpsons VALUES(?, ?, ?, ?)", use("Simpson"), use("Bart"), use("Springfield"), use(age), now;
//tmp << "INSERT INTO Simpsons VALUES(?, ?, ?, ?)", use(lastName), use(firstName), use(address), use(12), now;
//tmp << "INSERT INTO Simpsons VALUES(?, ?, ?, ?)", useRef(lastName), useRef(firstName), useRef(address), useRef(12), now;

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

@@ -190,6 +190,9 @@ public:
virtual void bind(std::size_t pos, const long& val, Direction dir = PD_IN) = 0;
/// Binds a long.
virtual void bind(std::size_t pos, const unsigned long& val, Direction dir = PD_IN) = 0;
/// Binds an unsiged long.
virtual void bind(std::size_t pos, const std::vector<long>& val, Direction dir = PD_IN);
/// Binds a long vector.

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

@@ -178,6 +178,9 @@ public:
virtual bool extract(std::size_t pos, long& val) = 0;
/// Extracts a long. Returns false if null was received.
virtual bool extract(std::size_t pos, unsigned long& val) = 0;
/// Extracts an unsigned long. Returns false if null was received.
virtual bool extract(std::size_t pos, std::vector<long>& val);
/// Extracts a long vector.

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

@@ -184,6 +184,9 @@ public:
virtual void prepare(std::size_t pos, const long&) = 0;
/// Prepares a long.
virtual void prepare(std::size_t pos, const unsigned long&) = 0;
/// Prepares an unsigned long.
virtual void prepare(std::size_t pos, const std::vector<long>& val);
/// Prepares a long vector.

5
Data/testsuite/src/Binder.cpp
View File

@@ -94,6 +94,11 @@ void Binder::bind(std::size_t pos, const Poco::UInt64 &val, Direction dir)
void Binder::bind(std::size_t pos, const long& val, Direction dir)
{
}
void Binder::bind(std::size_t pos, const unsigned long& val, Direction dir)
{
}
#endif

3
Data/testsuite/src/Binder.h
View File

@@ -81,6 +81,9 @@ public:
#ifndef POCO_LONG_IS_64_BIT
void bind(std::size_t pos, const long& val, Direction dir);
/// Binds a long.
void bind(std::size_t pos, const unsigned long& val, Direction dir);
/// Binds an unsigned long.
#endif
void bind(std::size_t pos, const bool &val, Direction dir);

7
Data/testsuite/src/Extractor.cpp
View File

@@ -105,6 +105,13 @@ bool Extractor::extract(std::size_t pos, long& val)
val = 0;
return true;
}
bool Extractor::extract(std::size_t pos, unsigned long& val)
{
val = 0;
return true;
}
#endif

3
Data/testsuite/src/Extractor.h
View File

@@ -87,6 +87,9 @@ public:
#ifndef POCO_LONG_IS_64_BIT
bool extract(std::size_t pos, long& val);
/// Extracts a long.
bool extract(std::size_t pos, unsigned long& val);
/// Extracts an unsigned long.
#endif
bool extract(std::size_t pos, bool& val);

5
Data/testsuite/src/Preparator.cpp
View File

@@ -94,6 +94,11 @@ void Preparator::prepare(std::size_t pos, const Poco::UInt64&)
void Preparator::prepare(std::size_t pos, const long&)
{
}
void Preparator::prepare(std::size_t pos, const unsigned long&)
{
}
#endif

3
Data/testsuite/src/Preparator.h
View File

@@ -82,6 +82,9 @@ public:
#ifndef POCO_LONG_IS_64_BIT
void prepare(std::size_t pos, const long&);
/// Preparations a long.
void prepare(std::size_t pos, const unsigned long&);
/// Preparations an unsigned long.
#endif
void prepare(std::size_t pos, const bool&);

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

@@ -41,7 +41,56 @@
#define Foundation_Platform_WIN32_INCLUDED
#if defined(_MSC_VER) && !defined(POCO_MSVC_SECURE_WARNINGS)
#include "Poco/UnWindows.h"
// determine the real version
#if defined(_WIN32_WINNT_WIN7)
//Windows 7 _WIN32_WINNT_WIN7 (0x0601)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_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
#elif defined (_WIN32_WINNT_VISTA) || defined (_WIN32_WINNT_LONGHORN)
//Windows Vista _WIN32_WINNT_VISTA (0x0600)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT _WIN32_WINNT_VISTA
#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
#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
#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)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT WINVER
#endif
#if defined(_MSC_VER) && !defined(POCO_MSVC_SECURE_WARNINGS) && !defined(_CRT_SECURE_NO_DEPRECATE)
#define _CRT_SECURE_NO_DEPRECATE
#endif
@@ -59,34 +108,6 @@
#endif
#if !defined(_WIN32_WINNT)
#if defined(_WIN32_WINNT_WIN7)
//Windows 7 _WIN32_WINNT_WIN7 (0x0601)
#define _WIN32_WINNT _WIN32_WINNT_WIN7
#elif defined (_WIN32_WINNT_WS08)
//Windows Server 2008 _WIN32_WINNT_WS08 (0x0600)
#define _WIN32_WINNT _WIN32_WINNT_WS08
#elif defined (_WIN32_WINNT_VISTA) || defined (_WIN32_WINNT_LONGHORN)
//Windows Vista _WIN32_WINNT_VISTA (0x0600)
#define _WIN32_WINNT _WIN32_WINNT_VISTA
#elif defined (_WIN32_WINNT_WS03)
//Windows Server 2003 with SP1,
//Windows XP with SP2 _WIN32_WINNT_WS03 (0x0502)
#define _WIN32_WINNT _WIN32_WINNT_WS03
#elif defined (_WIN32_WINNT_WINXP)
//Windows Server 2003, Windows XP _WIN32_WINNT_WINXP (0x0501)
#define _WIN32_WINNT _WIN32_WINNT_WINXP
#elif defined (_WIN32_WINNT_WIN2K)
//Windows 2000 _WIN32_WINNT_WIN2K (0x0500)
#define _WIN32_WINNT _WIN32_WINNT_WIN2K
#elif defined (WINVER)
#define _WIN32_WINNT WINVER
#else
#define _WIN32_WINNT 0x0601
#endif
#endif
#if (_MSC_VER >= 1300) && (_MSC_VER < 1400) // Visual Studio 2003, MSVC++ 7.1
#define POCO_MSVS_VERSION 2003
#define POCO_MSVC_VERSION 71

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

@@ -54,6 +54,11 @@
// DEALINGS IN THE SOFTWARE.
//
#ifndef Foundation_UnWindows_INCLUDED
#define Foundation_UnWindows_INCLUDED
// Reduce bloat
#if defined(_WIN32)
#if !defined(WIN32_LEAN_AND_MEAN) && !defined(POCO_BLOATED_WIN32)
@@ -62,12 +67,20 @@
#endif
#if defined(_WIN32_WINNT) && (_WIN32_WINNT < 0x0501)
#error unsupported OS version
#elif !defined(_WIN32_WINNT)
// define minimum supported
#define _WIN32_WINNT 0x0501
#endif
#include <windows.h>
#if !defined(POCO_NO_UNWINDOWS)
// A list of annoying macros to #undef.
// Feel free to extend as required.
// Extend as required.
#undef GetBinaryType
#undef GetShortPathName
#undef GetLongPathName
@@ -115,3 +128,5 @@
#undef GetVersion
#undef GetObject
#endif // POCO_NO_UNWINDOWS
#endif // Foundation_UnWindows_INCLUDED

3
PDF/include/Poco/PDF/PDF.h
View File

@@ -41,6 +41,9 @@
#ifndef PDF_PDF_INCLUDED
#define PDF_PDF_INCLUDED
#if defined(_MSC_VER) && !defined(POCO_MSVC_SECURE_WARNINGS) && !defined(_CRT_SECURE_NO_DEPRECATE)
#define _CRT_SECURE_NO_DEPRECATE
#endif
#include "Poco/Foundation.h"
#include "hpdf.h"