diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-13 16:44:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-13 16:56:19 +0100 |
| commit | b3a6a93abb26e2c1ba987ed7dcd42923f2ef63ba (patch) | |
| tree | 17ab9fbc67cecb628807d95f294e276fa581e7e5 /external | |
| parent | 5f9969da4601855c66127f7977f7ce8d30abe5cd (diff) | |
external/boost: WaE
Change-Id: Iffc69577f12020c60bf5db1f740ec3fec43c3d8e
Diffstat (limited to 'external')
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | external/boost/w4702.patch.0 | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index a8bd12b296b4..3a760fd2263d 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -105,6 +105,7 @@ boost_patches += boost.wunused.patch boost_patches += boost.wdeprecated-auto_ptr.patch.0 boost_patches += boost.signal2.Wshadow.warnings.patch boost_patches += boost.boost_static_assert_unused_attribute.patch.0 +boost_patches += w4702.patch.0 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) diff --git a/external/boost/w4702.patch.0 b/external/boost/w4702.patch.0 new file mode 100644 index 000000000000..74391fe6324d --- /dev/null +++ b/external/boost/w4702.patch.0 @@ -0,0 +1,10 @@ +--- boost/signals2/detail/variadic_slot_invoker.hpp ++++ boost/signals2/detail/variadic_slot_invoker.hpp +@@ -115,7 +115,6 @@ + const void_type *) const + { + return call_with_tuple_args<result_type>()(connectionBody->slot.slot_function(), _args, mpl::size_t<sizeof...(Args)>()); +- return void_type(); + } + template<typename ConnectionBodyType> + result_type m_invoke(const ConnectionBodyType &connectionBody, ...) const |