From 6317b09a7c2f9cb85eaace40c3fd52c4f00ddfd2 Mon Sep 17 00:00:00 2001
From: Jeremy Siek <jeremy.siek@gmail.com>
Date: Tue, 27 Jan 2004 18:31:31 +0000
Subject: [PATCH] merged in fixes

[SVN r22007]
---
 test/concept_tests.cpp         | 20 ++++++++++++----
 test/filter_iterator_test.cpp  |  6 +++--
 test/iterator_adaptor_cc.cpp   |  6 +++--
 test/iterator_archetype_cc.cpp | 42 +++++++++++++++++++++++++++++++---
 test/reverse_iterator_test.cpp | 14 ++++++++----
 5 files changed, 72 insertions(+), 16 deletions(-)

diff --git a/test/concept_tests.cpp b/test/concept_tests.cpp
index 399911d..dd99600 100644
--- a/test/concept_tests.cpp
+++ b/test/concept_tests.cpp
@@ -61,23 +61,35 @@ main()
   (void)derived;
   
   boost::function_requires<
-    boost_concepts::WritableLvalueIteratorConcept<int*> >();
+    boost_concepts::WritableIteratorConcept<int*> >();
+  boost::function_requires<
+    boost_concepts::LvalueIteratorConcept<int*> >();
   boost::function_requires<
     boost_concepts::RandomAccessTraversalConcept<int*> >();
 
   boost::function_requires<
-    boost_concepts::ReadableLvalueIteratorConcept<const int*> >();
+    boost_concepts::ReadableIteratorConcept<const int*> >();
+  boost::function_requires<
+    boost_concepts::LvalueIteratorConcept<const int*> >();
   boost::function_requires<
     boost_concepts::RandomAccessTraversalConcept<const int*> >();
 
   boost::function_requires<
-    boost_concepts::WritableLvalueIteratorConcept<new_iterator> >();
+    boost_concepts::WritableIteratorConcept<new_iterator> >();
+  boost::function_requires<
+    boost_concepts::LvalueIteratorConcept<new_iterator> >();
   boost::function_requires<
     boost_concepts::RandomAccessTraversalConcept<new_iterator> >();
 
   boost::function_requires<
-    boost_concepts::WritableLvalueIteratorConcept<old_iterator> >();
+    boost_concepts::WritableIteratorConcept<old_iterator> >();
+  boost::function_requires<
+    boost_concepts::LvalueIteratorConcept<old_iterator> >();
   boost::function_requires<
     boost_concepts::RandomAccessTraversalConcept<old_iterator> >();
+
+  boost::function_requires<
+	boost_concepts::InteroperableIteratorConcept<int*, int const*> >();
+
   return 0;
 }
diff --git a/test/filter_iterator_test.cpp b/test/filter_iterator_test.cpp
index 8b4d190..11c260c 100644
--- a/test/filter_iterator_test.cpp
+++ b/test/filter_iterator_test.cpp
@@ -125,7 +125,8 @@ int main()
       > BaseIter;
       typedef boost::filter_iterator<one_or_four, BaseIter> Iter;
       boost::function_requires< boost::ForwardIteratorConcept<Iter> >();
-      boost::function_requires< boost_concepts::ReadableLvalueIteratorConcept<Iter> >();
+      boost::function_requires< boost_concepts::ReadableIteratorConcept<Iter> >();
+      boost::function_requires< boost_concepts::LvalueIteratorConcept<Iter> >();
       boost::function_requires< boost_concepts::ForwardTraversalConcept<Iter> >();
     }
     {
@@ -136,7 +137,8 @@ int main()
       > BaseIter;
       typedef boost::filter_iterator<one_or_four, BaseIter> Iter;
       boost::function_requires< boost::Mutable_ForwardIteratorConcept<Iter> >();
-      boost::function_requires< boost_concepts::WritableLvalueIteratorConcept<Iter> >();
+      boost::function_requires< boost_concepts::WritableIteratorConcept<Iter> >();
+      boost::function_requires< boost_concepts::LvalueIteratorConcept<Iter> >();
       boost::function_requires< boost_concepts::ForwardTraversalConcept<Iter> >();
     }
 #endif 
diff --git a/test/iterator_adaptor_cc.cpp b/test/iterator_adaptor_cc.cpp
index cae2a5a..67683f0 100644
--- a/test/iterator_adaptor_cc.cpp
+++ b/test/iterator_adaptor_cc.cpp
@@ -10,7 +10,8 @@ int main()
     typedef boost::reverse_iterator<int*>       rev_iter;
     typedef boost::reverse_iterator<int const*> c_rev_iter;
 
-    boost::function_requires< boost_concepts::WritableLvalueIteratorConcept<rev_iter> >();
+    boost::function_requires< boost_concepts::WritableIteratorConcept<rev_iter> >();
+    boost::function_requires< boost_concepts::LvalueIteratorConcept<rev_iter> >();
     boost::function_requires< boost_concepts::RandomAccessTraversalConcept<rev_iter> >();
     boost::function_requires< boost::RandomAccessIteratorConcept<rev_iter> >();
     boost::function_requires< boost_concepts::InteroperableIteratorConcept<rev_iter, c_rev_iter> >();
@@ -28,7 +29,8 @@ int main()
     typedef boost::reverse_iterator<std::list<int>::iterator>       rev_iter;
     typedef boost::reverse_iterator<std::list<int>::const_iterator> c_rev_iter;
 
