[Libreoffice-commits] core.git: 2 commits - configure.ac vcl/source

[Lionel Elie Mamane]

 configure.ac              |    8 ++++----
 vcl/source/app/dbggui.cxx |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit fcc4b3c3ec005d5757339cef604f36cc7749434a
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Mar 16 08:44:19 2013 +0100

    configure.ac: Check for mdds version >= 0.7.0
    
    Change-Id: I183d01d1884f67701523b88064b0dde6f496f67d

diff --git a/configure.ac b/configure.ac
index 175d894..00a47f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7933,10 +7933,10 @@ if test "$with_system_mdds" = "yes"; then
     AC_LANG_PUSH([C++])
     save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $MDDS_CPPFLAGS"
-    AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [],
-        [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], [])
-    AC_CHECK_HEADER(mdds/multi_type_matrix.hpp, [],
-        [AC_MSG_ERROR(mdds/multi_type_matrix.hpp not found. install mdds >= 0.7.0)], [])
+    AC_CHECK_HEADER(mdds/multi_type_vector.hpp, [],
+        [AC_MSG_ERROR(mdds/multi_type_vector.hpp not found. Install mdds >= 0.7.0)], [])
+    AC_CHECK_TYPE(mdds::multi_type_vector<int>::iterator, [],
+        [AC_MSG_ERROR(mdds/multi_type_matrix.hpp does not define multi_type_vector::iterator. Install mdds >= 0.7.0)], [#include <mdds/multi_type_vector.hpp>])
     CPPFLAGS="$save_CPPFLAGS"
     AC_LANG_POP([C++])
 else
commit 04651da19cbd755c2d9a7d399781433c05f9cb97
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Mar 5 07:54:07 2013 +0100

    fdo#61725 workaround
    
    Change-Id: I7d25f293020f366b20ddb9cade1854013857bed2

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 0161df6..7af896f 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1747,7 +1747,7 @@ void ImplDbgTestSolarMutex()
     bool bCheck = ImplGetSVData()->mpDefInst->CheckYieldMutex();
     (void)bCheck;
     OSL_ENSURE( bCheck, "SolarMutex not locked" );
-    assert(bCheck);
+    //assert(bCheck);
 }
 
 // =======================================================================