Connector/ODBC 5 commit: r862 - in trunk/SDK/MYSQLPlus: Library include

[ahristov]

Modified:
   trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
   trunk/SDK/MYSQLPlus/Library/MDescriptorAPD.h
   trunk/SDK/MYSQLPlus/Library/MDescriptorARD.h
   trunk/SDK/MYSQLPlus/Library/MDescriptorIPD.h
   trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.h
   trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h
   trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.h
   trunk/SDK/MYSQLPlus/include/MDescriptor.h
Log:
Add and make destructors virtual, and our build will be
quite more clean from warnings and things will work better!


Modified: trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp	2007-04-11 22:01:10 UTC (rev 861)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptor.cpp	2007-04-11 22:19:29 UTC (rev 862)
@@ -432,7 +432,7 @@
 {
     DBUG_ENTER("MDescriptor::getAllocType");
 
-    DBUG_PRINT("oreturn", ( "%d",  nAllocType ));
+    DBUG_PRINT("oreturn", (SQLSINT_FORMAT, nAllocType));
     DBUG_RETURN( nAllocType );
 }
 
@@ -440,7 +440,7 @@
 {
     DBUG_ENTER("MDescriptor::getArraySize");
 
-    DBUG_PRINT("oreturn", ( "%u",  nArraySize ));
+    DBUG_PRINT("oreturn", (SQLUINT_FORMAT, nArraySize));
     DBUG_RETURN( nArraySize );
 }
 

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorAPD.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorAPD.h	2007-04-11 22:01:10 UTC (rev 861)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorAPD.h	2007-04-11 22:19:29 UTC (rev 862)
@@ -49,6 +49,7 @@
     friend class MDescriptorRecordAPD;
 public:
     MDescriptorAPD( SQLSMALLINT odbcVersion, SQLSMALLINT allocType );
+    virtual ~MDescriptorAPD() {};
 
     /* setters */
     SQLRETURN setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength );

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorARD.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorARD.h	2007-04-11 22:01:10 UTC (rev 861)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorARD.h	2007-04-11 22:19:29 UTC (rev 862)
@@ -41,6 +41,7 @@
     friend class MDescriptorRecordARD;
 public:
     MDescriptorARD( SQLSMALLINT odbcVersion, SQLSMALLINT allocType );
+    virtual ~MDescriptorARD() {};
 
     /* setters */
     SQLRETURN setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength );

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorIPD.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorIPD.h	2007-04-11 22:01:10 UTC (rev 861)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorIPD.h	2007-04-11 22:19:29 UTC (rev 862)
@@ -41,6 +41,7 @@
     friend class MDescriptorRecordIPD;
 public:
     MDescriptorIPD( SQLSMALLINT odbcVersion );
+    virtual ~MDescriptorIPD() {};
 
     /* setters */
     SQLRETURN setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength );

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.h	2007-04-11 22:01:10 UTC (rev 861)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorIRD.h	2007-04-11 22:19:29 UTC (rev 862)
@@ -40,6 +40,7 @@
     friend class MDescriptorRecordIRD;
 public:
     MDescriptorIRD( SQLSMALLINT odbcVersion );
+    virtual ~MDescriptorIRD() {};
 
     /* setters */
     SQLRETURN setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength );

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h	2007-04-11 22:01:10 UTC (rev 861)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h	2007-04-11 22:19:29 UTC (rev 862)
@@ -73,7 +73,7 @@
 #endif
 public:
     MDescriptorRecord( MDescriptor *pDescriptor );
-    ~MDescriptorRecord();
+    virtual ~MDescriptorRecord();
 
     /* setters */
     virtual SQLRETURN setDescRec( SQLSMALLINT nType, SQLSMALLINT nSubType, SQLLEN
nLength, SQLSMALLINT nPrecision, SQLSMALLINT nScale, SQLPOINTER pDataPtr, SQLLEN
*pnStringLengthPtr, SQLLEN *pnIndicatorPtr );

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.h	2007-04-11 22:01:10 UTC (rev 861)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecordARD.h	2007-04-11 22:19:29 UTC (rev 862)
@@ -37,6 +37,7 @@
     friend class MDescriptorARD;
 public:
     MDescriptorRecordARD( MDescriptorARD *pDescriptor );
+    virtual ~MDescriptorRecordARD() {};
 
     /* setters */
     SQLRETURN setDescField( SQLSMALLINT nFieldIdentifier, SQLPOINTER pValuePtr,
SQLINTEGER nBufferLength );

Modified: trunk/SDK/MYSQLPlus/include/MDescriptor.h
===================================================================
--- trunk/SDK/MYSQLPlus/include/MDescriptor.h	2007-04-11 22:01:10 UTC (rev 861)
+++ trunk/SDK/MYSQLPlus/include/MDescriptor.h	2007-04-11 22:19:29 UTC (rev 862)
@@ -109,7 +109,7 @@
     };
 
     MDescriptor( SQLSMALLINT odbcVersion, SQLSMALLINT allocType );
-    ~MDescriptor();
+    virtual ~MDescriptor();
 
     /* setters */
     virtual SQLRETURN setDescField( SQLSMALLINT nRecNumber, SQLSMALLINT nFieldIdentifier,
SQLPOINTER pValuePtr, SQLINTEGER nBufferLength );