-    boost::function_requires< boost_concepts::ReadableLvalueIteratorConcept<c_rev_iter> >();
+    boost::function_requires< boost_concepts::ReadableIteratorConcept<c_rev_iter> >();
+    boost::function_requires< boost_concepts::LvalueIteratorConcept<c_rev_iter> >();
     boost::function_requires< boost_concepts::BidirectionalTraversalConcept<c_rev_iter> >();
     boost::function_requires< boost::BidirectionalIteratorConcept<c_rev_iter> >();
     boost::function_requires< boost_concepts::InteroperableIteratorConcept<rev_iter, c_rev_iter> >();
diff --git a/test/iterator_archetype_cc.cpp b/test/iterator_archetype_cc.cpp
index b5badea..6a71551 100644
--- a/test/iterator_archetype_cc.cpp
+++ b/test/iterator_archetype_cc.cpp
@@ -9,18 +9,54 @@
 #include <boost/iterator/iterator_categories.hpp>
 #include <boost/iterator/iterator_concepts.hpp>
 #include <boost/concept_check.hpp>
+#include <boost/cstdlib.hpp>
 
 int main()
 {
+  {
+    typedef boost::iterator_archetype<
+        int
+      , boost::iterator_archetypes::readable_iterator_t
+      , boost::random_access_traversal_tag
+    > iter;
+
+    boost::function_requires< boost_concepts::ReadableIteratorConcept<iter> >();
+    boost::function_requires< boost_concepts::RandomAccessTraversalConcept<iter> >();
+  } 
+  {
+    typedef boost::iterator_archetype<
+        int
+      , boost::iterator_archetypes::readable_writable_iterator_t
+      , boost::random_access_traversal_tag
+    > iter;
+
+    boost::function_requires< boost_concepts::ReadableIteratorConcept<iter> >();
+    boost::function_requires< boost_concepts::WritableIteratorConcept<iter> >();
+    boost::function_requires< boost_concepts::RandomAccessTraversalConcept<iter> >();
+  } 
+  {
+    typedef boost::iterator_archetype<
+        const int // I don't like adding const to Value. It is redundant. -JGS
+      , boost::iterator_archetypes::readable_lvalue_iterator_t
+      , boost::random_access_traversal_tag
+    > iter;
+
+    boost::function_requires< boost_concepts::ReadableIteratorConcept<iter> >();
+    boost::function_requires< boost_concepts::LvalueIteratorConcept<iter> >();
+    boost::function_requires< boost_concepts::RandomAccessTraversalConcept<iter> >();
+  } 
+  {
     typedef boost::iterator_archetype<
         int
       , boost::iterator_archetypes::writable_lvalue_iterator_t
       , boost::random_access_traversal_tag
     > iter;
 
-    boost::function_requires< boost_concepts::WritableLvalueIteratorConcept<iter> >();
+    boost::function_requires< boost_concepts::WritableIteratorConcept<iter> >();
+    boost::function_requires< boost_concepts::LvalueIteratorConcept<iter> >();
     boost::function_requires< boost_concepts::RandomAccessTraversalConcept<iter> >();
-    
-    return 0; // keep msvc happy
+  } 
+
+  return boost::exit_success;
 }
 
diff --git a/test/reverse_iterator_test.cpp b/test/reverse_iterator_test.cpp
index dd9b88a..6686d30 100644
--- a/test/reverse_iterator_test.cpp
+++ b/test/reverse_iterator_test.cpp
@@ -31,13 +31,15 @@ int main()
   {
     typedef boost::reverse_iterator<boost::bidirectional_iterator_archetype<dummyT> > Iter;
     boost::function_requires< boost::BidirectionalIteratorConcept<Iter> >();
-    boost::function_requires< boost_concepts::ReadableLvalueIteratorConcept<Iter> >();
+    boost::function_requires< boost_concepts::ReadableIteratorConcept<Iter> >();
+    boost::function_requires< boost_concepts::LvalueIteratorConcept<Iter> >();
     boost::function_requires< boost_concepts::BidirectionalTraversalConcept<Iter> >();
   }
   {
     typedef boost::reverse_iterator<boost::mutable_bidirectional_iterator_archetype<dummyT> > Iter;
     boost::function_requires< boost::Mutable_BidirectionalIteratorConcept<Iter> >();
-    boost::function_requires< boost_concepts::WritableLvalueIteratorConcept<Iter> >();
+    boost::function_requires< boost_concepts::WritableIteratorConcept<Iter> >();
+    boost::function_requires< boost_concepts::LvalueIteratorConcept<Iter> >();
     boost::function_requires< boost_concepts::BidirectionalTraversalConcept<Iter> >();
   }
   // Adapting new-style iterators
@@ -87,7 +89,8 @@ int main()
     > iter;
     typedef boost::reverse_iterator<iter> Iter;
     boost::function_requires< boost::BidirectionalIteratorConcept<Iter> >();
-    boost::function_requires< boost_concepts::ReadableLvalueIteratorConcept<Iter> >();
+    boost::function_requires< boost_concepts::ReadableIteratorConcept<Iter> >();
+    boost::function_requires< boost_concepts::LvalueIteratorConcept<Iter> >();
     boost::function_requires< boost_concepts::BidirectionalTraversalConcept<Iter> >();
   }
   {
@@ -98,11 +101,12 @@ int main()
     > iter;
     typedef boost::reverse_iterator<iter> Iter;
     boost::function_requires< boost::BidirectionalIteratorConcept<Iter> >();
-    boost::function_requires< boost_concepts::WritableLvalueIteratorConcept<Iter> >();
+    boost::function_requires< boost_concepts::WritableIteratorConcept<Iter> >();
+    boost::function_requires< boost_concepts::LvalueIteratorConcept<Iter> >();
     boost::function_requires< boost_concepts::BidirectionalTraversalConcept<Iter> >();
   }
 #endif
-
+  
   // Test reverse_iterator
   {
     dummyT reversed[N];