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 /helpcompiler | |
| parent | 5fcd67d436d3a3a0f5332b5a5078e135e40c898b (diff) | |
rename HAVE_CXX0X->HAVE_CXX11 and clean up to #define in a config header
Change-Id: Id13e77fe890301a8510952994a91853568a7aea6
Diffstat (limited to 'helpcompiler')
| -rw-r--r-- | helpcompiler/Library_helplinker.mk | 6 | ||||
| -rw-r--r-- | helpcompiler/inc/HelpCompiler.hxx | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk index 80c2d189438e..cd45eb020277 100644 --- a/helpcompiler/Library_helplinker.mk +++ b/helpcompiler/Library_helplinker.mk @@ -19,12 +19,6 @@ $(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 \ comphelper \ diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index 60fd2778b2d5..b1e7ab85fc41 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -20,8 +20,10 @@ #ifndef HELPCOMPILER_HXX #define HELPCOMPILER_HXX +#include <config_global.h> + #include <string> -#ifndef HAVE_CXX0X +#if !HAVE_CXX11 #define BOOST_NO_0X_HDR_TYPEINDEX #endif #include <boost/unordered_map.hpp> |