[Libreoffice-commits] core.git: external/boost

Stephan Bergmann sbergman at redhat.com
Thu Nov 14 13:49:25 PST 2013


 external/boost/boost.wdeprecated-auto_ptr.patch.0 |   24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

New commits:
commit 29d19c930ca5f1fb26ea6f549a5f340aac6dc138
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 14 22:48:20 2013 +0100

    external/boost: -Werror,-Wdeprecated-declarations
    
    Change-Id: Id7f98b4e10cfbf6585e0f62fffa8837329ee5cb2

diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0
index 0964110..959cb13 100644
--- a/external/boost/boost.wdeprecated-auto_ptr.patch.0
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
@@ -1,3 +1,27 @@
+--- boost/ptr_container/ptr_map.hpp
++++ boost/ptr_container/ptr_map.hpp
+@@ -16,6 +16,12 @@
+ # pragma once
+ #endif
+ 
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++#endif
++
+ #include <map>
+ #include <boost/ptr_container/ptr_map_adapter.hpp>
+ 
+@@ -162,4 +168,8 @@
+ 
+ }
+ 
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
 --- boost/ptr_container/ptr_map_adapter.hpp
 +++ boost/ptr_container/ptr_map_adapter.hpp
 @@ -16,6 +16,12 @@


More information about the Libreoffice-commits mailing list