diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-06-13 18:41:41 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-06-13 20:08:16 +0200 |
| commit | d7ae9f7743d946845a8379e2fb47666f124e2c87 (patch) | |
| tree | b46508ac54c0e7fdc878be720fdac3fbd983264d /xmlhelp | |
| parent | 5fcd67d436d3a3a0f5332b5a5078e135e40c898b (diff) | |
rename HAVE_CXX0X->HAVE_CXX11 and clean up to #define in a config header
Change-Id: Id13e77fe890301a8510952994a91853568a7aea6
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/Library_ucpchelp1.mk | 6 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.hxx | 4 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/db.hxx | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index f559cb1f5360..9172d808e5e3 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -75,10 +75,4 @@ $(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 85857003761d..5c424c0f2ec2 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -20,9 +20,11 @@ #ifndef _DATABASES_HXX_ #define _DATABASES_HXX_ +#include <config_global.h> + #include <set> #include <vector> -#ifndef HAVE_CXX0X +#if !HAVE_CXX11 #define BOOST_NO_0X_HDR_TYPEINDEX #endif #include <boost/unordered_map.hpp> diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index 79455916627d..f825b6d90b4c 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -21,7 +21,8 @@ #include "com/sun/star/ucb/XSimpleFileAccess3.hpp" -#ifndef HAVE_CXX0X +#include <config_global.h> +#if !HAVE_CXX11 #define BOOST_NO_0X_HDR_TYPEINDEX #endif #include <boost/unordered_map.hpp> |