[Libreoffice-commits] .: dbaccess/source

Michael Stahl mst at kemper.freedesktop.org
Mon Jun 4 11:10:01 PDT 2012


 dbaccess/source/core/api/KeySet.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1ca20c89c0a1f1ca34de4939d6fef66fb68ceff9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jun 4 20:07:26 2012 +0200

    KeySet.cxx: fix boost include; also...
    
    ... BOOST_STATIC_ASSERT_MSG was added in boost 1.46, while the internal
    boost is still at version 1.44, so use BOOST_STATIC_ASSERT instead.
    
    Change-Id: I14f8e48e31956b34a1a907cd2c4e454a5715889b

diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 5d863a8..3a114a9 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -48,6 +48,7 @@
 #include <com/sun/star/sdbcx/KeyType.hpp>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
+#include <boost/static_assert.hpp>
 #include <list>
 #include <algorithm>
 #include <string.h>
@@ -1458,7 +1459,7 @@ sal_Bool OKeySet::fetchRow()
         connectivity::ORowVector< ORowSetValue >::Vector::iterator aFRIter = aFullRow->get().begin();
         // Column 0 is reserved for the bookmark; unused here.
         ++aFRIter;
-        BOOST_STATIC_ASSERT_MSG(sizeof(int) >= sizeof(sal_Int32), "At least a 32 bit word expecteed");
+        BOOST_STATIC_ASSERT(sizeof(int) >= sizeof(sal_Int32)); // "At least a 32 bit word expected"
         for (int i = 1; i <= cc; ++i, ++aFRIter )
         {
             aFRIter->fill(i, m_xSetMetaData->getColumnType(i), m_xDriverRow);


More information about the Libreoffice-commits mailing list