diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-15 09:16:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-15 09:16:42 +0100 |
| commit | 924a2689b380407d6db64ff0693aaff79073ea6f (patch) | |
| tree | 63ee0d91ca8924e9d7a1a31f34080191e4e013c7 /external | |
| parent | c929930177b73c53718ba9e49b3c2c79109ee3e2 (diff) | |
WaE: -Wshadow signals2
Change-Id: Ib5e6d1e75322dad23f4bb379b8db6dfa4bf18bb0
Diffstat (limited to 'external')
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | external/boost/boost.signal2.Wshadow.warnings.patch | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index e57a4bd6f04d..f1cee1753827 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -103,6 +103,7 @@ boost_patches += boost.auto_link.patch boost_patches += boost.std.move.patch boost_patches += boost.wunused.patch boost_patches += boost.wdeprecated-auto_ptr.patch.0 +boost_patches += boost.signal2.Wshadow.warnings.patch $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) diff --git a/external/boost/boost.signal2.Wshadow.warnings.patch b/external/boost/boost.signal2.Wshadow.warnings.patch new file mode 100644 index 000000000000..96db621c1e6e --- /dev/null +++ b/external/boost/boost.signal2.Wshadow.warnings.patch @@ -0,0 +1,15 @@ +--- misc/boost_1_44_0/boost/signals2/detail/slot_template.hpp ++++ misc/build/boost_1_44_0/boost/signals2/detail/slot_template.hpp +@@ -117,10 +117,10 @@ + track_signal(signal); + return *this; + } +- BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)& track(const slot_base &slot) ++ BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)& track(const slot_base &slotitem) + { + tracked_container_type::const_iterator it; +- for(it = slot.tracked_objects().begin(); it != slot.tracked_objects().end(); ++it) ++ for(it = slotitem.tracked_objects().begin(); it != slotitem.tracked_objects().end(); ++it) + { + _tracked_objects.push_back(*it); + } |