OS/2 VisualAge doesn't know about lower case true and false and redefine a for loop...

[wxWidgets.git] / src / common / db.cpp

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 994be49bb4e02a1c30244df1c911036235d7db2a..1bf55b9171821b75fab83f57dd5bae8b836e5203 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -563,7 +563,7 @@ bool wxDb::Open(char *Dsn, char *Uid, char *AuthStr)
 
 bool wxDb::Open(wxDb *copyDb)
 {
 
 bool wxDb::Open(wxDb *copyDb)
 {

-    dsn        = (char *)copyDb->GetDataSourceName();
+    dsn        = (char *)copyDb->GetDatasourceName();

     uid        = (char *)copyDb->GetUsername();
     authStr    = (char *)copyDb->GetPassword();
 
     uid        = (char *)copyDb->GetUsername();
     authStr    = (char *)copyDb->GetPassword();
 


@@ -3032,8 +3032,8 @@ bool wxDb::TableExists(const char *tableName, const char *userID, const char *ta
 
 
 /********** wxDb::TablePrivileges() **********/
 
 
 /********** wxDb::TablePrivileges() **********/

-bool wxDb::TablePrivileges(const char *tableName, const char* priv, const char *schema,
-                           const char *userID, const char *tablePath)
+bool wxDb::TablePrivileges(const char *tableName, const char* priv, const char *userID, 
+                            const char *schema, const char *tablePath)

 {
     wxDbTablePrivilegeInfo  result;
     SDWORD  cbRetVal;
 {
     wxDbTablePrivilegeInfo  result;
     SDWORD  cbRetVal;


@@ -3047,6 +3047,7 @@ bool wxDb::TablePrivileges(const char *tableName, const char* priv, const char *
     wxString UserID;
     wxString TableName;
     
     wxString UserID;
     wxString TableName;
     

+    assert(userID);

     assert(tableName && wxStrlen(tableName));
     
     if (userID)
     assert(tableName && wxStrlen(tableName));
     
     if (userID)


@@ -3452,7 +3453,7 @@ void WXDLLEXPORT wxDbCloseConnections(void)
 }  // wxDbCloseConnections()
 
 
 }  // wxDbCloseConnections()
 
 

-/********** wxDbNumberConnectionsInUse() **********/
+/********** wxDbConnectionsInUse() **********/

 int WXDLLEXPORT wxDbConnectionsInUse(void)
 {
     wxDbList *pList;
 int WXDLLEXPORT wxDbConnectionsInUse(void)
 {
     wxDbList *pList;