diff DEPENDENCIES/generic/include/boost/shared_container_iterator.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/shared_container_iterator.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/shared_container_iterator.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -13,6 +13,7 @@
 #include <utility>
 
 namespace boost {
+namespace iterators {
 
 template <typename Container>
 class shared_container_iterator : public iterator_adaptor<
@@ -37,7 +38,7 @@
 };
 
 template <typename Container>
-shared_container_iterator<Container>
+inline shared_container_iterator<Container>
 make_shared_container_iterator(typename Container::iterator iter,
                                boost::shared_ptr<Container> const& container) {
   typedef shared_container_iterator<Container> iterator;
@@ -47,7 +48,7 @@
 
 
 template <typename Container>
-std::pair<
+inline std::pair<
   shared_container_iterator<Container>,
   shared_container_iterator<Container> >
 make_shared_container_range(boost::shared_ptr<Container> const& container) {
@@ -57,6 +58,12 @@
       make_shared_container_iterator(container->end(),container));
 }
 
+} // namespace iterators
+
+using iterators::shared_container_iterator;
+using iterators::make_shared_container_iterator;
+using iterators::make_shared_container_range;
 
 } // namespace boost
+
 #endif  // SHARED_CONTAINER_ITERATOR_RG08102002_HPP