From d9ec475d945d3035377a0d89ed42e382d8988891 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 6 Oct 2016 10:33:54 +0900 Subject: Imported Upstream version 1.60.0 Change-Id: Ie709530d6d5841088ceaba025cbe175a4ef43050 Signed-off-by: DongHun Kwak --- boost/signals2/detail/auto_buffer.hpp | 4 ++-- boost/signals2/detail/variadic_slot_invoker.hpp | 15 +++++++++++++++ boost/signals2/postconstructible.hpp | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) (limited to 'boost/signals2') diff --git a/boost/signals2/detail/auto_buffer.hpp b/boost/signals2/detail/auto_buffer.hpp index 8007b3c6b9..0970d3da90 100644 --- a/boost/signals2/detail/auto_buffer.hpp +++ b/boost/signals2/detail/auto_buffer.hpp @@ -98,7 +98,7 @@ namespace detail } template< class SizeType > - static bool should_shrink( SizeType size, SizeType capacity ) + static bool should_shrink( SizeType, SizeType ) { // // @remark: when defining a new grow policy, one might @@ -257,7 +257,7 @@ namespace detail auto_buffer_destroy( buffer ); } - void destroy_back_n( size_type n, const boost::true_type& ) + void destroy_back_n( size_type, const boost::true_type& ) { } void destroy_back_n( size_type n ) diff --git a/boost/signals2/detail/variadic_slot_invoker.hpp b/boost/signals2/detail/variadic_slot_invoker.hpp index c115a63df5..ab1dfeea6c 100644 --- a/boost/signals2/detail/variadic_slot_invoker.hpp +++ b/boost/signals2/detail/variadic_slot_invoker.hpp @@ -30,6 +30,16 @@ #define BOOST_SIGNALS2_GET std::get #endif +// vc12 seems to erroneously report formal parameters as unreferenced (warning C4100) +// if parameters of variadic template functions are only referenced by calling +// other varadic template functions. silence these warnings: +#if defined(BOOST_MSVC) +#pragma warning(push) +#if BOOST_MSVC >= 1800 +#pragma warning(disable:4100) +#endif +#endif + namespace boost { namespace signals2 @@ -130,4 +140,9 @@ namespace boost } // namespace signals2 } // namespace boost +#if defined(BOOST_MSVC) +#pragma warning(pop) +#endif + + #endif // BOOST_SIGNALS2_DETAIL_VARIADIC_SLOT_INVOKER_HPP diff --git a/boost/signals2/postconstructible.hpp b/boost/signals2/postconstructible.hpp index faa144446b..f6422302b1 100644 --- a/boost/signals2/postconstructible.hpp +++ b/boost/signals2/postconstructible.hpp @@ -37,7 +37,7 @@ namespace boost public: friend void detail::do_postconstruct(const postconstructible *ptr); template - friend void adl_postconstruct(const shared_ptr &sp, postconstructible *p) + friend void adl_postconstruct(const shared_ptr &, postconstructible *p) { p->postconstruct(); } -- cgit v1.2.3