[Libreoffice-commits] core.git: connectivity/source

[Michael Stahl]

 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx |    2 ++
 connectivity/source/sdbcx/VCollection.cxx                      |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 398491236015721e067273657ad3016634b5a166
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 13 20:57:08 2016 +0100

    connectivity: suppress MSVC 2013 --enable-lto warning C4702
    
    Change-Id: I55b27c655de221c10bac6f868a59b0dbd6cd8d32

diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 34ed9b8..f1450a6 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -181,8 +181,10 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum
     }
 
     ::dbtools::throwInvalidColumnException( columnName, *this );
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
     assert(false);
     return 0; // Never reached
+#endif
 }
 
 void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException)
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index a6000c5..f2be688 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -432,7 +432,9 @@ sal_Int32 SAL_CALL OCollection::findColumn( const OUString& columnName ) throw(S
     if ( !m_pElements->exists(columnName) )
     {
         ::dbtools::throwInvalidColumnException( columnName, static_cast< XIndexAccess*>(this) );
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
         assert(false);
+#endif
     }
 
     return m_pElements->findColumn(columnName) + 1; // because columns start at one