8 files changed, 4 insertions, 34 deletions
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index e07d24e3ae96..8b9b49d75f22 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -30,7 +30,7 @@
 
 #include "TResultSetHelper.hxx"
 #include <rtl/alloc.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <vector>
 #include "connectivity/dbtoolsdllapi.hxx"
 
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index 33f504349679..585c9ff20a02 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -29,12 +29,10 @@
 #ifndef _CONNECTIVITY_ADO_APREPAREDSTATEMENT_HXX_
 #define _CONNECTIVITY_ADO_APREPAREDSTATEMENT_HXX_
 
-
 #include "ado/AStatement.hxx"
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-//  #include <com/sun/star/sdbc/XClearParameters.hpp>
 #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index ad684d307ba4..b34fec336685 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -36,8 +36,6 @@
 #include <ocidl.h>
 #include <adoint.h>
 #include "ado_post_sys_include.h"
-
-
 #include "ado/adoimp.hxx"
 #include "ado/Aolewrap.hxx"
 #include "ado/Aolevariant.hxx"
@@ -75,53 +73,36 @@ namespace connectivity
             WpADOProperties get_Properties() const;
 
              rtl::OUString GetConnectionString() const;
-
              sal_Bool PutConnectionString(const ::rtl::OUString &aCon) const;
-
              sal_Int32 GetCommandTimeout() const;
-
              void PutCommandTimeout(sal_Int32 nRet);
-
              sal_Int32 GetConnectionTimeout() const ;
-
              void PutConnectionTimeout(sal_Int32 nRet);
 
              sal_Bool Close( ) ;
-
              sal_Bool Execute(const ::rtl::OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset);
-
              sal_Bool BeginTrans();
-
              sal_Bool CommitTrans( ) ;
-
              sal_Bool RollbackTrans( );
-
              sal_Bool Open(const ::rtl::OUString& ConnectionString, const ::rtl::OUString& UserID,const ::rtl::OUString& Password,long Options);
-
              sal_Bool GetErrors(ADOErrors** pErrors);
 
              ::rtl::OUString GetDefaultDatabase() const;
-
              sal_Bool PutDefaultDatabase(const ::rtl::OUString& _bstr);
 
              IsolationLevelEnum get_IsolationLevel() const ;
-
              sal_Bool put_IsolationLevel(const IsolationLevelEnum& eNum) ;
 
              sal_Int32 get_Attributes() const;
-
              sal_Bool put_Attributes(sal_Int32 nRet);
 
              CursorLocationEnum get_CursorLocation() const;
-
              sal_Bool put_CursorLocation(const CursorLocationEnum &eNum) ;
 
              ConnectModeEnum get_Mode() const;
-
              sal_Bool put_Mode(const ConnectModeEnum &eNum) ;
 
              ::rtl::OUString get_Provider() const;
-
              sal_Bool put_Provider(const ::rtl::OUString& _bstr);
 
              sal_Int32 get_State() const;
@@ -223,9 +204,7 @@ namespace connectivity
             //////////////////////////////////////////////////////////////////////
 
              ::rtl::OUString GetDescription() const;
-
              ::rtl::OUString GetSource() const ;
-
              sal_Int32 GetNumber() const ;
              ::rtl::OUString GetSQLState() const ;
              sal_Int32 GetNativeError() const ;
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index f6e7eee77ed9..79cfd67eda3c 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-//  #include <com/sun/star/sdbc/XClearParameters.hpp>
 #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include "file/FResultSet.hxx"
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 481f458bc1a6..1fb37bd2cc23 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -28,10 +28,7 @@
 #ifndef _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_
 #define _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_
 
-#if STLPORT_VERSION>=321
-// jni.h needs cstdarg for std::va_list
 #include <cstdarg>
-#endif
 #include <osl/thread.h>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx
index 6042c3cbf7f8..749b57a1db51 100644
--- a/connectivity/source/inc/java/sql/PreparedStatement.hxx
+++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx
@@ -31,7 +31,6 @@
 #include "java/sql/JStatement.hxx"
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
-//  #include <com/sun/star/sdbc/XClearParameters.hpp>
 #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index e0ffbe91b6fc..33633d1e5696 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -107,13 +107,11 @@
 #define SQL_FETCH_PRIOR SQL_FETCH_PREV
 #define SQL_NO_TOTAL (-4)
 
-//  #include "odbc3defs.hxx"
-
 #endif
 
 // In der ODBC.H von Watcom werden Strings als char * erwartet
 // (nicht, wie sonst bei ODBC ueblich, als UCHAR *).
-#if defined( ICC ) || defined( WTC )
+#if defined( ICC )
 #define SDB_ODBC_CHAR unsigned char
 #else
 #define SDB_ODBC_CHAR char
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx
index 8a5004a29b00..87ab6e783337 100644
--- a/connectivity/source/inc/sqlscan.hxx
+++ b/connectivity/source/inc/sqlscan.hxx
@@ -64,8 +64,8 @@ namespace connectivity
 
         virtual sal_Int32 SQLyygetc(void);
         virtual void SQLyyerror(char *fmt);
-        virtual void output(sal_Int32) { OSL_ASSERT("Internal error in sdblex.l: output not possible"); }
-        virtual void ECHO(void) { OSL_ASSERT("Internal error in sdblex.l: ECHO not possible"); }
+        virtual void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); }
+        virtual void ECHO(void) { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); }
         virtual IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const;
 
         // setting the new information before scanning