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:51:43 +0200 |
| commit | c3f8ba41054f52654b2e1ea95d69502c0792f636 (patch) | |
| tree | 25de6d6cb061650dd1ba24f5dc99b19ef6d8a377 /xmlhelp | |
| parent | 548a623d0cee380464a239ace83995a17d527ef6 (diff) | |
fix system-clucene/-boost build with gcc 4.4
Change-Id: I95d23e6728571b3f3a6421a05fec814f7c5d059c
Signed-off-by: Fridrich Strba <fridrich.strba@graduateinstitute.ch>
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 2dfe46f4edcf..b3988503b581 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 028fad1931bf..a7a7ed64d6c2 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 402a734fc7d9..e8ac5ed86a56 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> |