Windows/VS2011 build all configs

This commit is contained in:
Aleksandar Fabijanic
2012-09-23 06:28:42 +00:00
parent 027dc6dd96
commit 883de9670a
16 changed files with 505 additions and 578 deletions

View File

@@ -70,19 +70,7 @@
//
#if defined(_MSC_VER)
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(MySQL_EXPORTS)
#if defined(POCO_DLL)
#if defined(_DEBUG)
#pragma comment(lib, "PocoDataMySQLd.lib")
#else
#pragma comment(lib, "PocoDataMySQL.lib")
#endif
#else
#if defined(_DEBUG)
#pragma comment(lib, "PocoDataMySQLmtd.lib")
#else
#pragma comment(lib, "PocoDataMySQLmt.lib")
#endif
#endif
#pragma comment(lib, "PocoDataMySQL" POCO_LIB_SUFFIX)
#endif
#endif

View File

@@ -79,19 +79,7 @@
//
#if defined(_MSC_VER)
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(ODBC_EXPORTS)
#if defined(POCO_DLL)
#if defined(_DEBUG)
#pragma comment(lib, "PocoDataODBCd.lib")
#else
#pragma comment(lib, "PocoDataODBC.lib")
#endif
#else
#if defined(_DEBUG)
#pragma comment(lib, "PocoDataODBCmtd.lib")
#else
#pragma comment(lib, "PocoDataODBCmt.lib")
#endif
#endif
#pragma comment(lib, "PocoDataODBC" POCO_LIB_SUFFIX)
#endif
#endif

View File

@@ -68,25 +68,12 @@
//
// Automatically link Data library.
// Automatically link SQLite library.
//
#if defined(_MSC_VER)
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(SQLite_EXPORTS)
#if defined(POCO_DLL)
#if defined(_DEBUG)
#pragma comment(lib, "PocoDataSQLited.lib")
#else
#pragma comment(lib, "PocoDataSQLite.lib")
#endif
#else
#if defined(_DEBUG)
#pragma comment(lib, "PocoDataSQLitemtd.lib")
#else
#pragma comment(lib, "PocoDataSQLitemt.lib")
#endif
#endif
#pragma comment(lib, "PocoDataSQLite" POCO_LIB_SUFFIX)
#endif
#endif
#endif // SQLite_SQLite_INCLUDED

View File

@@ -72,19 +72,7 @@
//
#if defined(_MSC_VER)
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(Data_EXPORTS)
#if defined(POCO_DLL)
#if defined(_DEBUG)
#pragma comment(lib, "PocoDatad.lib")
#else
#pragma comment(lib, "PocoData.lib")
#endif
#else
#if defined(_DEBUG)
#pragma comment(lib, "PocoDatamtd.lib")
#else
#pragma comment(lib, "PocoDatamt.lib")
#endif
#endif
#pragma comment(lib, "PocoData" POCO_LIB_SUFFIX)
#endif
#endif

View File

@@ -1197,7 +1197,7 @@ void DataTest::testRowFormat()
SimpleRowFormatter rf;
std::streamsize sz = rf.getColumnWidth();
std::string line(sz * 5, '-');
std::string line(std::string::size_type(sz * 5), '-');
std::ostringstream os;
os << std::left << std::setw(sz) << "field0"
<< std::setw(sz) << "field1"