diff options
| -rw-r--r-- | helpcompiler/Library_helplinker.mk | 6 | ||||
| -rw-r--r-- | helpcompiler/inc/HelpCompiler.hxx | 3 | ||||
| -rw-r--r-- | sal/inc/osl/diagnose.hxx | 3 | ||||
| -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 |
6 files changed, 24 insertions, 0 deletions
diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk index 8395dd5a1467..17966c4c3291 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 825a55c0330f..a7c4a16a995f 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 55e5bf00af6b..2c7e8c001039 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 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> |