From 73030b3ac8fd73cb6ede66ccdcd05ddc3619a7b9 Mon Sep 17 00:00:00 2001
From: Thomas Witt <witt@acm.org>
Date: Sat, 26 Apr 2003 19:06:12 +0000
Subject: [PATCH] Adjusted to new category names.

[SVN r1210]
---
 test/concept_tests.cpp           | 8 ++++----
 test/iterator_adaptor_cc.cpp     | 4 ++--
 test/transform_iterator_test.cpp | 8 ++++++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/test/concept_tests.cpp b/test/concept_tests.cpp
index 3ffcdb0..cfdbec8 100644
--- a/test/concept_tests.cpp
+++ b/test/concept_tests.cpp
@@ -74,23 +74,23 @@ main()
 
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
   boost::function_requires<
-    boost_concepts::MutableLvalueIteratorConcept<int*> >();
+    boost_concepts::WritableLvalueIteratorConcept<int*> >();
   boost::function_requires<
     boost_concepts::RandomAccessTraversalConcept<int*> >();
 
   boost::function_requires<
-    boost_concepts::ConstantLvalueIteratorConcept<const int*> >();
+    boost_concepts::ReadableLvalueIteratorConcept<const int*> >();
   boost::function_requires<
     boost_concepts::RandomAccessTraversalConcept<const int*> >();
 #endif
 
   boost::function_requires<
-    boost_concepts::MutableLvalueIteratorConcept<new_iterator> >();
+    boost_concepts::WritableLvalueIteratorConcept<new_iterator> >();
   boost::function_requires<
     boost_concepts::RandomAccessTraversalConcept<new_iterator> >();
 
   boost::function_requires<
-    boost_concepts::MutableLvalueIteratorConcept<old_iterator> >();
+    boost_concepts::WritableLvalueIteratorConcept<old_iterator> >();
   boost::function_requires<
     boost_concepts::RandomAccessTraversalConcept<old_iterator> >();
   return 0;
diff --git a/test/iterator_adaptor_cc.cpp b/test/iterator_adaptor_cc.cpp
index b4a472c..e08eabd 100644
--- a/test/iterator_adaptor_cc.cpp
+++ b/test/iterator_adaptor_cc.cpp
@@ -21,7 +21,7 @@ int main()
     typedef boost::reverse_iterator<int*>       rev_iter;
     typedef boost::reverse_iterator<int const*> c_rev_iter;
 
-    boost::function_requires< boost_concepts::MutableLvalueIteratorConcept<rev_iter> >();
+    boost::function_requires< boost_concepts::WritableLvalueIteratorConcept<rev_iter> >();
     boost::function_requires< boost_concepts::RandomAccessTraversalConcept<rev_iter> >();
     boost::function_requires< boost::RandomAccessIteratorConcept<rev_iter> >();
     boost::function_requires< boost_concepts::InteroperableConcept<rev_iter, c_rev_iter> >();
@@ -30,7 +30,7 @@ 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::ConstantLvalueIteratorConcept<c_rev_iter> >();
+    boost::function_requires< boost_concepts::ReadableLvalueIteratorConcept<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::InteroperableConcept<rev_iter, c_rev_iter> >();
diff --git a/test/transform_iterator_test.cpp b/test/transform_iterator_test.cpp
index 57fd75a..5d5f388 100644
--- a/test/transform_iterator_test.cpp
+++ b/test/transform_iterator_test.cpp
@@ -23,14 +23,22 @@
 #include <boost/bind.hpp>
 #include <boost/concept_check.hpp>
 
+
 #ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 namespace boost { namespace detail
 {
   template<> struct iterator_traits<int*>
   : ptr_iter_traits<int> {};
+
+  template<> struct iterator_traits<std::pair<int, int>*>
+  : ptr_iter_traits<std::pair<int, int> > {};
   
   template<> struct iterator_traits<int const*>
   : ptr_iter_traits<int, int const> {};
+
+  template<> struct iterator_traits<std::pair<int, int> const*>
+  : ptr_iter_traits<std::pair<int, int>, std::pair<int, int> const> {};
+
 }}
 #endif