configure.in | 6 +++--- moz/makefile.mk | 1 - moz/patches/seamonkey-1.1.14.source-typeof.patch | 18 ------------------ solenv/gbuild/platform/WNT_INTEL_GCC.mk | 2 +- solenv/gbuild/platform/unxgcc.mk | 2 +- 5 files changed, 5 insertions(+), 24 deletions(-)
New commits: commit 5fd1a34816b81fee6f54ad93d0047daaeaea51c1 Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Fri Feb 24 13:25:32 2012 +0100 Revert "Work around g++ -std=c++0x rejecting "typeof" keyword" We now default to -std=gnu++0x, so this shouldn't be necessary. This reverts commit 437fe5a444411f68d1848c49121394f16f09611b. diff --git a/moz/makefile.mk b/moz/makefile.mk index 4146f41..7f926e5 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -88,7 +88,6 @@ PATCH_FILES = \ patches/nss-linux3.patch \ patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \ patches/clang_missing_this_pointers.patch \ - patches/seamonkey-1.1.14.source-typeof.patch # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) diff --git a/moz/patches/seamonkey-1.1.14.source-typeof.patch b/moz/patches/seamonkey-1.1.14.source-typeof.patch deleted file mode 100644 index 632e155..0000000 --- a/moz/patches/seamonkey-1.1.14.source-typeof.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- misc/mozilla/xpcom/base/nscore.h 2006-08-24 23:46:32.000000000 +0200 -+++ misc/build/mozilla/xpcom/base/nscore.h 2012-02-21 09:22:51.136057997 +0100 -@@ -211,9 +211,14 @@ - * when http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11893 is fixed. - */ - -+// At least "g++ (GCC) 4.6.2 20111027 (Red Hat 4.6.2-1)" with -std=c++0x no -+// longer recognizes "typeof" as a (GCC extension) keyword (an alternative fix -+// might be to check the GCC version, as the bug mentioned above is reportedly -+// fixed in GCC 4.4.3, see -+// <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9381#c15>): - #ifdef __GNUC__ - #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \ -- typeof(&class::func) name -+ __typeof__(&class::func) name - #else - #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \ - ret (NS_STDCALL class::*name) args commit 1cf7ab61a71d4b7295942ff5c855896e60c15081 Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Fri Feb 24 13:24:01 2012 +0100 use -std=gnu++0x rather than -std=c++0x The gcc default for C++ is -std=gnu++98, and -std=c++98 is used explicitly or with -ansi, so the C++0x "default" should be gnu++0x. diff --git a/configure.in b/configure.in index cefc6e8..9c24409 100644 --- a/configure.in +++ b/configure.in @@ -4333,9 +4333,9 @@ if test "$GCC" = "yes"; then AC_MSG_RESULT([no]) fi - AC_MSG_CHECKING([whether $CC supports -std=c++0x without Language Defect 757]) + AC_MSG_CHECKING([whether $CC supports -std=gnu++0x without Language Defect 757]) save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS -std=c++0x" + CXXFLAGS="$CXXFLAGS -std=gnu++0x" AC_LANG_PUSH([C++]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -6702,7 +6702,7 @@ if test "$with_system_mdds" = "yes"; then dnl =================================================================== AC_MSG_CHECKING([which hash container mdds shall use]) if test "x$HAVE_CXX0X" = "xTRUE"; then - MDDS_CPPFLAGS="-std=c++0x" + MDDS_CPPFLAGS="-std=gnu++0x" AC_MSG_RESULT([std::unordered_map]) else MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST" diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 43d0d28..bf6155b 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -75,7 +75,7 @@ endif ifeq ($(HAVE_CXX0X),TRUE) # We can turn on additional useful checks with c++0x -# FIXME still does not compile fully gb_CXXFLAGS += -std=c++0x +# FIXME still does not compile fully gb_CXXFLAGS += -std=gnu++0x endif gb_LinkTarget_EXCEPTIONFLAGS += \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 51693c9..67871be 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -103,7 +103,7 @@ endif ifeq ($(HAVE_CXX0X),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 +gb_CXXFLAGS += -std=gnu++0x #We have so many std::auto_ptr uses that we need to be able to disable #warnings for those so that -Werror continues to be useful, seeing as moving
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits