diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 15:14:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:25 +0200 |
| commit | 27491c28cb67ada0a4c5eaa90eaf589425990582 (patch) | |
| tree | a0bcb7da815e47af023609cdfbe7e24111445603 | |
| parent | 845cc7aa383fcfc7ae564705fe93a95972bb1052 (diff) | |
HAVE_CXX11_DELETE is required on all supported toolchains
Change-Id: I53c746be98972c7024dc2f340738182e46c24241
| -rw-r--r-- | config_host/config_global.h.in | 1 | ||||
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | include/sal/types.h | 4 |
3 files changed, 2 insertions, 27 deletions
diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in index b2aa4da9353d..1c4ff2c9c8b9 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_DELETE 0 #define HAVE_CXX11_OVERRIDE 0 #define HAVE_CXX11_FINAL 0 #define HAVE_CXX11_PERFECT_FORWARDING 0 diff --git a/configure.ac b/configure.ac index 41d080f90477..162d89e991f1 100644 --- a/configure.ac +++ b/configure.ac @@ -6192,30 +6192,6 @@ CXXFLAGS=$save_CXXFLAGS AC_SUBST(CXXFLAGS_CXX11) dnl ================================== -dnl Check for C++11 "= delete" support -dnl ================================== - -AC_MSG_CHECKING([whether $CXX supports C++11 = delete syntax]) -save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" -AC_LANG_PUSH([C++]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -struct A - { - void test() = delete; - }; -]])],[HAVE_CXX11_DELETE=TRUE],[]) - -AC_LANG_POP([C++]) -CXXFLAGS=$save_CXXFLAGS -if test "$HAVE_CXX11_DELETE" = "TRUE"; then - AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_CXX11_DELETE]) -else - AC_MSG_RESULT([no]) -fi - -dnl ================================== dnl Check for C++11 "override" support dnl ================================== diff --git a/include/sal/types.h b/include/sal/types.h index bed4979ae32c..da6849ead524 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -392,13 +392,13 @@ namespace css = ::com::sun::star; /** C++11 "= delete" feature. - With HAVE_CXX11_DELETE, calling a deleted function will cause a compile-time + For LIBO_INTERNAL_ONLY, calling a deleted function will cause a compile-time error, while otherwise it will only cause a link-time error as the declared function is not defined. @since LibreOffice 4.1 */ -#if HAVE_CXX11_DELETE +#if defined LIBO_INTERNAL_ONLY #define SAL_DELETED_FUNCTION = delete #else #define SAL_DELETED_FUNCTION |