Author: wyoung
Date: Wed Feb 28 14:50:55 2007
New Revision: 1428

URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1428&view=rev
Log:
Expanded tests for STLport to use new defines due to a change in recent
versions of the library.

Modified:
    trunk/lib/datetime.cpp
    trunk/lib/query.cpp

Modified: trunk/lib/datetime.cpp
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/datetime.cpp?rev=1428&r1=1427&r2=1428&view=diff
==============================================================================
--- trunk/lib/datetime.cpp (original)
+++ trunk/lib/datetime.cpp Wed Feb 28 14:50:55 2007
@@ -190,7 +190,8 @@
 DateTime::DateTime(time_t t)
 {
        struct tm tm;
-#if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(_STLP_VERSION)
+#if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(_STLP_VERSION) && \
+               !defined(_STLP_VERSION_STR)
        // Use thread-safe localtime() replacement included with VS2005 and
        // up, but only when using native RTL, not STLport.
        localtime_s(&tm, &t);

Modified: trunk/lib/query.cpp
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/query.cpp?rev=1428&r1=1427&r2=1428&view=diff
==============================================================================
--- trunk/lib/query.cpp (original)
+++ trunk/lib/query.cpp Wed Feb 28 14:50:55 2007
@@ -32,7 +32,7 @@
 namespace mysqlpp {
 
 Query::Query(Connection* c, bool te) :
-#if defined(_MSC_VER) && !defined(_STLP_VERSION)
+#if defined(_MSC_VER) && !defined(_STLP_VERSION) && !defined(_STLP_VERSION_STR)
 // prevents a double-init memory leak in native VC++ RTL (not STLport!)
 std::ostream(std::_Noinit), 
 #else


_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits

Reply via email to