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

Vs140 vs150 builds (#1903)

Browse Source 
* Remove protecting guard #if __cplusplus >= 201103L

* Fix for building vs140 testsuite projects

* Remove protecting guard #if __cplusplus >= 201103L

* Fix vs150 testsuite projects

* Add   - git submodule update --init --recursive

* set PLATFORMSW=/p:Platform=Win32 or set PLATFORMSW=/p:Platform=x64

* Fix usage of POCO_EXTERNAL_OPENSSL

* Reorder build matrix

* Add FTPS client tests

* Remove useless string constants

* Update xcopy prebuild step ith new openssl lib/dll names

* Remove input lib libeayxx.lib
This commit is contained in:
zosrothko
2017-09-25 17:49:24 +02:00
committed by Aleksandar Fabijanic
parent 38c4e35c43
commit 029f06d986
21 changed files with 91 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/MySQL/testsuite/src/MySQLTest.cpp
View File

@@ -563,7 +563,6 @@ void MySQLTest::testTupleVector()
_pExecutor->tupleVector();
}
#if __cplusplus >= 201103L
void MySQLTest::testStdTuple()
{
@@ -582,7 +581,6 @@ void MySQLTest::testStdTupleVector()
_pExecutor->stdTupleVector();
}
#endif // __cplusplus >= 201103L
void MySQLTest::testInternalExtraction()
{
@@ -1006,10 +1004,8 @@ CppUnit::Test* MySQLTest::suite()
CppUnit_addTest(pSuite, MySQLTest, testDynamicAny);
CppUnit_addTest(pSuite, MySQLTest, testTuple);
CppUnit_addTest(pSuite, MySQLTest, testTupleVector);
#if __cplusplus >= 201103L
CppUnit_addTest(pSuite, MySQLTest, testStdTuple);
CppUnit_addTest(pSuite, MySQLTest, testStdTupleVector);
#endif
CppUnit_addTest(pSuite, MySQLTest, testInternalExtraction);
CppUnit_addTest(pSuite, MySQLTest, testNull);
CppUnit_addTest(pSuite, MySQLTest, testNullableInt);

4
Data/MySQL/testsuite/src/MySQLTest.h
View File

@@ -91,13 +91,9 @@ public:
void testTuple();
void testTupleVector();
#if __cplusplus >= 201103L
void testStdTuple();
void testStdTupleVector();
#endif
void testInternalExtraction();
void testNull();

5
Data/MySQL/testsuite/src/SQLExecutor.cpp
View File

@@ -29,9 +29,7 @@
#include "Poco/Data/MySQL/Connector.h"
#include "Poco/Data/MySQL/MySQLException.h"
#if __cplusplus >= 201103L
#include <tuple>
#endif
#if POCO_MSVS_VERSION == 2015
#define HAVE_STRUCT_TIMESPEC
@@ -1622,7 +1620,6 @@ void SQLExecutor::tupleVector()
poco_assert (ret == v);
}
#if __cplusplus >= 201103L
void SQLExecutor::stdTuples()
{
@@ -1672,8 +1669,6 @@ void SQLExecutor::stdTupleVector()
poco_assert (ret == v);
}
#endif //__cplusplus >= 201103L
void SQLExecutor::internalExtraction()
{

2
Data/MySQL/testsuite/src/SQLExecutor.h
View File

@@ -92,10 +92,8 @@ public:
void tuples();
void tupleVector();
#if __cplusplus >= 201103L
void stdTuples();
void stdTupleVector();
#endif
void internalExtraction();
void doNull();