summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 15:33:22 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:26 +0200
commitb08247a12b43fcd9f86ecd912fce7d69a3e66061 (patch)
tree76633e11779ed2658d18fe97406b1a657b7e7bc5
parentbff4c13475957863bfa7da5bc3bcf82a64a7503a (diff)
HAVE_CXX11_OVERRIDE is required on all supported toolchains
Change-Id: Ibc5462642d0a3cd0f96668472ddc0ac0ae407132
-rw-r--r--config_host/config_global.h.in1
-rw-r--r--configure.ac29
-rw-r--r--include/sal/types.h4
3 files changed, 2 insertions, 32 deletions
diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 1c4ff2c9c8b9..bbebc3efb41b 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -12,7 +12,6 @@ Any change in this header will cause a rebuild of almost everything.
#ifndef CONFIG_GLOBAL_H
#define CONFIG_GLOBAL_H
-#define HAVE_CXX11_OVERRIDE 0
#define HAVE_CXX11_FINAL 0
#define HAVE_CXX11_PERFECT_FORWARDING 0
#define HAVE_CXX11_CONSTEXPR 0
diff --git a/configure.ac b/configure.ac
index 162d89e991f1..47dc1f999673 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6192,35 +6192,6 @@ CXXFLAGS=$save_CXXFLAGS
AC_SUBST(CXXFLAGS_CXX11)
dnl ==================================
-dnl Check for C++11 "override" support
-dnl ==================================
-
-AC_MSG_CHECKING([whether $CXX supports C++11 "override" syntax])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-struct A
-{
- virtual void test();
-};
-
-struct B : A
-{
- virtual void test() override;
-};
-]])],[HAVE_CXX11_OVERRIDE=TRUE],[])
-
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
-if test "$HAVE_CXX11_OVERRIDE" = "TRUE"; then
- AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_CXX11_OVERRIDE])
-else
- AC_MSG_RESULT([no])
-fi
-
-dnl ==================================
dnl Check for C++11 "final" support
dnl ==================================
diff --git a/include/sal/types.h b/include/sal/types.h
index da6849ead524..498a154f1f9f 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -406,12 +406,12 @@ namespace css = ::com::sun::star;
/** C++11 "override" feature.
- With HAVE_CXX11_OVERRIDE, force the method to override a existing method in
+ For LIBO_INTERNAL_ONLY, force the method to override a existing method in
parent, error out if the method with the correct signature does not exist.
@since LibreOffice 4.1
*/
-#if HAVE_CXX11_OVERRIDE
+#if defined LIBO_INTERNAL_ONLY
#define SAL_OVERRIDE override
#else
#define SAL_OVERRIDE