[Libreoffice-commits] .: Branch 'libreoffice-3-6' - l10ntools/Library_helplinker.mk l10ntools/source sal/inc xmlhelp/Library_ucpchelp1.mk xmlhelp/source

[Libreoffice Gerrit user]

 l10ntools/Library_helplinker.mk               |    6 ++++++
 l10ntools/source/help/HelpCompiler.hxx        |    3 +++
 sal/inc/osl/diagnose.hxx                      |    3 +++
 xmlhelp/Library_ucpchelp1.mk                  |    6 ++++++
 xmlhelp/source/cxxhelp/provider/databases.hxx |    3 +++
 xmlhelp/source/cxxhelp/provider/db.hxx        |    3 +++
 6 files changed, 24 insertions(+)

New commits:
commit c3f8ba41054f52654b2e1ea95d69502c0792f636
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 19 20:44:03 2012 +0200

    fix system-clucene/-boost build with gcc 4.4
    
    Change-Id: I95d23e6728571b3f3a6421a05fec814f7c5d059c
    Signed-off-by: Fridrich Strba <fridrich.strba at graduateinstitute.ch>

diff --git a/l10ntools/Library_helplinker.mk b/l10ntools/Library_helplinker.mk
index 8cabe50..c5fabe3 100644
--- a/l10ntools/Library_helplinker.mk
+++ b/l10ntools/Library_helplinker.mk
@@ -35,6 +35,12 @@ $(eval $(call gb_Library_add_defs,helplinker,\
     -DHELPLINKER_DLLIMPLEMENTATION \
 ))
 
+ifeq ($(HAVE_CXX0X),TRUE)
+$(eval $(call gb_Library_add_defs,helplinker,\
+    -DHAVE_CXX0X \
+))
+endif
+
 $(eval $(call gb_Library_use_libraries,helplinker,\
     sal \
 ))
diff --git a/l10ntools/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx
index 49ebd60..df943b4 100644
--- a/l10ntools/source/help/HelpCompiler.hxx
+++ b/l10ntools/source/help/HelpCompiler.hxx
@@ -30,6 +30,9 @@
 #define HELPCOMPILER_HXX
 
 #include <string>
+#ifndef HAVE_CXX0X
+#define BOOST_NO_0X_HDR_TYPEINDEX
+#endif
 #include <boost/unordered_map.hpp>
 #include <vector>
 #include <list>
diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index 6463d8d..18dc0fe 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -33,6 +33,9 @@
 #include <functional>
 #include <typeinfo>
 
+#ifndef HAVE_CXX0X
+#define BOOST_NO_0X_HDR_TYPEINDEX
+#endif
 #include "boost/unordered_set.hpp"
 #include "osl/diagnose.h"
 #include "osl/interlck.h"
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index 2dfe46f..b398850 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -94,4 +94,10 @@ $(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
     xmlhelp/source/cxxhelp/util/Decompressor \
 ))
 
+ifeq ($(HAVE_CXX0X),TRUE)
+$(eval $(call gb_Library_add_defs,ucpchelp1,\
+    -DHAVE_CXX0X \
+))
+endif
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 028fad1..a7a7ed6 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -31,6 +31,9 @@
 
 #include <set>
 #include <vector>
+#ifndef HAVE_CXX0X
+#define BOOST_NO_0X_HDR_TYPEINDEX
+#endif
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
 #include <osl/mutex.hxx>
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index 402a734..e8ac5ed 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -36,6 +36,9 @@
 
 #include "com/sun/star/ucb/XSimpleFileAccess.hpp"
 
+#ifndef HAVE_CXX0X
+#define BOOST_NO_0X_HDR_TYPEINDEX
+#endif
 #include <boost/unordered_map.hpp>
 #include <rtl/string.hxx>