diff options
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 12 | ||||
| -rw-r--r-- | solenv/inc/unxgcc.mk | 4 |
2 files changed, 3 insertions, 13 deletions
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 74034881924a..65aceebbb765 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -105,16 +105,8 @@ ifeq ($(HAVE_CXX0X),TRUE) #a template for SAL_N_ELEMENTS to detect at compiler time its misuse gb_CXXFLAGS += -std=c++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 -#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 ($(gb_GccLess460),1) -gb_CXXFLAGS += -Wno-deprecated-declarations -endif +# Does anybody care if deprecated stuff is used on a release branch? +gb_CXXFLAGS += -Wno-deprecated-declarations -Wno-deprecated endif ifeq ($(ENABLE_LTO),TRUE) diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk index a3231a69d7d6..7ebf7c20d37b 100644 --- a/solenv/inc/unxgcc.mk +++ b/solenv/inc/unxgcc.mk @@ -89,9 +89,7 @@ CFLAGSCXX+=-fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" .IF "$(HAVE_CXX0X)" == "TRUE" CFLAGSCXX+=-std=c++0x -.IF "$(GCCNUMVER)" <= "000400059999" -CFLAGSCXX+=-Wno-deprecated-declarations -.ENDIF +CFLAGSCXX+=-Wno-deprecated-declarations -Wno-deprecated .ENDIF # "$(HAVE_CXX0X)" == "TRUE" .IF "$(PRODUCT)"!="full" |