[Libreoffice-commits] .: helpcompiler/inc helpcompiler/Library_helplinker.mk sal/inc xmlhelp/Library_ucpchelp1.mk xmlhelp/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 19 11:47:44 PDT 2012
helpcompiler/Library_helplinker.mk | 6 ++++++
helpcompiler/inc/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 ed5c2c95b7ec0f6b81e4ad7b8dd481bf8e494b1d
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
diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk
index 8395dd5..17966c4 100644
--- a/helpcompiler/Library_helplinker.mk
+++ b/helpcompiler/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/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index 825a55c..a7c4a16 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/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 55e5bf0..2c7e8c0 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 d98200d..7e867cc 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -91,4 +91,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 2398960..9803dc5 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 f961f96..2b0749f 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -36,6 +36,9 @@
#include "com/sun/star/ucb/XSimpleFileAccess2.hpp"
+#ifndef HAVE_CXX0X
+#define BOOST_NO_0X_HDR_TYPEINDEX
+#endif
#include <boost/unordered_map.hpp>
#include <rtl/string.hxx>
More information about the Libreoffice-commits
mailing list