Kaydet (Commit) d7ae9f77 authored tarafından Luboš Luňák's avatar Luboš Luňák

rename HAVE_CXX0X->HAVE_CXX11 and clean up to #define in a config header

Change-Id: Id13e77fe890301a8510952994a91853568a7aea6
üst 5fcd67d4
......@@ -209,7 +209,7 @@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
export GUI=@GUI@
export GUIBASE=@GUIBASE@
export HARDLINKDELIVER=@HARDLINKDELIVER@
export HAVE_CXX0X=@HAVE_CXX0X@
export HAVE_CXX11=@HAVE_CXX11@
export HAVE_GCC_AVX=@HAVE_GCC_AVX@
export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
......
......@@ -12,6 +12,8 @@ Any change in this header will cause a rebuild of almost everything.
#ifndef CONFIG_GLOBAL_H
#define CONFIG_GLOBAL_H
/* Prefer using a feature-specific check such as HAVE_CXX11_DELETE to the generic HAVE_CXX11. */
#define HAVE_CXX11 0
#define HAVE_CXX11_DELETE 0
#define HAVE_CXX11_OVERRIDE 0
#define HAVE_CXX11_FINAL 0
......
......@@ -5608,7 +5608,7 @@ size_t j = sizeof(sal_n_array_size(thingb));
return !(i != 0 && j != 0);
]])
],[
HAVE_CXX0X=TRUE
HAVE_CXX11=TRUE
if test "$CPP_LIBRARY" = LIBCPP -a $_os = Darwin; then
: Already set CXX to contain -std=c++11
else
......@@ -5619,7 +5619,7 @@ return !(i != 0 && j != 0);
AC_LANG_POP([C++])
CXXFLAGS=$save_CXXFLAGS
fi
if test "$HAVE_CXX0X" = "TRUE"; then
if test "$HAVE_CXX11" = "TRUE"; then
AC_MSG_RESULT([yes ($CXXFLAGS_CXX11)])
else
AC_MSG_RESULT([no])
......@@ -5627,14 +5627,14 @@ return !(i != 0 && j != 0);
fi
AC_SUBST(CXXFLAGS_CXX11)
AC_SUBST(HAVE_CXX0X)
AC_SUBST(HAVE_CXX11)
dnl ==================================
dnl Check for C++11 "= delete" support
dnl ==================================
AC_MSG_CHECKING([whether $CXX supports C++11 = delete syntax])
if test "$HAVE_CXX0X" = "TRUE"; then
if test "$HAVE_CXX11" = "TRUE"; then
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
AC_LANG_PUSH([C++])
......@@ -5662,7 +5662,7 @@ dnl Check for C++11 "override" support
dnl ==================================
AC_MSG_CHECKING([whether $CXX supports C++11 "override" syntax])
if test "$HAVE_CXX0X" = "TRUE"; then
if test "$HAVE_CXX11" = "TRUE"; then
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
AC_LANG_PUSH([C++])
......@@ -5695,7 +5695,7 @@ dnl Check for C++11 "final" support
dnl ==================================
AC_MSG_CHECKING([whether $CXX supports C++11 "final" syntax])
if test "$HAVE_CXX0X" = "TRUE"; then
if test "$HAVE_CXX11" = "TRUE"; then
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
AC_LANG_PUSH([C++])
......@@ -8035,7 +8035,7 @@ dnl ===================================================================
dnl Determine which hash container mdds shall use
dnl ===================================================================
AC_MSG_CHECKING([which hash container mdds shall use])
if test "x$HAVE_CXX0X" = "xTRUE" -a "x$SYSTEM_MDDS" = "xYES"; then
if test "x$HAVE_CXX11" = "xTRUE" -a "x$SYSTEM_MDDS" = "xYES"; then
MDDS_CPPFLAGS=$CXXFLAGS_CXX11
AC_MSG_RESULT([std::unordered_map])
else
......
......@@ -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 \
......
......@@ -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>
......
......@@ -24,7 +24,9 @@
#include <functional>
#include <typeinfo>
#ifndef HAVE_CXX0X
#include <config_global.h>
#if !HAVE_CXX11
#define BOOST_NO_0X_HDR_TYPEINDEX
#endif
#include "boost/unordered_set.hpp"
......
......@@ -56,7 +56,7 @@ gb_CXXFLAGS += --sysroot=$(SYSBASE)
gb_CFLAGS += --sysroot=$(SYSBASE)
endif
ifeq ($(HAVE_CXX0X),TRUE)
ifeq ($(HAVE_CXX11),TRUE)
gb_CXXFLAGS += -std=gnu++0x
endif
......
......@@ -86,7 +86,7 @@ gb_CFLAGS += -fno-strict-aliasing
gb_CXXFLAGS += -fno-strict-aliasing
endif
ifeq ($(HAVE_CXX0X),TRUE)
ifeq ($(HAVE_CXX11),TRUE)
#Currently, as well as for its own merits, c++11/c++0x mode allows use to use
#a template for SAL_N_ELEMENTS to detect at compiler time its misuse
gb_CXXFLAGS += -std=c++0x
......
......@@ -82,7 +82,7 @@ gb_CFLAGS += -fno-strict-aliasing
gb_CXXFLAGS += -fno-strict-aliasing
endif
ifeq ($(HAVE_CXX0X),TRUE)
ifeq ($(HAVE_CXX11),TRUE)
#Currently, as well as for its own merits, c++11/c++0x mode allows use to use
#a template for SAL_N_ELEMENTS to detect at compiler time its misuse
gb_CXXFLAGS += $(CXXFLAGS_CXX11)
......
......@@ -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:
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment