diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-30 16:41:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-02 16:49:26 +0200 |
| commit | f182354cc58e87ae30cdd583c573382707129ce5 (patch) | |
| tree | 24585354cbfae401e6850ed14563123f3b52e82a | |
| parent | 6aadc284c68997475b898cf29e5e80f65e71f525 (diff) | |
Work around deprecated auto_ptr warnings on Clang/GCC
Change-Id: I1235727c5691a828f44837e8eca62acf57efca70
| -rw-r--r-- | boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | boost/boost.wdeprecated-auto_ptr.patch.0 | 91 |
2 files changed, 92 insertions, 0 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index 591d2653953a..047fbeac15d2 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -46,6 +46,7 @@ boost_patches += boost.wunused.patch boost_patches += boost.wshadow.patch boost_patches += boost.wdeprecated-register.patch.0 boost_patches += boost.wuninitialized.patch +boost_patches += boost.wdeprecated-auto_ptr.patch.0 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) diff --git a/boost/boost.wdeprecated-auto_ptr.patch.0 b/boost/boost.wdeprecated-auto_ptr.patch.0 new file mode 100644 index 000000000000..dd3ce71b910d --- /dev/null +++ b/boost/boost.wdeprecated-auto_ptr.patch.0 @@ -0,0 +1,91 @@ +--- boost/ptr_container/ptr_map.hpp ++++ boost/ptr_container/ptr_map.hpp +@@ -16,6 +16,10 @@ + # pragma once + #endif + ++#if defined __GNUC__ ++#pragma GCC system_header ++#endif ++ + #include <map> + #include <boost/ptr_container/ptr_map_adapter.hpp> + +--- boost/ptr_container/ptr_map_adapter.hpp ++++ boost/ptr_container/ptr_map_adapter.hpp +@@ -16,6 +16,10 @@ + # pragma once + #endif + ++#if defined __GNUC__ ++#pragma GCC system_header ++#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> +--- boost/ptr_container/ptr_set_adapter.hpp ++++ boost/ptr_container/ptr_set_adapter.hpp +@@ -16,6 +16,10 @@ + # pragma once + #endif + ++#if defined __GNUC__ ++#pragma GCC system_header ++#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> +--- boost/ptr_container/ptr_vector.hpp ++++ boost/ptr_container/ptr_vector.hpp +@@ -16,6 +16,10 @@ + # pragma once + #endif + ++#if defined __GNUC__ ++#pragma GCC system_header ++#endif ++ + #include <vector> + #include <boost/ptr_container/ptr_sequence_adapter.hpp> + +--- boost/smart_ptr/detail/shared_count.hpp ++++ boost/smart_ptr/detail/shared_count.hpp +@@ -18,6 +18,10 @@ + // http://www.boost.org/LICENSE_1_0.txt) + // + ++#if defined __GNUC__ ++#pragma GCC system_header ++#endif ++ + #ifdef __BORLANDC__ + # pragma warn -8027 // Functions containing try are not expanded inline + #endif +--- boost/smart_ptr/scoped_ptr.hpp ++++ boost/smart_ptr/scoped_ptr.hpp +@@ -11,6 +11,10 @@ + // http://www.boost.org/libs/smart_ptr/scoped_ptr.htm + // + ++#if defined __GNUC__ ++#pragma GCC system_header ++#endif ++ + #include <boost/config.hpp> + #include <boost/assert.hpp> + #include <boost/checked_delete.hpp> +--- boost/smart_ptr/shared_ptr.hpp ++++ boost/smart_ptr/shared_ptr.hpp +@@ -14,6 +14,10 @@ + // See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation. + // + ++#if defined __GNUC__ ++#pragma GCC system_header ++#endif ++ + #include <boost/config.hpp> // for broken compiler workarounds + + #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) |