--- libgda-0.2.96/bindings/c++/gdaIncludes.h.c++fixes	2001-12-11 15:08:51.000000000 -0500
+++ libgda-0.2.96/bindings/c++/gdaIncludes.h	2002-04-19 09:54:12.000000000 -0400
@@ -42,6 +42,11 @@
 #include <string>
 #include <vector>
 
+// (gb) Workaround, should be fixed cleanier
+// Don't assume namespace std scope to have global scope
+using std::string;
+using std::vector;
+
 #include "gdaBatch.h"
 #include "gdaCommand.h"
 #include "gdaConnection.h"
--- libgda-0.2.96/bindings/c++/gdaBatch.cpp.c++fixes	2002-04-19 09:58:00.000000000 -0400
+++ libgda-0.2.96/bindings/c++/gdaBatch.cpp	2002-04-19 09:58:12.000000000 -0400
@@ -127,7 +127,7 @@
 }
 
 GdaBatch*
-Batch::getCStruct (bool refn = true) const
+Batch::getCStruct (bool refn) const
 {
 	if (refn)
 	  ref ();
--- libgda-0.2.96/bindings/c++/gdaCommand.cpp.c++fixes	2001-12-07 16:07:48.000000000 -0500
+++ libgda-0.2.96/bindings/c++/gdaCommand.cpp	2002-04-19 09:58:37.000000000 -0400
@@ -139,7 +139,7 @@
 */
 
 GdaCommand*
-Command::getCStruct (bool refn = true) const
+Command::getCStruct (bool refn) const
 {
 	if (refn)
 		ref ();
--- libgda-0.2.96/bindings/c++/gdaConnection.cpp.c++fixes	2001-12-07 16:07:48.000000000 -0500
+++ libgda-0.2.96/bindings/c++/gdaConnection.cpp	2002-04-19 09:59:28.000000000 -0400
@@ -294,7 +294,7 @@
 	return gda_connection_get_version (_gda_connection);
 }
 
-GdaConnection* Connection::getCStruct (bool refn = true) const
+GdaConnection* Connection::getCStruct (bool refn) const
 {
 	if (refn) ref ();
 	return _gda_connection;
--- libgda-0.2.96/bindings/c++/gdaError.cpp.c++fixes	2001-12-07 16:07:48.000000000 -0500
+++ libgda-0.2.96/bindings/c++/gdaError.cpp	2002-04-19 09:59:59.000000000 -0400
@@ -98,7 +98,7 @@
 }
 
 GdaError*
-Error::getCStruct (bool refn = true) const
+Error::getCStruct (bool refn) const
 {
 	if (refn) ref ();
 	return _gda_error;
--- libgda-0.2.96/bindings/c++/gdaField.cpp.c++fixes	2001-12-11 15:16:14.000000000 -0500
+++ libgda-0.2.96/bindings/c++/gdaField.cpp	2002-04-19 10:01:18.000000000 -0400
@@ -428,7 +428,7 @@
 }
 
 GdaField*
-Field::getCStruct (bool refn = true) const
+Field::getCStruct (bool refn) const
 {
 	if (refn) ref ();
 	return _gda_field;
--- libgda-0.2.96/bindings/c++/gdaHelpers.h.c++fixes	2001-11-18 12:21:55.000000000 -0500
+++ libgda-0.2.96/bindings/c++/gdaHelpers.h	2002-04-19 10:01:51.000000000 -0400
@@ -20,6 +20,6 @@
 //#define __gda_helpers_cpp_gdaHelpersH
 
 namespace gda {
-string gda_return_string (gchar* pszString);
+std::string gda_return_string (gchar* pszString);
 };
 //#endif // __gda_helpers_cpp_gdaHelpersH
--- libgda-0.2.96/bindings/c++/gdaHelpers.cpp.c++fixes	2001-11-18 12:21:55.000000000 -0500
+++ libgda-0.2.96/bindings/c++/gdaHelpers.cpp	2002-04-19 10:03:03.000000000 -0400
@@ -23,14 +23,14 @@
 
 //using namespace gda;
 
-string
+std::string
 gda::gda_return_string (gchar* pszString)
 {
        if (NULL == pszString) {
                return "";
        }
 
-       string szString = const_cast<const char*>(pszString);
+       std::string szString = const_cast<const char*>(pszString);
        g_free (pszString);
 
        return szString;
--- libgda-0.2.96/bindings/c++/gdaRecordset.cpp.c++fixes	2001-12-07 16:07:48.000000000 -0500
+++ libgda-0.2.96/bindings/c++/gdaRecordset.cpp	2002-04-19 10:03:38.000000000 -0400
@@ -254,7 +254,7 @@
 }
 
 GdaRecordset*
-Recordset::getCStruct (bool refn = true) const
+Recordset::getCStruct (bool refn) const
 {
 	if (refn) ref ();
 	return _gda_recordset;