Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/bimap/bimap.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/bimap/bimap.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/bimap/bimap.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -45,7 +45,7 @@ #ifndef BOOST_BIMAP_BIMAP_HPP #define BOOST_BIMAP_BIMAP_HPP -#if defined(_MSC_VER) && (_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -342,8 +342,7 @@ template< class Tag, class IteratorType > BOOST_DEDUCED_TYPENAME ::boost::bimaps::support:: iterator_type_by<Tag,bimap>::type - project(IteratorType iter - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag)) + project(IteratorType iter) { return core.template project<Tag>(iter.base()); } @@ -351,8 +350,7 @@ template< class Tag, class IteratorType > BOOST_DEDUCED_TYPENAME ::boost::bimaps::support:: const_iterator_type_by<Tag,bimap>::type - project(IteratorType iter - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag)) const + project(IteratorType iter) const { return core.template project<Tag>(iter.base()); } @@ -369,16 +367,14 @@ template< class Tag > BOOST_DEDUCED_TYPENAME ::boost::bimaps::support:: - map_type_by<Tag,bimap>::type & - by(BOOST_EXPLICIT_TEMPLATE_TYPE(Tag)) + map_type_by<Tag,bimap>::type &by() { return ::boost::bimaps::support::map_by<Tag>(*this); } template< class Tag > const BOOST_DEDUCED_TYPENAME ::boost::bimaps::support:: - map_type_by<Tag,bimap>::type & - by(BOOST_EXPLICIT_TEMPLATE_TYPE(Tag)) const + map_type_by<Tag,bimap>::type &by() const { return ::boost::bimaps::support::map_by<Tag>(*this); }