[Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild

[Petr Mladek]

 solenv/gbuild/platform/unxgcc.mk |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 9c2ab9f4febec2b2c5fac25469f1d0cfedc6af5e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 21 13:10:02 2011 +0100

    fix build with bleeding edge external boost and gcc
    
    It seems that a recent boost and recent gcc causes a problem when
    boost::unordered_map is used as a baseclass for something.
    Asking gcc to use -std=c++0x mode makes gcc do the right thing.
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d3b63ed..3d6a088 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -97,6 +97,12 @@ gb_CFLAGS += -fno-strict-aliasing
 gb_CXXFLAGS += -fno-strict-aliasing
 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 -Wno-deprecated-declarations
+endif
+
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -Werror
 gb_CXXFLAGS_WERROR := -Werror