Merge pull request #43 from hp-peti/pull_coroutine_std_begin_end_patch

Fix ambiguity of std::begin/end
boostorg · Oct 2, 2021 · bf12f18 · bf12f18
2 parents a0d56e9 + 37f08bb
commit bf12f18
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/include/boost/coroutine2/detail/pull_coroutine.hpp b/include/boost/coroutine2/detail/pull_coroutine.hpp
@@ -130,6 +130,9 @@ class pull_coroutine {
     };
 
     friend class iterator;
+
+    iterator begin() { return iterator (this); }
+    iterator end() { return iterator(); }
 };
 
 template< typename T >
@@ -238,6 +241,9 @@ class pull_coroutine< T & > {
     };
 
     friend class iterator;
+
+    iterator begin() { return iterator (this); }
+    iterator end() { return iterator(); }
 };
 
 template<>
@@ -278,6 +284,8 @@ class pull_coroutine< void > {
     explicit operator bool() const noexcept;
 
     bool operator!() const noexcept;
+
+
 };
 
 template< typename T >
@@ -294,22 +302,6 @@ end( pull_coroutine< T > &) {
 
 }}}
 
-namespace std {
-
-template< typename T >
-typename boost::coroutines2::detail::pull_coroutine< T >::iterator
-begin( boost::coroutines2::detail::pull_coroutine< T > & c) {
-    return boost::coroutines2::detail::begin( c);
-}
-
-template< typename T >
-typename boost::coroutines2::detail::pull_coroutine< T >::iterator
-end( boost::coroutines2::detail::pull_coroutine< T > & c) {
-    return boost::coroutines2::detail::end( c);
-}
-
-}
-
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
 #endif