HAVE_CXX11_OVERRIDE is required on all supported toolchains
Change-Id: Ibc5462642d0a3cd0f96668472ddc0ac0ae407132
This commit is contained in:
parent
bff4c13475
commit
b08247a12b
@ -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
|
||||
|
29
configure.ac
29
configure.ac
@ -6191,35 +6191,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 ==================================
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user