Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/icl/map.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
author | Chris Cannam |
---|---|
date | Mon, 07 Sep 2015 11:12:49 +0100 |
parents | 2665513ce2d3 |
children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/icl/map.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/icl/map.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -192,12 +192,6 @@ insert(key_value_pair); } - map& operator = (const map& src) - { - base_type::operator=(src); - return *this; - } - # ifndef BOOST_ICL_NO_CXX11_RVALUE_REFERENCES //========================================================================== //= Move semantics @@ -212,12 +206,20 @@ BOOST_CONCEPT_ASSERT((EqualComparableConcept<CodomainT>)); } - map& operator = (map&& src) + map& operator = (map src) + { + base_type::operator=(boost::move(src)); + return *this; + } + //========================================================================== +# else + + map& operator = (const map& src) { base_type::operator=(src); return *this; } - //========================================================================== + # endif // BOOST_ICL_NO_CXX11_RVALUE_REFERENCES void swap(map& src) { base_type::swap(src); }