Fix auto_ptr deprecation warning in Boost
This commit is contained in:
parent
3fe431db1b
commit
21fb88a348
|
@ -3,6 +3,7 @@ $(package)_version=1_62_0
|
||||||
$(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.62.0
|
$(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.62.0
|
||||||
$(package)_file_name=$(package)_$($(package)_version).tar.bz2
|
$(package)_file_name=$(package)_$($(package)_version).tar.bz2
|
||||||
$(package)_sha256_hash=36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0
|
$(package)_sha256_hash=36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0
|
||||||
|
$(package)_patches=deprecated_auto_ptr.patch
|
||||||
|
|
||||||
define $(package)_set_vars
|
define $(package)_set_vars
|
||||||
$(package)_config_opts_release=variant=release
|
$(package)_config_opts_release=variant=release
|
||||||
|
@ -25,7 +26,8 @@ $(package)_cxxflags_linux=-fPIC
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_preprocess_cmds
|
define $(package)_preprocess_cmds
|
||||||
echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
|
echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam && \
|
||||||
|
patch -p1 < $($(package)_patch_dir)/deprecated_auto_ptr.patch
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
--- boost_1_62_0-orig/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2016-09-29 14:03:47.317997658 +1300
|
||||||
|
+++ boost_1_62_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2016-09-29 14:07:41.308726372 +1300
|
||||||
|
@@ -13,10 +13,16 @@
|
||||||
|
|
||||||
|
#if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
|
||||||
|
#include <boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp>
|
||||||
|
+#include <boost/smart_ptr/detail/sp_disable_deprecated.hpp>
|
||||||
|
#include <algorithm>
|
||||||
|
#include <functional>
|
||||||
|
#include <memory> // for std::auto_ptr
|
||||||
|
#include <boost/weak_ptr.hpp>
|
||||||
|
+
|
||||||
|
+#if defined( BOOST_SP_DISABLE_DEPRECATED )
|
||||||
|
+#pragma GCC diagnostic push
|
||||||
|
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
+#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef BOOST_SPIRIT_THREADSAFE
|
||||||
|
@@ -370,4 +376,10 @@
|
||||||
|
|
||||||
|
}} // namespace boost::spirit
|
||||||
|
|
||||||
|
+#if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
|
||||||
|
+#if defined( BOOST_SP_DISABLE_DEPRECATED )
|
||||||
|
+#pragma GCC diagnostic pop
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#endif
|
Loading…
Reference in New Issue