diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-15 11:55:35 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-15 12:02:59 +0300 |
| commit | 6b457882d011d218ab4764e71fc8d5edfb1d8a87 (patch) | |
| tree | c9c45818703538a9408e882771e7a5f3f519578c | |
| parent | c95d90199397b529de1a9979c065a7f35e52a188 (diff) | |
We can't #define _HAS_ITERATOR_DEBUGGING 0 in just some of the source files
It seems that _HAS_ITERATOR_DEBUGGING affects the layout of some
classes, which of course means horrible breakage if some of the source
files are compiled with it, the rest not.
http://msdn.microsoft.com/en-us/library/aa985939%28v=vs.80%29.aspx
http://connect.microsoft.com/VisualStudio/feedback/details/334315/has-iterator-debugging-0-causes-crash
I will just have to fix the code in this handful of source files so
that it compiles with _DEBUG defined. If I can be bothered.
| -rw-r--r-- | connectivity/source/manager/mdrivermanager.cxx | 7 | ||||
| -rw-r--r-- | fpicker/source/office/OfficeControlAccess.cxx | 4 | ||||
| -rw-r--r-- | oox/source/helper/containerhelper.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/crsr/crbm.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/doc/docbm.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoportenum.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/writer/writer.cxx | 4 |
7 files changed, 0 insertions, 31 deletions
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index d9ea11e6e8d7..be2df41e1744 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -26,13 +26,6 @@ * ************************************************************************/ -#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 8a0f0a18180e..50632bf89d95 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ -#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 ff0c043a1c27..b4af73591530 100644 --- a/oox/source/helper/containerhelper.cxx +++ b/oox/source/helper/containerhelper.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ -#ifdef _MSC_VER -#define _HAS_ITERATOR_DEBUGGING 0 -#endif - #include "oox/helper/containerhelper.hxx" #include <com/sun/star/container/XIndexContainer.hpp> diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx index e5ce3347b2c7..33a2c686ebaa 100644 --- a/sw/source/core/crsr/crbm.cxx +++ b/sw/source/core/crsr/crbm.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ -#ifdef _MSC_VER -#define _HAS_ITERATOR_DEBUGGING 0 -#endif - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 2e3b850da72f..a190c68a42ac 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ -#ifdef _MSC_VER -#define _HAS_ITERATOR_DEBUGGING 0 -#endif - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 42e6c9681934..75ec0c841f5e 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ -#ifdef _MSC_VER -#define _HAS_ITERATOR_DEBUGGING 0 -#endif - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 47dc806c66b7..bbda865358aa 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ -#ifdef _MSC_VER -#define _HAS_ITERATOR_DEBUGGING 0 -#endif - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" |