[Libreoffice-commits] core.git: solenv/gbuild

Stephan Bergmann sbergman at redhat.com
Wed Oct 1 08:47:41 PDT 2014


 solenv/gbuild/platform/solaris.mk |   11 -----------
 solenv/gbuild/platform/unxgcc.mk  |   11 -----------
 2 files changed, 22 deletions(-)

New commits:
commit e3061a1976a8ebf8e021939f568e52ee736d66d7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 1 17:45:48 2014 +0200

    Drop -Wno-deprecated-declarations workaround
    
    ...for one, all supported GCC versions should HAVE_GCC_PRAGMA_OPERATOR by now;
    for another, there are virtually no uses of std::auto_ptr left.
    
    Change-Id: I5d94c2520d43ff0a4a8f6882ce64ebed888b44ec

diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 94deeef..97f582b 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -84,17 +84,6 @@ gb_CXXFLAGS += -fno-strict-aliasing
 endif
 endif
 
-#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
-#to unique_ptr isn't an option when we must support different compilers
-#
-#When we are using 4.6.0 we can use gcc pragmas to selectively silence auto_ptr
-#warnings in isolation, but for <= 4.5.X we need to globally disable
-#deprecation
-ifeq ($(HAVE_GCC_PRAGMA_OPERATOR),)
-gb_CXXFLAGS += -Wno-deprecated-declarations
-endif
-
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index df68e94..4864f9c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -80,17 +80,6 @@ gb_COMPILERDEFS += \
 
 endif
 
-#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
-#to unique_ptr isn't an option when we must support different compilers
-#
-#When we are using 4.6.0 we can use gcc pragmas to selectively silence auto_ptr
-#warnings in isolation, but for <= 4.5.X we need to globally disable
-#deprecation
-ifeq ($(HAVE_GCC_PRAGMA_OPERATOR),)
-gb_CXXFLAGS += -Wno-deprecated-declarations
-endif
-
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)


More information about the Libreoffice-commits mailing list