From ed5c2c95b7ec0f6b81e4ad7b8dd481bf8e494b1d Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Wed, 19 Sep 2012 20:44:03 +0200
Subject: fix system-clucene/-boost build with gcc 4.4

Change-Id: I95d23e6728571b3f3a6421a05fec814f7c5d059c
---
 xmlhelp/Library_ucpchelp1.mk                  | 6 ++++++
 xmlhelp/source/cxxhelp/provider/databases.hxx | 3 +++
 xmlhelp/source/cxxhelp/provider/db.hxx        | 3 +++
 3 files changed, 12 insertions(+)

(limited to 'xmlhelp')

diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index d98200da17aa..7e867cc96875 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 239896030d98..9803dc50b4d2 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 f961f96ae161..2b0749fc95f7 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>
 
-- 
cgit