summaryrefslogtreecommitdiffstats
path: root/external/boost/boost.wdeprecated-auto_ptr.patch.0
diff options
context:
space:
mode:
Diffstat (limited to 'external/boost/boost.wdeprecated-auto_ptr.patch.0')
-rw-r--r--external/boost/boost.wdeprecated-auto_ptr.patch.098
1 files changed, 53 insertions, 45 deletions
diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0
index b92d773c0022..860840dd061f 100644
--- a/external/boost/boost.wdeprecated-auto_ptr.patch.0
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
@@ -1,5 +1,6 @@
---- boost/ptr_container/ptr_map.hpp
-+++ boost/ptr_container/ptr_map.hpp
+diff -ru boost.orig/boost/ptr_container/ptr_map_adapter.hpp boost/boost/ptr_container/ptr_map_adapter.hpp
+--- boost/ptr_container/ptr_map_adapter.hpp 2015-07-18 22:42:11.723941110 +0200
++++ boost/ptr_container/ptr_map_adapter.hpp 2015-07-18 22:45:56.525938583 +0200
@@ -16,6 +16,11 @@
# pragma once
#endif
@@ -9,20 +10,21 @@
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
- #include <map>
- #include <boost/ptr_container/ptr_map_adapter.hpp>
-
-@@ -162,4 +168,8 @@
-
- }
+ #include <boost/ptr_container/detail/map_iterator.hpp>
+ #include <boost/ptr_container/detail/associative_ptr_container.hpp>
+ #include <boost/ptr_container/detail/meta_functions.hpp>
+@@ -872,4 +877,8 @@
+
+ } // namespace 'boost'
+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
#endif
---- boost/ptr_container/ptr_map_adapter.hpp
-+++ boost/ptr_container/ptr_map_adapter.hpp
+diff -ru boost.orig/boost/ptr_container/ptr_map.hpp boost/boost/ptr_container/ptr_map.hpp
+--- boost/ptr_container/ptr_map.hpp 2015-01-25 20:27:11.000000000 +0100
++++ boost/ptr_container/ptr_map.hpp 2015-07-18 22:44:51.669939312 +0200
@@ -16,6 +16,11 @@
# pragma once
#endif
@@ -32,21 +34,22 @@
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
- #include <boost/ptr_container/detail/map_iterator.hpp>
- #include <boost/ptr_container/detail/associative_ptr_container.hpp>
- #include <boost/ptr_container/detail/meta_functions.hpp>
-@@ -876,4 +876,8 @@
-
- } // namespace 'boost'
+ #include <map>
+ #include <boost/ptr_container/ptr_map_adapter.hpp>
+
+@@ -162,4 +167,8 @@
+
+ }
+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
#endif
---- boost/ptr_container/ptr_set_adapter.hpp
-+++ boost/ptr_container/ptr_set_adapter.hpp
-@@ -16,6 +16,11 @@
+diff -ru boost.orig/boost/ptr_container/ptr_sequence_adapter.hpp boost/boost/ptr_container/ptr_sequence_adapter.hpp
+--- boost/ptr_container/ptr_sequence_adapter.hpp 2015-07-18 22:42:11.734941110 +0200
++++ boost/boost/ptr_container/ptr_sequence_adapter.hpp 2015-07-18 22:47:28.662937548 +0200
+@@ -16,6 +16,10 @@
# pragma once
#endif
@@ -54,11 +57,10 @@
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
-+
- #include <boost/ptr_container/detail/associative_ptr_container.hpp>
- #include <boost/ptr_container/detail/meta_functions.hpp>
- #include <boost/ptr_container/detail/void_ptr_iterator.hpp>
-@@ -693,4 +693,8 @@
+
+ #include <boost/ptr_container/detail/reversible_ptr_container.hpp>
+ #include <boost/ptr_container/indirect_fun.hpp>
+@@ -773,4 +777,8 @@
} // namespace 'boost'
@@ -67,9 +69,10 @@
+#endif
+
#endif
---- boost/ptr_container/ptr_sequence_adapter.hpp
-+++ boost/ptr_container/ptr_sequence_adapter.hpp
-@@ -16,6 +16,10 @@
+diff -ru boost.orig/boost/ptr_container/ptr_set_adapter.hpp boost/boost/ptr_container/ptr_set_adapter.hpp
+--- boost/ptr_container/ptr_set_adapter.hpp 2015-01-25 20:27:11.000000000 +0100
++++ boost/ptr_container/ptr_set_adapter.hpp 2015-07-18 22:46:40.378938090 +0200
+@@ -16,6 +16,11 @@
# pragma once
#endif
@@ -77,10 +80,11 @@
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
-
- #include <boost/ptr_container/detail/reversible_ptr_container.hpp>
- #include <boost/ptr_container/indirect_fun.hpp>
-@@ -773,4 +777,8 @@
++
+ #include <boost/ptr_container/detail/associative_ptr_container.hpp>
+ #include <boost/ptr_container/detail/meta_functions.hpp>
+ #include <boost/ptr_container/detail/void_ptr_iterator.hpp>
+@@ -689,4 +694,8 @@
} // namespace 'boost'
@@ -89,8 +93,9 @@
+#endif
+
#endif
---- boost/ptr_container/ptr_vector.hpp
-+++ boost/ptr_container/ptr_vector.hpp
+diff -ru boost.orig/boost/ptr_container/ptr_vector.hpp boost/boost/ptr_container/ptr_vector.hpp
+--- boost/ptr_container/ptr_vector.hpp 2015-01-25 20:27:11.000000000 +0100
++++ boost/ptr_container/ptr_vector.hpp 2015-07-18 22:48:11.431937067 +0200
@@ -16,6 +16,11 @@
# pragma once
#endif
@@ -103,7 +108,7 @@
#include <vector>
#include <boost/ptr_container/ptr_sequence_adapter.hpp>
-@@ -74,4 +80,8 @@
+@@ -74,4 +79,8 @@
}
@@ -112,8 +117,9 @@
+#endif
+
#endif
---- boost/smart_ptr/detail/shared_count.hpp
-+++ boost/smart_ptr/detail/shared_count.hpp
+diff -ru boost.orig/boost/smart_ptr/detail/shared_count.hpp boost/boost/smart_ptr/detail/shared_count.hpp
+--- boost/smart_ptr/detail/shared_count.hpp 2015-06-06 00:40:42.000000000 +0200
++++ boost/smart_ptr/detail/shared_count.hpp 2015-07-18 22:49:13.985936364 +0200
@@ -18,6 +18,11 @@
// http://www.boost.org/LICENSE_1_0.txt)
//
@@ -126,7 +132,7 @@
#ifdef __BORLANDC__
# pragma warn -8027 // Functions containing try are not expanded inline
#endif
-@@ -604,4 +604,8 @@
+@@ -696,4 +701,8 @@
# pragma warn .8027 // Functions containing try are not expanded inline
#endif
@@ -135,8 +141,9 @@
+#endif
+
#endif // #ifndef BOOST_SMART_PTR_DETAIL_SHARED_COUNT_HPP_INCLUDED
---- boost/smart_ptr/scoped_ptr.hpp
-+++ boost/smart_ptr/scoped_ptr.hpp
+diff -ru boost.orig/boost/smart_ptr/scoped_ptr.hpp boost/boost/smart_ptr/scoped_ptr.hpp
+--- boost/smart_ptr/scoped_ptr.hpp 2015-06-06 00:40:42.000000000 +0200
++++ boost/smart_ptr/scoped_ptr.hpp 2015-07-18 22:50:07.597935761 +0200
@@ -11,6 +11,11 @@
// http://www.boost.org/libs/smart_ptr/scoped_ptr.htm
//
@@ -149,7 +156,7 @@
#include <boost/config.hpp>
#include <boost/assert.hpp>
#include <boost/checked_delete.hpp>
-@@ -158,4 +158,8 @@
+@@ -154,4 +159,8 @@
} // namespace boost
@@ -158,8 +165,9 @@
+#endif
+
#endif // #ifndef BOOST_SMART_PTR_SCOPED_PTR_HPP_INCLUDED
---- boost/smart_ptr/shared_ptr.hpp
-+++ boost/smart_ptr/shared_ptr.hpp
+diff -ru boost.orig/boost/smart_ptr/shared_ptr.hpp boost/boost/smart_ptr/shared_ptr.hpp
+--- boost/smart_ptr/shared_ptr.hpp 2015-06-06 00:40:42.000000000 +0200
++++ boost/smart_ptr/shared_ptr.hpp 2015-07-18 22:50:59.615935177 +0200
@@ -14,6 +14,11 @@
// See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
//
@@ -171,10 +179,10 @@
+
#include <boost/config.hpp> // for broken compiler workarounds
- #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
-@@ -1036,4 +1036,8 @@
+ // In order to avoid circular dependencies with Boost.TR1
+@@ -1064,4 +1069,8 @@
- #endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
+ } // namespace boost
+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__)
+# pragma GCC diagnostic pop
generated by cgit (git 2.34.1) at 2024-07-18 02:11:52 +0000