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

Stephan Bergmann sbergman at redhat.com
Thu Nov 14 09:11:12 PST 2013


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

New commits:
commit 21865dd39191bff9fd395d5c13ee4b32237e07ed
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 14 18:10:34 2013 +0100

    external/clucene: -Werror,-Wdeprecated-declarations
    
    Change-Id: I05eb08927f27188eeb0998b09293fea05d037a41

diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0
index c1cfea7..0964110 100644
--- a/external/boost/boost.wdeprecated-auto_ptr.patch.0
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
@@ -69,6 +69,30 @@
 +#endif
 +
  #endif
+--- boost/ptr_container/ptr_vector.hpp
++++ boost/ptr_container/ptr_vector.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 <vector>
+ #include <boost/ptr_container/ptr_sequence_adapter.hpp>
+ 
+@@ -74,4 +80,8 @@
+     
+ }
+ 
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
 --- boost/smart_ptr/detail/shared_count.hpp
 +++ boost/smart_ptr/detail/shared_count.hpp
 @@ -18,6 +18,12 @@


More information about the Libreoffice-commits mailing list