[Libreoffice-commits] .: connectivity/source fpicker/source oox/source

[Tor Lillqvist]

 connectivity/source/manager/mdrivermanager.cxx |    2 ++
 fpicker/source/office/OfficeControlAccess.cxx  |    2 ++
 oox/source/helper/containerhelper.cxx          |    4 ++++
 3 files changed, 8 insertions(+)

New commits:
commit a647a54cd1832582d3ebbe47adf024fed9f9ec0b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 26 23:24:04 2011 +0300

    More #define _HAS_ITERATOR_DEBUGGING 0 to fix _DEBUG MSVC builds

diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 812abd6..d9ea11e 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -26,10 +26,12 @@
  *
  ************************************************************************/
 
+#ifdef _MSC_VER
 // Avoid problem due to dubious std::equal_range usage when building
 // with MSVC in --enable-dbgutil mode (i.e. _DEBUG defined, using the
 // debugging C/C++ runtime)
 #define _HAS_ITERATOR_DEBUGGING 0
+#endif
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 74bd77b..8a0f0a1 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -26,7 +26,9 @@
  *
  ************************************************************************/
 
+#ifdef _MSC_VER
 #define _HAS_ITERATOR_DEBUGGING 0
+#endif
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_fpicker.hxx"
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index b4af735..ff0c043 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -26,6 +26,10 @@
  *
  ************************************************************************/
 
+#ifdef _MSC_VER
+#define _HAS_ITERATOR_DEBUGGING 0
+#endif
+
 #include "oox/helper/containerhelper.hxx"
 
 #include <com/sun/star/container/XIndexContainer.hpp>