summaryrefslogtreecommitdiff
path: root/boost/bimap/bimap.hpp
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2016-03-21 15:45:20 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2016-03-21 15:46:37 +0900
commit733b5d5ae2c5d625211e2985ac25728ac3f54883 (patch)
treea5b214744b256f07e1dc2bd7273035a7808c659f /boost/bimap/bimap.hpp
parent08c1e93fa36a49f49325a07fe91ff92c964c2b6c (diff)
downloadboost-733b5d5ae2c5d625211e2985ac25728ac3f54883.tar.gz
boost-733b5d5ae2c5d625211e2985ac25728ac3f54883.tar.bz2
boost-733b5d5ae2c5d625211e2985ac25728ac3f54883.zip
Imported Upstream version 1.58.0upstream/1.58.0
Change-Id: If0072143aa26874812e0db6872e1efb10a3e5e94 Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/bimap/bimap.hpp')
-rw-r--r--boost/bimap/bimap.hpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/boost/bimap/bimap.hpp b/boost/bimap/bimap.hpp
index 2929ce58e4..5fe7a3f5b1 100644
--- a/boost/bimap/bimap.hpp
+++ b/boost/bimap/bimap.hpp
@@ -45,7 +45,7 @@ the next step will be:
#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 @@ class bimap
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 @@ class bimap
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 @@ class bimap
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);
}