More Windows Fixes

silvakid · silvakid · commit 42d85fe3ca59 · 2020-06-15T23:11:41.000+01:00
diff --git a/cppconn/sqlstring.h b/cppconn/sqlstring.h
@@ -40,7 +40,7 @@
 
 namespace sql
 {
-  class CPPCONN_PUBLIC_FUNC SQLString
+  class SQLString
   {
 #ifdef _WIN32
 #pragma warning(push)
diff --git a/test/CJUnitTestsPort/simple/BlobTest.cpp b/test/CJUnitTestsPort/simple/BlobTest.cpp
@@ -123,8 +123,8 @@ void BlobTest::tearDown()
 
     if ( asString )
     {
-      std::string str;
-      testBlobFile->readFile(str);
+      sql::SQLString str;
+      testBlobFile->readFile( const_cast<std::string&>(str.asStdString()) );
 
       pstmt->setString( 1, str );
       pstmt->execute();

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`
`41`	`41`	`namespace sql`
`42`	`42`	`{`
`43`		`- class CPPCONN_PUBLIC_FUNC SQLString`
	`43`	`+ class SQLString`
`44`	`44`	`{`
`45`	`45`	`#ifdef _WIN32`
`46`	`46`	`#pragma warning(push)`
Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,8 @@ void BlobTest::tearDown()`
`123`	`123`
`124`	`124`	`if ( asString )`
`125`	`125`	`{`
`126`		`- std::string str;`
`127`		`- testBlobFile->readFile(str);`
	`126`	`+ sql::SQLString str;`
	`127`	`+ testBlobFile->readFile( const_cast<std::string&>(str.asStdString()) );`
`128`	`128`
`129`	`129`	`pstmt->setString( 1, str );`
`130`	`130`	`pstmt->execute();`