diff options
| author | Rene Engelhard <rene@debian.org> | 2012-09-19 20:44:03 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2012-09-19 20:48:22 +0200 |
| commit | ed5c2c95b7ec0f6b81e4ad7b8dd481bf8e494b1d (patch) | |
| tree | d8b253a8e68054f7d6e998079009491561c25d35 /xmlhelp | |
| parent | e989d167485e1e15d0aedef600ee450f01382382 (diff) | |
fix system-clucene/-boost build with gcc 4.4
Change-Id: I95d23e6728571b3f3a6421a05fec814f7c5d059c
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/Library_ucpchelp1.mk | 6 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.hxx | 3 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/db.hxx | 3 |
3 files changed, 12 insertions, 0 deletions
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> |