This commit was manufactured by cvs2svn to create branch

'compiler_supported_error_messages'.

[SVN r13249]

assert_test.cpp

@@ -0,0 +1,33 @@
+#if defined(_MSC_VER) && !defined(__ICL)
+#pragma warning(disable: 4786)  // identifier truncated in debug info
+#pragma warning(disable: 4710)  // function not inlined
+#pragma warning(disable: 4711)  // function selected for automatic inline expansion
+#pragma warning(disable: 4514)  // unreferenced inline removed
+#endif
+
+//
+//  assert_test.cpp - a test for boost/assert.hpp
+//
+//  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
+//
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
+//
+
+#define BOOST_DEBUG 1
+
+#include <boost/assert.hpp>
+#include <cstdio>
+
+bool boost_error(char const * expr, char const * func, char const * file, long line)
+{
+    std::printf("%s(%ld): Assertion '%s' failed in function '%s'\n", file, line, expr, func);
+    return true; // fail w/ standard assert()
+}
+
+int main()
+{
+    BOOST_ASSERT(0 == 1);
+}

base_from_member_test.cpp

@@ -57,7 +57,7 @@ struct object_id_compare
 // A singleton of this type coordinates the acknowledgements
 // of objects being created and used.
 class object_registrar
-    : boost::noncopyable
+    : private boost::noncopyable
 {
 public:
 

binary_search_test.cpp

@@ -0,0 +1,249 @@
+// (C) Copyright David Abrahams 2000. Permission to copy, use, modify,
+// sell and distribute this software is granted provided this
+// copyright notice appears in all copies. This software is provided
+// "as is" without express or implied warranty, and with no claim as
+// to its suitability for any purpose.
+
+#include <vector>
+#include <string>
+#include <memory>
+#include <climits>
+#include <iostream>
+#include <cassert>
+#include <stdlib.h> // for rand(). Would use cstdlib but VC6.4 doesn't put it in std::
+#include <list>
+#include <algorithm>
+#include <boost/detail/binary_search.hpp>
+
+#if defined(__SGI_STL_PORT) ? defined(__SGI_STL_OWN_IOSTREAMS) : (!defined(__GNUC__) || __GNUC__ > 2)
+# define USE_SSTREAM
+#endif
+
+#ifdef USE_SSTREAM
+# include <sstream>
+#else
+# include <strstream>
+#endif
+
+namespace {
+
+typedef std::vector<std::string> string_vector;
+
+const std::size_t sequence_length = 1000;
+
+unsigned random_number()
+{
+    return static_cast<unsigned>(::rand()) % sequence_length;
+}
+
+# ifndef USE_SSTREAM
+class unfreezer {
+ public:
+    unfreezer(std::ostrstream& s) : m_stream(s) {}
+    ~unfreezer() { m_stream.freeze(false); }
+ private:
+    std::ostrstream& m_stream;
+};
+# endif
+
+template <class T>
+void push_back_random_number_string(T& seq)
+{
+    unsigned value = random_number();
+# if defined(__SGI_STL_PORT) ? defined(__SGI_STL_OWN_IOSTREAMS) : (!defined(__GNUC__) || __GNUC__ > 2)
+    std::ostringstream s;
+    s << value;
+    seq.push_back(s.str());
+# else
+    std::ostrstream s;
+    auto unfreezer unfreeze(s);
+    s << value << char(0);
+    seq.push_back(std::string(s.str()));
+# endif
+}
+
+inline unsigned to_int(unsigned x) { return x; }
+inline unsigned to_int(const std::string& x) { return atoi(x.c_str()); }
+
+struct cmp
+{
+    template <class A1, class A2>
+    inline bool operator()(const A1& a1, const A2& a2) const
+    {
+        return to_int(a1) < to_int(a2);
+    }
+};
+
+inline bool operator<(const std::string& x, const unsigned y)
+{
+    return to_int(x) < y;
+}
+
+inline bool operator<(const unsigned y, const std::string& x)
+{
+    return y < to_int(x);
+}
+
+template <class T> void sort_by_value(T&);
+
+template <>
+void sort_by_value(std::vector<std::string>& v)
+{
+    std::sort(v.begin(), v.end(), cmp());
+}
+
+template <class T>
+void random_sorted_sequence(T& seq)
+{
+    seq.clear();
+    for (std::size_t i = 0; i < sequence_length; ++i)
+    {
+        push_back_random_number_string(seq);
+    }
+    sort_by_value(seq);
+}
+
+# if defined(BOOST_MSVC) && !defined(__SGI_STL_PORT)
+// VC6's standard lib doesn't have a template member function for list::sort()
+template <>
+void random_sorted_sequence(std::list<std::string>& result)
+{
+    std::vector<std::string> seq;
+    seq.reserve(sequence_length);
+    for (std::size_t i = 0; i < sequence_length; ++i)
+    {
+        push_back_random_number_string(seq);
+    }
+    sort_by_value(seq);
+    result.resize(seq.size());
+    std::copy(seq.begin(), seq.end(), result.begin());
+}
+#else
+template <>
+inline void sort_by_value(std::list<std::string>& l)
+{
+    l.sort(cmp());
+}
+# endif
+
+// A way to select the comparisons with/without a Compare parameter for testing.
+template <class Compare> struct searches
+{
+    template <class Iterator, class Key>
+    static Iterator lower_bound(Iterator start, Iterator finish, Key key, Compare cmp)
+        { return boost::detail::lower_bound(start, finish, key, cmp); }
+
+    template <class Iterator, class Key>
+    static Iterator upper_bound(Iterator start, Iterator finish, Key key, Compare cmp)
+        { return boost::detail::upper_bound(start, finish, key, cmp); }
+
+    template <class Iterator, class Key>
+    static std::pair<Iterator, Iterator> equal_range(Iterator start, Iterator finish, Key key, Compare cmp)
+        { return boost::detail::equal_range(start, finish, key, cmp); }
+
+    template <class Iterator, class Key>
+    static bool binary_search(Iterator start, Iterator finish, Key key, Compare cmp)
+        { return boost::detail::binary_search(start, finish, key, cmp); }
+};
+
+struct no_compare {};
+
+template <> struct searches<no_compare>
+{
+    template <class Iterator, class Key>
+    static Iterator lower_bound(Iterator start, Iterator finish, Key key, no_compare)
+        { return boost::detail::lower_bound(start, finish, key); }
+
+    template <class Iterator, class Key>
+    static Iterator upper_bound(Iterator start, Iterator finish, Key key, no_compare)
+        { return boost::detail::upper_bound(start, finish, key); }
+
+    template <class Iterator, class Key>
+    static std::pair<Iterator, Iterator> equal_range(Iterator start, Iterator finish, Key key, no_compare)
+        { return boost::detail::equal_range(start, finish, key); }
+
+    template <class Iterator, class Key>
+    static bool binary_search(Iterator start, Iterator finish, Key key, no_compare)
+        { return boost::detail::binary_search(start, finish, key); }
+};
+
+template <class Sequence, class Compare>
+void test_loop(Sequence& x, Compare cmp, unsigned long test_count)
+{
+    typedef typename Sequence::const_iterator const_iterator;
+    
+    for (unsigned long i = 0; i < test_count; ++i)
+    {
+        random_sorted_sequence(x);
+        const const_iterator start = x.begin();
+        const const_iterator finish = x.end();
+        
+        unsigned key = random_number();
+        const const_iterator l = searches<Compare>::lower_bound(start, finish, key, cmp);
+        const const_iterator u = searches<Compare>::upper_bound(start, finish, key, cmp);
+
+        bool found_l = false;
+        bool found_u = false;
+        std::size_t index = 0;
+        std::size_t count = 0;
+        unsigned last_value = 0;
+        for (const_iterator p = start; p != finish; ++p)
+        {
+            if (p == l)
+                found_l = true;
+            
+            if (p == u)
+            {
+                assert(found_l);
+                found_u = true;
+            }
+
+            unsigned value = to_int(*p);
+            assert(value >= last_value);
+            last_value = value;
+            
+            if (!found_l)
+            {
+                ++index;
+                assert(to_int(*p) < key);
+            }
+            else if (!found_u)
+            {
+                ++count;
+                assert(to_int(*p) == key);
+            }
+            else
+                assert(to_int(*p) > key);
+        }
+        assert(found_l || l == finish);
+        assert(found_u || u == finish);
+
+        std::pair<const_iterator, const_iterator>
+            range = searches<Compare>::equal_range(start, finish, key, cmp);
+        assert(range.first == l);
+        assert(range.second == u);
+
+        bool found = searches<Compare>::binary_search(start, finish, key, cmp);
+        assert(found == (u != l));
+        std::cout << "found " << count << " copies of " << key << " at index " << index << "\n";
+    }
+}
+
+}
+
+int main()
+{
+    std::vector<std::string> x;
+    std::cout << "=== testing random-access iterators with <: ===\n";
+    test_loop(x, no_compare(), 25);
+    std::cout << "=== testing random-access iterators with compare: ===\n";
+    test_loop(x, cmp(), 25);
+    
+    std::list<std::string> y;
+    std::cout << "=== testing bidirectional iterators with <: ===\n";
+    test_loop(y, no_compare(), 25);
+    std::cout << "=== testing bidirectional iterators with compare: ===\n";
+    test_loop(y, cmp(), 25);
+    std::cerr << "******TEST PASSED******\n";
+    return 0;
+}

call_traits_test.cpp

@@ -6,6 +6,8 @@
  //  warranty, and with no claim as to its suitability for any purpose.   
 
 // standalone test program for <boost/call_traits.hpp>
+// 18 Mar 2002:
+//    Changed some names to prevent conflicts with some new type_traits additions.
 // 03 Oct 2000:
 //    Enabled extra tests for VC6.
 
@@ -78,7 +80,7 @@ struct contained<T[N]>
 #endif
 
 template <class T>
-contained<typename boost::call_traits<T>::value_type> wrap(const T& t)
+contained<typename boost::call_traits<T>::value_type> test_wrap_type(const T& t)
 {
    typedef typename boost::call_traits<T>::value_type ct;
    return contained<ct>(t);
@@ -204,7 +206,7 @@ int main(int argc, char *argv[ ])
    c2(i);
    int* pi = &i;
    int a[2] = {1,2};
-#if (defined(BOOST_MSVC6_MEMBER_TEMPLATES) || !defined(BOOST_NO_MEMBER_TEMPLATES)) && !defined(__ICL)
+#if defined(BOOST_MSVC6_MEMBER_TEMPLATES) && !defined(__ICL)
    call_traits_checker<int*> c3;
    c3(pi);
    call_traits_checker<int&> c4;
@@ -217,9 +219,9 @@ int main(int argc, char *argv[ ])
 #endif
 #endif
 
-   check_wrap(wrap(2), 2);
+   check_wrap(test_wrap_type(2), 2);
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(__SUNPRO_CC)
-   check_wrap(wrap(a), a);
+   check_wrap(test_wrap_type(a), a);
    check_make_pair(test::make_pair(a, a), a, a);
 #endif
 
@@ -240,12 +242,12 @@ int main(int argc, char *argv[ ])
    type_test(int*&, boost::call_traits<int*>::reference)
    type_test(int*const&, boost::call_traits<int*>::const_reference)
    type_test(int*const, boost::call_traits<int*>::param_type)
-#if defined(BOOST_MSVC6_MEMBER_TEMPLATES) || !defined(BOOST_NO_MEMBER_TEMPLATES)
+#if defined(BOOST_MSVC6_MEMBER_TEMPLATES)
    type_test(int&, boost::call_traits<int&>::value_type)
    type_test(int&, boost::call_traits<int&>::reference)
    type_test(const int&, boost::call_traits<int&>::const_reference)
    type_test(int&, boost::call_traits<int&>::param_type)
-#if !(defined(__GNUC__) && (__GNUC__ < 4))
+#if !(defined(__GNUC__) && ((__GNUC__ < 3) || (__GNUC__ == 3) && (__GNUC_MINOR__ < 1)))
    type_test(int&, boost::call_traits<cr_type>::value_type)
    type_test(int&, boost::call_traits<cr_type>::reference)
    type_test(const int&, boost::call_traits<cr_type>::const_reference)
@@ -268,16 +270,26 @@ int main(int argc, char *argv[ ])
    type_test(const int(&)[3], boost::call_traits<const int[3]>::reference)
    type_test(const int(&)[3], boost::call_traits<const int[3]>::const_reference)
    type_test(const int*const, boost::call_traits<const int[3]>::param_type)
+   // test with abstract base class:
+   type_test(test_abc1, boost::call_traits<test_abc1>::value_type)
+   type_test(test_abc1&, boost::call_traits<test_abc1>::reference)
+   type_test(const test_abc1&, boost::call_traits<test_abc1>::const_reference)
+   type_test(const test_abc1&, boost::call_traits<test_abc1>::param_type)
 #else
-   std::cout << "You're compiler does not support partial template instantiation, skipping 8 tests (8 errors)" << std::endl;
-   failures += 8;
-   test_count += 8;
+   std::cout << "You're compiler does not support partial template specialiation, skipping 8 tests (8 errors)" << std::endl;
+   failures += 12;
+   test_count += 12;
 #endif
 #else
-   std::cout << "You're compiler does not support partial template instantiation, skipping 20 tests (20 errors)" << std::endl;
-   failures += 20;
-   test_count += 20;
+   std::cout << "You're compiler does not support partial template specialiation, skipping 20 tests (20 errors)" << std::endl;
+   failures += 24;
+   test_count += 24;
 #endif
+   // test with an incomplete type:
+   type_test(incomplete_type, boost::call_traits<incomplete_type>::value_type)
+   type_test(incomplete_type&, boost::call_traits<incomplete_type>::reference)
+   type_test(const incomplete_type&, boost::call_traits<incomplete_type>::const_reference)
+   type_test(const incomplete_type&, boost::call_traits<incomplete_type>::param_type)
 
    return check_result(argc, argv);
 }
@@ -388,7 +400,7 @@ void call_traits_test<T, true>::assert_construct(typename boost::call_traits<T>:
 template struct call_traits_test<int>;
 template struct call_traits_test<const int>;
 template struct call_traits_test<int*>;
-#if defined(BOOST_MSVC6_MEMBER_TEMPLATES) || !defined(BOOST_NO_MEMBER_TEMPLATES)
+#if defined(BOOST_MSVC6_MEMBER_TEMPLATES)
 template struct call_traits_test<int&>;
 template struct call_traits_test<const int&>;
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(__SUNPRO_CC)
@@ -397,24 +409,22 @@ template struct call_traits_test<int[2], true>;
 #endif
 
 #ifdef BOOST_MSVC
-unsigned int expected_failures = 10;
+unsigned int expected_failures = 14;
 #elif defined(__SUNPRO_CC)
 #if(__SUNPRO_CC <= 0x520)
-unsigned int expected_failures = 14;
-#elif(__SUNPRO_CC <= 0x530)
-unsigned int expected_failures = 13;
+unsigned int expected_failures = 18;
+#elif(__SUNPRO_CC < 0x530)
+unsigned int expected_failures = 17;
 #else
 unsigned int expected_failures = 6;
 #endif
 #elif defined(__BORLANDC__)
 unsigned int expected_failures = 2;
-#elif defined(__GNUC__)
+#elif (defined(__GNUC__) && ((__GNUC__ < 3) || (__GNUC__ == 3) && (__GNUC_MINOR__ < 1)))
 unsigned int expected_failures = 4;
+#elif defined(__HP_aCC)
+unsigned int expected_failures = 24;
 #else
 unsigned int expected_failures = 0;
 #endif
 
-
-
-
-

counting_iterator_example.cpp

@@ -22,8 +22,8 @@ int main(int, char*[])
   // Example of using make_counting_iterator()
   std::cout << "counting from -5 to 4:" << std::endl;
   std::copy(boost::make_counting_iterator(-5),
-	    boost::make_counting_iterator(5),
-	    std::ostream_iterator<int>(std::cout, " "));
+            boost::make_counting_iterator(5),
+            std::ostream_iterator<int>(std::cout, " "));
   std::cout << std::endl;
 
   // Example of using counting iterator to create an array of pointers.
@@ -31,23 +31,24 @@ int main(int, char*[])
   std::vector<int> numbers;
   // Fill "numbers" array with [0,N)
   std::copy(boost::make_counting_iterator(0), boost::make_counting_iterator(N),
-	    std::back_inserter(numbers));
+            std::back_inserter(numbers));
 
   std::vector<std::vector<int>::iterator> pointers;
 
+  // VC6 gets an internal compiler error on this
+#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200)
   // Use counting iterator to fill in the array of pointers.
   std::copy(boost::make_counting_iterator(numbers.begin()),
-	    boost::make_counting_iterator(numbers.end()),
-	    std::back_inserter(pointers));
+            boost::make_counting_iterator(numbers.end()),
+            std::back_inserter(pointers));
 
   // Use indirect iterator to print out numbers by accessing
   // them through the array of pointers.
-#ifndef BOOST_MSVC
   std::cout << "indirectly printing out the numbers from 0 to " 
-	    << N << std::endl;
+            << N << std::endl;
   std::copy(boost::make_indirect_iterator(pointers.begin()),
-	    boost::make_indirect_iterator(pointers.end()),
-	    std::ostream_iterator<int>(std::cout, " "));
+            boost::make_indirect_iterator(pointers.end()),
+            std::ostream_iterator<int>(std::cout, " "));
   std::cout << std::endl;
 #endif
   return 0;

counting_iterator_test.cpp

@@ -27,7 +27,9 @@
 #include <climits>
 #include <iterator>
 #include <stdlib.h>
-#include <boost/tuple/tuple.hpp>
+#ifndef __BORLANDC__
+# include <boost/tuple/tuple.hpp>
+#endif 
 #include <vector>
 #include <list>
 #include <cassert>
@@ -72,8 +74,12 @@ void category_test(
 
     // Try some binary searches on the range to show that it's ordered
     assert(std::binary_search(start, finish, *internal));
-    CountingIterator x,y;
-    boost::tie(x,y) = std::equal_range(start, finish, *internal);
+
+    // #including tuple crashed borland, so I had to give up on tie().
+    std::pair<CountingIterator,CountingIterator> xy(
+        std::equal_range(start, finish, *internal));
+    CountingIterator x = xy.first, y = xy.second;
+    
     assert(boost::detail::distance(x, y) == 1);
 
     // Show that values outside the range can't be found
@@ -253,7 +259,7 @@ int main()
 # ifndef BOOST_NO_SLIST
     test_container<BOOST_STD_EXTENSION_NAMESPACE::slist<int> >();
 # endif
-    
+
     // Also prove that we can handle raw pointers.
     int array[2000];
     test(boost::make_counting_iterator(array), boost::make_counting_iterator(array+2000-1));

current_function_test.cpp

@@ -0,0 +1,32 @@
+#if defined(_MSC_VER) && !defined(__ICL)
+#pragma warning(disable: 4786)  // identifier truncated in debug info
+#pragma warning(disable: 4710)  // function not inlined
+#pragma warning(disable: 4711)  // function selected for automatic inline expansion
+#pragma warning(disable: 4514)  // unreferenced inline removed
+#endif
+
+//
+//  current_function_test.cpp - a test for boost/current_function.hpp
+//
+//  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
+//
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
+//
+
+#include <boost/current_function.hpp>
+#include <cstdio>
+
+void message(char const * file, long line, char const * func, char const * msg)
+{
+    std::printf("%s(%ld): %s in function '%s'\n", file, line, msg, func);
+}
+
+#define MESSAGE(msg) message(__FILE__, __LINE__, BOOST_CURRENT_FUNCTION, msg)
+
+int main()
+{
+    MESSAGE("assertion failed");
+}

filter_iterator.htm

@@ -195,7 +195,7 @@ The policies type has only one public function, which is its constructor:
 
 <pre>
 template &lt;class Predicate, class BaseIterator&gt;
-typename detail::filter_generator&lt;Predicate, BaseIterator&gt;::type
+typename filter_generator&lt;Predicate, BaseIterator&gt;::type
 make_filter_iterator(BaseIterator first, BaseIterator last, const Predicate& p = Predicate())
 </pre>
 

filter_iterator_example.cpp

@@ -7,7 +7,6 @@
 //  "as is" without express or implied warranty, and with no claim as
 //  to its suitability for any purpose.
 
-
 #include <boost/config.hpp>
 #include <algorithm>
 #include <functional>
@@ -20,17 +19,26 @@ struct is_positive_number {
 
 int main()
 {
-  int numbers[] = { 0, -1, 4, -3, 5, 8, -2 };
-  const int N = sizeof(numbers)/sizeof(int);
-
+  int numbers_[] = { 0, -1, 4, -3, 5, 8, -2 };
+  const int N = sizeof(numbers_)/sizeof(int);
+  
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+  // Assume there won't be proper iterator traits for pointers. This
+  // is just a wrapper for int* which has the right traits.
+  typedef boost::iterator_adaptor<int*, boost::default_iterator_policies, int> base_iterator;
+#else
+  typedef int* base_iterator;
+#endif
+  base_iterator numbers(numbers_);
+  
   // Example using make_filter_iterator()
   std::copy(boost::make_filter_iterator<is_positive_number>(numbers, numbers + N),
-	    boost::make_filter_iterator<is_positive_number>(numbers + N, numbers + N),
-	    std::ostream_iterator<int>(std::cout, " "));
+            boost::make_filter_iterator<is_positive_number>(numbers + N, numbers + N),
+            std::ostream_iterator<int>(std::cout, " "));
   std::cout << std::endl;
 
   // Example using filter_iterator_generator
-  typedef boost::filter_iterator_generator<is_positive_number, int*, int>::type
+  typedef boost::filter_iterator_generator<is_positive_number, base_iterator, int>::type
     FilterIter;
   is_positive_number predicate;
   FilterIter::policies_type policies(predicate, numbers + N);
@@ -42,10 +50,10 @@ int main()
 
   // Another example using make_filter_iterator()
   std::copy(boost::make_filter_iterator(numbers, numbers + N, 
-					std::bind2nd(std::greater<int>(), -2)),
-	    boost::make_filter_iterator(numbers + N, numbers + N, 
-					std::bind2nd(std::greater<int>(), -2)),
-	    std::ostream_iterator<int>(std::cout, " "));
+                                        std::bind2nd(std::greater<int>(), -2)),
+            boost::make_filter_iterator(numbers + N, numbers + N, 
+                                        std::bind2nd(std::greater<int>(), -2)),
+            std::ostream_iterator<int>(std::cout, " "));
   std::cout << std::endl;
   
   

fun_out_iter_example.cpp

@@ -33,7 +33,7 @@ int main(int, char*[])
 
   std::string s = "";
   std::copy(x.begin(), x.end(), 
-	    boost::make_function_output_iterator(string_appender(s)));
+            boost::make_function_output_iterator(string_appender(s)));
   
   std::cout << s << std::endl;
 

generator_iterator.htm

@@ -135,7 +135,7 @@ private:
 int main()
 {
   my_generator gen;
-  boost::generator_iterator<my_generator> it(gen);
+  boost::generator_iterator_generator<my_generator>::type it = boost::make_generator_iterator(gen);
   for(int i = 0; i < 10; ++i, ++it)
     std::cout << *it << std::endl;
 }

include/boost/assert.hpp

@@ -0,0 +1,52 @@
+#ifndef BOOST_ASSERT_HPP_INCLUDED
+#define BOOST_ASSERT_HPP_INCLUDED
+
+#if _MSC_VER >= 1020
+#pragma once
+#endif
+
+//
+//  boost/assert.hpp
+//
+//  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
+//
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
+//
+
+//
+//  When BOOST_DEBUG is not defined, it defaults to 0 (off)
+//  for compatibility with programs that do not expect asserts
+//  in the smart pointer class templates.
+//
+//  This default may be changed after an initial transition period.
+//
+
+#ifndef BOOST_DEBUG
+#define BOOST_DEBUG 0
+#endif
+
+#if BOOST_DEBUG
+
+#include <assert.h>
+
+#ifndef BOOST_ASSERT
+
+#include <boost/current_function.hpp>
+
+bool boost_error(char const * expr, char const * func, char const * file, long line);
+
+# define BOOST_ASSERT(expr) ((expr) || !boost_error(#expr, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__) || (assert(expr), true))
+
+#endif // #ifndef BOOST_ASSERT
+
+#else // #if BOOST_DEBUG
+
+#undef BOOST_ASSERT
+#define BOOST_ASSERT(expr) ((void)0)
+
+#endif // #if BOOST_DEBUG
+
+#endif // #ifndef BOOST_ASSERT_HPP_INCLUDED

include/boost/checked_delete.hpp

@@ -0,0 +1,60 @@
+#ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED
+#define BOOST_CHECKED_DELETE_HPP_INCLUDED
+
+#if _MSC_VER >= 1020
+#pragma once
+#endif
+
+//
+//  boost/checked_delete.hpp
+//
+//  Copyright (c) 1999, 2000, 2001, 2002 boost.org
+//
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
+//
+
+namespace boost
+{
+
+// verify that types are complete for increased safety
+
+template< typename T > inline void checked_delete(T * x)
+{
+    typedef char type_must_be_complete[sizeof(T)];
+    delete x;
+}
+
+template< typename T > inline void checked_array_delete(T * x)
+{
+    typedef char type_must_be_complete[sizeof(T)];
+    delete [] x;
+}
+
+template<class T> struct checked_deleter
+{
+    typedef void result_type;
+    typedef T * argument_type;
+
+    void operator()(T * x)
+    {
+        checked_delete(x);
+    }
+};
+
+template<class T> struct checked_array_deleter
+{
+    typedef void result_type;
+    typedef T * argument_type;
+
+    void operator()(T * x)
+    {
+        checked_array_delete(x);
+    }
+};
+
+} // namespace boost
+
+#endif  // #ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED

include/boost/current_function.hpp

@@ -0,0 +1,56 @@
+#ifndef BOOST_CURRENT_FUNCTION_HPP_INCLUDED
+#define BOOST_CURRENT_FUNCTION_HPP_INCLUDED
+
+#if _MSC_VER >= 1020
+#pragma once
+#endif
+
+//
+//  boost/current_function.hpp - BOOST_CURRENT_FUNCTION
+//
+//  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
+//
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
+//
+
+namespace boost
+{
+
+namespace detail
+{
+
+inline void current_function_helper()
+{
+
+#if defined(__GNUC__)
+
+# define BOOST_CURRENT_FUNCTION __PRETTY_FUNCTION__
+
+#elif defined(__FUNCSIG__)
+
+# define BOOST_CURRENT_FUNCTION __FUNCSIG__
+
+#elif defined(__BORLANDC__)
+
+# define BOOST_CURRENT_FUNCTION __FUNC__
+
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
+
+# define BOOST_CURRENT_FUNCTION __func__
+
+#else
+
+# define BOOST_CURRENT_FUNCTION "(unknown)"
+
+#endif
+
+}
+
+} // namespace detail
+
+} // namespace boost
+
+#endif // #ifndef BOOST_CURRENT_FUNCTION_HPP_INCLUDED

include/boost/detail/call_traits.hpp

@@ -34,20 +34,32 @@ namespace boost{
 
 namespace detail{
 
-template <typename T, bool isp, bool b1, bool b2>
+template <typename T, bool small_>
+struct ct_imp2
+{
+   typedef const T& param_type;
+};
+
+template <typename T>
+struct ct_imp2<T, true>
+{
+   typedef const T param_type;
+};
+
+template <typename T, bool isp, bool b1>
 struct ct_imp
 {
    typedef const T& param_type;
 };
 
 template <typename T, bool isp>
-struct ct_imp<T, isp, true, true>
+struct ct_imp<T, isp, true>
 {
-   typedef T const param_type;
+   typedef typename ct_imp2<T, sizeof(T) <= sizeof(void*)>::param_type param_type;
 };
 
-template <typename T, bool b1, bool b2>
-struct ct_imp<T, true, b1, b2>
+template <typename T, bool b1>
+struct ct_imp<T, true, b1>
 {
    typedef T const param_type;
 };
@@ -67,7 +79,11 @@ public:
    // however compiler bugs prevent this - instead pass three bool's to
    // ct_imp<T,bool,bool,bool> and add an extra partial specialisation
    // of ct_imp to handle the logic. (JM)
-   typedef typename detail::ct_imp<T, ::boost::is_pointer<typename remove_const<T>::type>::value, ::boost::is_arithmetic<typename remove_const<T>::type>::value, sizeof(T) <= sizeof(void*)>::param_type param_type;
+   typedef typename detail::ct_imp<
+      T,
+      ::boost::is_pointer<T>::value,
+      ::boost::is_arithmetic<T>::value
+   >::param_type param_type;
 };
 
 template <typename T>

include/boost/detail/ob_call_traits.hpp

@@ -33,7 +33,7 @@
 
 namespace boost{
 
-#if defined(BOOST_MSVC6_MEMBER_TEMPLATES) || !defined(BOOST_NO_MEMBER_TEMPLATES)
+#ifdef BOOST_MSVC6_MEMBER_TEMPLATES
 //
 // use member templates to emulate
 // partial specialisation:
@@ -64,7 +64,8 @@ struct reference_call_traits
    typedef T const_reference;
    typedef T param_type;
 };
-template <bool simple, bool reference>
+
+template <bool pointer, bool arithmetic, bool reference>
 struct call_traits_chooser
 {
    template <class T>
@@ -73,8 +74,9 @@ struct call_traits_chooser
       typedef standard_call_traits<T> type;
    };
 };
+
 template <>
-struct call_traits_chooser<true, false>
+struct call_traits_chooser<true, false, false>
 {
    template <class T>
    struct rebind
@@ -82,8 +84,9 @@ struct call_traits_chooser<true, false>
       typedef simple_call_traits<T> type;
    };
 };
+
 template <>
-struct call_traits_chooser<false, true>
+struct call_traits_chooser<false, false, true>
 {
    template <class T>
    struct rebind
@@ -91,14 +94,52 @@ struct call_traits_chooser<false, true>
       typedef reference_call_traits<T> type;
    };
 };
+
+template <bool size_is_small> 
+struct call_traits_sizeof_chooser2
+{
+	template <class T>
+	struct small_rebind
+	{
+		typedef simple_call_traits<T> small_type;
+	};
+};
+
+template<> 
+struct call_traits_sizeof_chooser2<false>
+{
+	template <class T>
+	struct small_rebind
+	{
+		typedef standard_call_traits<T> small_type;
+	};
+};
+
+template <>
+struct call_traits_chooser<false, true, false>
+{
+   template <class T>
+   struct rebind
+   {
+	   enum { sizeof_choice = (sizeof(T) <= sizeof(void*)) };
+	   typedef call_traits_sizeof_chooser2<(sizeof(T) <= sizeof(void*))> chooser;
+	   typedef typename chooser::template small_rebind<T> bound_type;
+	   typedef typename bound_type::small_type type;
+   };
+};
+
 } // namespace detail
 template <typename T>
 struct call_traits
 {
 private:
-   typedef detail::call_traits_chooser<(is_pointer<T>::value || is_arithmetic<T>::value) && sizeof(T) <= sizeof(void*), is_reference<T>::value> chooser;
-   typedef typename chooser::template rebind<T> bound_type;
-   typedef typename bound_type::type call_traits_type;
+    typedef detail::call_traits_chooser<
+         ::boost::is_pointer<T>::value,
+         ::boost::is_arithmetic<T>::value, 
+         ::boost::is_reference<T>::value
+      > chooser;
+	typedef typename chooser::template rebind<T> bound_type;
+	typedef typename bound_type::type call_traits_type;
 public:
    typedef typename call_traits_type::value_type       value_type;
    typedef typename call_traits_type::reference        reference;

include/boost/detail/ob_compressed_pair.hpp

@@ -10,8 +10,8 @@
 /* Release notes:
    20 Jan 2001:
         Fixed obvious bugs (David Abrahams)
-	07 Oct 2000:
-		Added better single argument constructor support.
+   07 Oct 2000:
+      Added better single argument constructor support.
    03 Oct 2000:
       Added VC6 support (JM).
    23rd July 2000:
@@ -38,7 +38,7 @@
 
 namespace boost
 {
-#if defined(BOOST_MSVC6_MEMBER_TEMPLATES) || !defined(BOOST_NO_MEMBER_TEMPLATES)
+#ifdef BOOST_MSVC6_MEMBER_TEMPLATES
 //
 // use member templates to emulate
 // partial specialisation.  Note that due to

include/boost/operators.hpp

@@ -9,6 +9,7 @@
 //  See http://www.boost.org for most recent version including documentation.
 
 //  Revision History
+//  02 Dec 01 Bug fixed in random_access_iteratable.  (Helmut Zeisel)
 //  28 Sep 01 Factored out iterator operator groups.  (Daryle Walker)
 //  27 Aug 01 'left' form for non commutative operators added;
 //            additional classes for groups of related operators added;
@@ -87,7 +88,7 @@ namespace boost {
 namespace detail {
 
 // Helmut Zeisel, empty base class optimization bug with GCC 3.0.0
-#if defined(__GNUCC__) && __GNUC__==3 && __GNUC_MINOR__==0 && __GNU_PATCHLEVEL__==0
+#if defined(__GNUC__) && __GNUC__==3 && __GNUC_MINOR__==0 && __GNU_PATCHLEVEL__==0
 class empty_base {
   bool dummy; 
 };
@@ -597,10 +598,14 @@ struct bidirectional_iteratable
     , decrementable<T, B
       > > {};
 
+//  To avoid repeated derivation from equality_comparable,
+//  which is an indirect base class of bidirectional_iterable,
+//  random_access_iteratable must not be derived from totally_ordered1
+//  but from less_than_comparable1 only. (Helmut Zeisel, 02-Dec-2001)
 template <class T, class P, class D, class R, class B = ::boost::detail::empty_base>
 struct random_access_iteratable
     : bidirectional_iteratable<T, P
-    , totally_ordered1<T
+    , less_than_comparable1<T
     , additive2<T, D
     , indexable<T, D, R, B
       > > > > {};
@@ -894,11 +899,9 @@ template <class T,
           class P = V*,
           class R = V&>
 struct forward_iterator_helper
-  : equality_comparable1<T
-  , incrementable<T
-  , dereferenceable<T, P
+  : forward_iteratable<T, P
   , boost::iterator<std::forward_iterator_tag, V, D, P, R
-    > > > > {};
+    > > {};
 
 template <class T,
           class V,
@@ -906,11 +909,9 @@ template <class T,
           class P = V*,
           class R = V&>
 struct bidirectional_iterator_helper
-  : equality_comparable1<T
-  , unit_steppable<T
-  , dereferenceable<T, P
+  : bidirectional_iteratable<T, P
   , boost::iterator<std::bidirectional_iterator_tag, V, D, P, R
-    > > > > {};
+    > > {};
 
 template <class T,
           class V, 
@@ -918,13 +919,9 @@ template <class T,
           class P = V*,
           class R = V&>
 struct random_access_iterator_helper
-  : totally_ordered1<T
-  , unit_steppable<T
-  , dereferenceable<T, P
-  , additive2<T, D
-  , indexable<T, D, R
+  : random_access_iteratable<T, P, D, R
   , boost::iterator<std::random_access_iterator_tag, V, D, P, R
-    > > > > > >
+    > >
 {
   friend D requires_difference_operator(const T& x, const T& y) {
     return x - y;

include/boost/ref.hpp

@@ -1,15 +1,18 @@
 #ifndef BOOST_REF_HPP_INCLUDED
-#define BOOST_REF_HPP_INCLUDED
+# define BOOST_REF_HPP_INCLUDED
 
-#if _MSC_VER+0 >= 1020
-#pragma once
-#endif
+# if _MSC_VER+0 >= 1020
+#  pragma once
+# endif
+
+# include <boost/config.hpp>
 
 //
 //  ref.hpp - ref/cref, useful helper functions
 //
 //  Copyright (C) 1999, 2000 Jaakko J<>rvi (jaakko.jarvi@cs.utu.fi)
 //  Copyright (C) 2001 Peter Dimov
+//  Copyright (C) 2002 David Abrahams
 //
 //  Permission to copy, use, modify, sell and distribute this software
 //  is granted provided this copyright notice appears in all copies.
@@ -25,25 +28,24 @@ namespace boost
 template<class T> class reference_wrapper
 { 
 public:
+    typedef T type;
 
-    explicit reference_wrapper(T & t): t_(t) {}
+    explicit reference_wrapper(T& t): t_(&t) {}
 
-    operator T & () const { return t_; }
+    operator T& () const { return *t_; }
 
-    T & get() const { return t_; }
+    T& get() const { return *t_; }
 
 private:
 
-    T & t_;
-
-    reference_wrapper & operator= (reference_wrapper const &);
+    T* t_;
 };
 
-#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x551)
-#define BOOST_REF_CONST
-#else
-#define BOOST_REF_CONST const
-#endif
+# if defined(__BORLANDC__) && (__BORLANDC__ <= 0x551)
+#  define BOOST_REF_CONST
+# else
+#  define BOOST_REF_CONST const
+# endif
 
 template<class T> inline reference_wrapper<T> BOOST_REF_CONST ref(T & t)
 { 
@@ -55,7 +57,94 @@ template<class T> inline reference_wrapper<T const> BOOST_REF_CONST cref(T const
     return reference_wrapper<T const>(t);
 }
 
-#undef BOOST_REF_CONST
+# undef BOOST_REF_CONST
+
+# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+template<typename T>
+class is_reference_wrapper
+{
+ public:
+    BOOST_STATIC_CONSTANT(bool, value = false); 
+};
+
+template<typename T>
+class is_reference_wrapper<reference_wrapper<T> >
+{
+ public:
+    BOOST_STATIC_CONSTANT(bool, value = true);
+};
+
+template<typename T>
+class unwrap_reference
+{
+ public:
+    typedef T type;
+};
+
+template<typename T>
+class unwrap_reference<reference_wrapper<T> >
+{
+ public:
+    typedef T type;
+};
+# else // no partial specialization
+
+} // namespace boost
+
+#include <boost/type.hpp>
+
+namespace boost
+{
+
+namespace detail
+{
+  typedef char (&yes_reference_wrapper_t)[1];
+  typedef char (&no_reference_wrapper_t)[2];
+      
+  no_reference_wrapper_t is_reference_wrapper_test(...);
+
+  template<typename T>
+  yes_reference_wrapper_t is_reference_wrapper_test(type< reference_wrapper<T> >);
+
+  template<bool wrapped>
+  struct reference_unwrapper
+  {
+      template <class T>
+      struct apply
+      {
+          typedef T type;
+      };
+  };
+
+  template<>
+  struct reference_unwrapper<true>
+  {
+      template <class T>
+      struct apply
+      {
+          typedef typename T::type type;
+      };
+  };
+}
+
+template<typename T>
+class is_reference_wrapper
+{
+ public:
+    BOOST_STATIC_CONSTANT(
+        bool, value = (
+            sizeof(detail::is_reference_wrapper_test(type<T>()))
+            == sizeof(detail::yes_reference_wrapper_t)));
+};
+
+template <typename T>
+class unwrap_reference
+    : public detail::reference_unwrapper<
+        is_reference_wrapper<T>::value
+      >::template apply<T>
+{};
+
+# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
 } // namespace boost
 

include/boost/utility.hpp

@@ -13,37 +13,13 @@
 #ifndef BOOST_UTILITY_HPP
 #define BOOST_UTILITY_HPP
 
-#include <boost/config.hpp>        // broken compiler workarounds
-#include <boost/static_assert.hpp>
-
 // certain headers are part of the <utility.hpp> interface
+
+#include <boost/checked_delete.hpp>
 #include <boost/utility/base_from_member.hpp>  
- 
-#include <cstddef>                 // for size_t
-#include <utility>                 // for std::pair
 
 namespace boost
 {
-//  checked_delete() and checked_array_delete()  -----------------------------//
-
-    // verify that types are complete for increased safety
-
-    template< typename T >
-    inline void checked_delete(T * x)
-    {
-        BOOST_STATIC_ASSERT( sizeof(T) != 0 ); // assert type complete at point
-                                               // of instantiation
-        delete x;
-    }
-
-    template< typename T >
-    inline void checked_array_delete(T  * x)
-    {
-        BOOST_STATIC_ASSERT( sizeof(T) != 0 ); // assert type complete at point
-                                               // of instantiation
-        delete [] x;
-    }
-
 //  next() and prior() template functions  -----------------------------------//
 
     //  Helper functions for classes like bidirectional iterators not supporting

indirect_iterator_example.cpp

@@ -42,10 +42,10 @@ int main(int, char*[])
     const_indirect_last(pointers_to_chars + N);
 
   std::transform(const_indirect_first, const_indirect_last,
-		 mutable_indirect_first, std::bind1st(std::plus<char>(), 1));
+                 mutable_indirect_first, std::bind1st(std::plus<char>(), 1));
 
   std::copy(mutable_indirect_first, mutable_indirect_last,
-	    std::ostream_iterator<char>(std::cout, ","));
+            std::ostream_iterator<char>(std::cout, ","));
   std::cout << std::endl;
 
   
@@ -53,8 +53,8 @@ int main(int, char*[])
 
 #ifndef BOOST_MSVC
   std::copy(boost::make_indirect_iterator(pointers_to_chars), 
-	    boost::make_indirect_iterator(pointers_to_chars + N),
-	    std::ostream_iterator<char>(std::cout, ","));
+            boost::make_indirect_iterator(pointers_to_chars + N),
+            std::ostream_iterator<char>(std::cout, ","));
   std::cout << std::endl;
 #endif
   

iter_traits_gen_test.cpp

@@ -21,7 +21,7 @@ main()
 {
   using boost::dummyT;
   dummyT array[] = { dummyT(0), dummyT(1), dummyT(2), 
-		     dummyT(3), dummyT(4), dummyT(5) };
+                     dummyT(3), dummyT(4), dummyT(5) };
   typedef boost::iterator_adaptor<dummyT*, 
     boost::default_iterator_policies, dummyT> my_iter;
   my_iter mi(array);

iterator_adaptor_test.cpp

@@ -309,8 +309,8 @@ main()
     // Borland is choking on accessing the policies_type explicitly
     // from the filter_iter. 
     boost::forward_iterator_test(make_filter_iterator(array, array+N, 
-						      one_or_four()),
-				 dummyT(1), dummyT(4));
+                                                      one_or_four()),
+                                 dummyT(1), dummyT(4));
 #else
     filter_iter i(array, filter_iter::policies_type(one_or_four(), array + N));
     boost::forward_iterator_test(i, dummyT(1), dummyT(4));
@@ -409,17 +409,31 @@ main()
 
   {
     // check permutation_iterator
-    typedef std::vector< int > element_range_type;
+    typedef std::deque< int > element_range_type;
     typedef std::list< int > index_type;
     
     static const int element_range_size = 10;
     static const int index_size = 4;
     
     element_range_type elements( element_range_size );
-    std::iota( elements.begin(), elements.end(), 0 );
+    
+    for(element_range_type::iterator el_it = elements.begin();
+        el_it != elements.end();
+        ++el_it)
+    {
+        *el_it = std::distance( elements.begin(), el_it );
+    }
     
     index_type indices( index_size );
-    std::iota( indices.begin(), indices.end(), element_range_size - index_size );
+    
+    for(index_type::iterator i_it = indices.begin();
+        i_it != indices.end();
+        ++i_it)
+    {
+        *i_it = element_range_size - index_size
+            + std::distance(indices.begin(), i_it );
+    }
+    
     std::reverse( indices.begin(), indices.end() );
     
     typedef boost::permutation_iterator_generator< element_range_type::iterator, index_type::iterator >::type permutation_type;

iterator_adaptors.htm

@@ -92,6 +92,8 @@
 
               <li><a href="#declaration_synopsis">Declaration Synopsis</a>
 
+              <li><a href="#portability">Portability</a>
+
               <li><a href="#notes">Notes</a>
             </ul>
 
@@ -307,12 +309,16 @@ typedef iterator_adaptor&lt;foo_iterator, foo_policies,
 
     <table border="1" summary="iterator_adaptor Policies operations">
       <caption>
-        <b>Core Iterator Operations</b><br>
-        <tt>T</tt>: adapted iterator type; <tt>p</tt>: object of type T; <tt>n</tt>: <tt>T::size_type</tt>; <tt>x</tt>: <tt>T::difference_type</tt>; <tt>p1</tt>, <tt>p2</tt>: iterators
+        <b>Policies Class Requirements</b><br>
+        <tt><b>T</b></tt>: adapted iterator type; <tt><b>x, y</b></tt>: objects of type
+        T; <tt><b>p</b></tt>: <tt>T::policies_type</tt>
+         <tt><b>d</b></tt>:
+        <tt>T::difference_type</tt>; <tt><b>i1</b></tt>, <tt><b>i2</b></tt>:
+        <tt>T::base_type</tt>
       </caption>
 
       <tr>
-        <th>Operation
+        <th>Expression
 
         <th>Effects
 
@@ -321,7 +327,7 @@ typedef iterator_adaptor&lt;foo_iterator, foo_policies,
         <th>Required for Iterator Categories
 
       <tr>
-        <td><tt>initialize</tt>
+        <td nowrap><tt>p.initialize(b)</tt>
 
         <td>optionally modify base iterator during iterator construction
 
@@ -333,79 +339,66 @@ typedef iterator_adaptor&lt;foo_iterator, foo_policies,
         "http://www.sgi.com/tech/stl/ForwardIterator.html">Forward</a>/ <a
         href=
         "http://www.sgi.com/tech/stl/BidirectionalIterator.html">Bidirectional</a>/
-        <a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-        Access</a> 
+        <a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random&nbsp;Access</a> 
 
 	  
       <tr>
-        <td><tt>dereference</tt> 
+        <td nowrap><tt>p.dereference(x)</tt>
 
         <td>returns an element of the iterator's <tt>reference</tt> type
         
-        <td><tt>*p</tt>, <tt>p[n]</tt>
+        <td><tt>*x</tt>, <tt>x[d]</tt>
 
 
       <tr>
-        <td><tt>equal</tt> 
+        <td nowrap><tt>p.equal(x, y)</tt> 
 
         <td>tests the iterator for equality
 
-        <td><tt>p1&nbsp;==&nbsp;p2</tt>, <tt>p1&nbsp;!=&nbsp;p2</tt>
+        <td><tt>i1&nbsp;==&nbsp;i2</tt>, <tt>i1&nbsp;!=&nbsp;i2</tt>
 
       <tr>
-        <td><tt>increment</tt> 
+        <td nowrap><tt>p.increment(x)</tt> 
 
         <td>increments the iterator
 
         <td><tt>++p</tt>, <tt>p++</tt>
 
       <tr>
-        <td><tt>decrement</tt> 
+        <td nowrap><tt>p.decrement(x)</tt> 
 
         <td>decrements the iterator
 
-        <td><tt>--p</tt>, <tt>p--</tt>
+        <td><tt>--x</tt>, <tt>x--</tt>
 
         <td><a href=
         "http://www.sgi.com/tech/stl/BidirectionalIterator.html">Bidirectional</a>/
-        <a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-        Access</a> 
+        <a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random&nbsp;Access</a> 
 
       <tr>
-        <td><tt>less</tt> 
-
-        <td>imposes a <a href=
-        "http://www.sgi.com/tech/stl/StrictWeakOrdering.html">Strict Weak
-        Ordering</a> relation on iterators
-
-        <td> 
-           <tt>p1&nbsp;&lt;&nbsp;p2</tt>,
-           <tt>p1&nbsp;&lt;=&nbsp;p2</tt>,
-           <tt>p1&nbsp;&gt;&nbsp;p2</tt>,
-           <tt>p1&nbsp;&gt;=&nbsp;p2</tt>
-
-        <td rowspan="3"><a href=
-        "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
-        Access</a> 
-
-      <tr>
-        <td><tt>distance</tt> 
+        <td nowrap><tt>p.distance(x, y)</tt> 
 
         <td>measures the distance between iterators
 
-        <td><tt>p1 - p2</tt>
+        <td><tt>y&nbsp;-&nbsp;x</tt>, <tt>x&nbsp;&lt;&nbsp;y</tt>
+
+       <td rowspan="2"><a href=
+         "http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random
+         Access</a> 
 
       <tr>
-        <td><tt>advance</tt> 
+        <td nowrap><tt>p.advance(x, n)</tt> 
 
         <td>adds an integer offset to iterators
 
         <td>
-<tt>p&nbsp;+&nbsp;x</tt>,
-<tt>x&nbsp;+&nbsp;p</tt>,
-<tt>p&nbsp;+=&nbsp;x</tt>,
-<tt>p&nbsp;-&nbsp;x</tt>,
-<tt>p&nbsp;-=&nbsp;x</tt>
+<tt>x&nbsp;+&nbsp;d</tt>,
+<tt>d&nbsp;+&nbsp;x</tt>,
+
+<br>
+<tt>x&nbsp;+=&nbsp;d</tt>,
+<tt>x&nbsp;-&nbsp;d</tt>,<br>
+<tt>x&nbsp;-=&nbsp;d</tt>
         
     </table>
 
@@ -496,9 +489,15 @@ struct <a name="default_iterator_policies">default_iterator_policies</a>
          Requires: <tt>B</tt> is convertible to <tt>Base</tt>.
 
       <tr>
-        <td><tt>base_type base() const;</tt>
+        <td><tt>const base_type& base() const;</tt>
+           <br><br>
+         Return a const reference to the base object.
+
+      <tr>        <td><tt>base_type& base();</tt>
          <br><br>
-         Return a copy of the base object.
+         Return a reference to the base object. This is to give the policies object
+         access to the base object. See <a href="#policies">above</a> for policies
+         iterator_adaptor interaction.<a href="#8">[8]</a>
     </table>
 
     <h3><a name="example">Example</a></h3>
@@ -665,7 +664,7 @@ int main(int, char*[])
 
       <li>Interoperable iterators can be freely mixed in comparison expressions
       so long as the <tt>Policies</tt> class has <tt>equal</tt> (and, for
-      random access iterators, <tt>less</tt>) members that can accept both
+      random access iterators, <tt>distance</tt>) members that can accept both
       <tt>Base</tt> types in either order.
 
       <li>Interoperable iterators can be freely mixed in subtraction
@@ -719,11 +718,12 @@ they share the same <tt>Policies</tt> and since <tt>Category</tt> and
 the projection <tt>const_iterator</tt>.
 
 <li> Since <tt>projection_iterator_policies</tt> implements only the
-<tt>dereference</tt> operation, and inherits all other behaviors from <tt><a
-href="#default_iterator_policies">default_iterator_policies</a></tt>, which has
-fully-templatized <tt>equal</tt>, <tt>less</tt>, and <tt>distance</tt>
-operations, the <tt>iterator</tt> and <tt>const_iterator</tt> can be freely
-mixed in comparison and subtraction expressions.
+<tt>dereference</tt> operation, and inherits all other behaviors from
+<tt><a
+href="#default_iterator_policies">default_iterator_policies</a></tt>,
+which has fully-templatized <tt>equal</tt> and <tt>distance</tt>
+operations, the <tt>iterator</tt> and <tt>const_iterator</tt> can be
+freely mixed in comparison and subtraction expressions.
 
 </ul>
 
@@ -731,7 +731,7 @@ mixed in comparison and subtraction expressions.
 
     <p>There is an unlimited number of ways the <tt>iterator_adaptors</tt>
     class can be used to create iterators. One interesting exercise would be to
-    re-implement the iterators of <tt>std::list</tt> and <tt>std::slist</tt>
+    re-implement the iterators of <tt>std::list</tt> and <tt>slist</tt>
     using <tt>iterator_adaptors</tt>, where the adapted <tt>Iterator</tt> types
     would be node pointers.
 
@@ -768,7 +768,8 @@ struct iterator_adaptor
     iterator_adaptor();
     explicit iterator_adaptor(const Base&amp;, const Policies&amp; = Policies());
 
-    base_type base() const;
+    base_type&       base();
+    const base_type& base() const;
 
     template &lt;class B, class V, class R, class P&gt;
     iterator_adaptor(
@@ -813,6 +814,19 @@ bool operator==(const iterator_adaptor&lt;B1,P,V1,R1,P1,C,D&gt;&amp;,
 // and similarly for operators !=, &lt;, &lt;=, &gt;=, &gt;
 </pre>
 
+    <h3><a name="portability">Portability</a></h3>
+
+    <p>Generally, the iterator adaptors library can be compiled with all compilers
+    supporting iterator traits and type traits.</p>
+
+    <p>Microsoft VC++ is not able to handle iterator adaptors based on a 
+    <code>vector<T>::iterator</code> without specifying all template paramters explicitly.
+    In case not all template parameters are specified explicitly, the iterator adaptors
+    library will deduce these types using iterator_traits. But since in VC++ a
+    <code>vector<T>::iterator</code> is a <code>T*</code>, VC++ can't handle using 
+    iterator_traits due to the lack of partial template specialization.</p> 
+    
+
     <h3><a name="notes">Notes</a></h3>
 
     <p><a name="1">[1]</a> The standard specifies that the <tt>value_type</tt>
@@ -899,11 +913,15 @@ bool operator==(const iterator_adaptor&lt;B1,P,V1,R1,P1,C,D&gt;&amp;,
     <tt>Base</tt> type is a const pointer, then the correct defaults
     for the <tt>reference</tt> and <tt>pointer</tt> types can not be
     deduced. You must specify these types explicitly.
+    <p><a name="8">[8]</a>
+    Exposing the base object might be considered as being dangerous.
+    A possible fix would require compiler support for template friends. 
+    As this is not widely available today, the base object remains exposed for now.
 
     <hr>
 
     <p>Revised 
-    <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->18 Sep 2001<!--webbot bot="Timestamp" endspan i-checksum="14941" -->
+    <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->30 Nov 2001<!--webbot bot="Timestamp" endspan i-checksum="15239" -->
 
 
     <p>&copy; Copyright Dave Abrahams and Jeremy Siek 2001. Permission to copy,

iterators_test.cpp

@@ -100,7 +100,8 @@ public:
 
 private:
     // Test data
-    static  iter_type const  fruit_begin, fruit_end;
+    static iter_type const  fruit_begin;
+    static iter_type const  fruit_end;
 
     // Test parts
     static  void  post_increment_test();
@@ -123,12 +124,12 @@ test_opr_base::scratch_array_type
  test_opr_base::scratch = "";
 
 template <typename T, typename R, typename P>
-typename test_opr<T, R, P>::iter_type const
- test_opr<T, R, P>::fruit_begin( fruit );
+  typename test_opr<T, R, P>::iter_type const
+ test_opr<T, R, P>::fruit_begin = test_iter<T,R,P>( fruit );
 
 template <typename T, typename R, typename P>
 typename test_opr<T, R, P>::iter_type const
- test_opr<T, R, P>::fruit_end( fruit + fruit_length );
+ test_opr<T, R, P>::fruit_end = test_iter<T,R,P>( fruit + fruit_length );
 
 
 // Main testing function

noncopyable_test.cpp

@@ -20,7 +20,7 @@
 
 namespace
 {
-    class DontTreadOnMe : boost::noncopyable
+    class DontTreadOnMe : private boost::noncopyable
     {
     public:
          DontTreadOnMe() { std::cout << "defanged!" << std::endl; }
@@ -35,4 +35,4 @@ int main()
     object1 = object2;
     return 0;
 }   // main
-  
+  

operators_test.cpp

@@ -499,7 +499,6 @@ namespace
         void operator()(boost::minstd_rand& randomizer) const
         {
             Big    b1 = Big( randomizer() );
-            Big    b2 = Big( randomizer() );
             Small  s = Small( randomizer() );
             
             test_left( Wrapped6<Big, Small>(b1), s, b1, s );

permutation_iterator.htm

@@ -47,7 +47,7 @@ namespace boost {
 <p>The <code>permutation_iterator_generator</code> is a helper class whose purpose
 is to construct a permutation iterator <strong>type</strong>. This class has
 two template arguments, the first being the iterator type over the range V, the
-second being the type of iterator over the indices.
+second being the type of the iterator over the indices.
 
 <blockquote>
 <pre>
@@ -78,9 +78,9 @@ of <a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">RandomAccessI
 <tr>
 <td><tt>IndexIterator</tt></td>
 <td>The iterator over the new indexing scheme. This type must at least be a model
-of <a href="http://www.sgi.com/tech/stl/ForwardIterator.html">ForwardIterator</a></td>.
+of <a href="http://www.sgi.com/tech/stl/ForwardIterator.html">ForwardIterator</a>.
 The <code>IndexIterator::value_type</code> must be convertible to the 
-<code>ElementIterator::difference_type</code>.
+<code>ElementIterator::difference_type</code>.</td>
 </table>
 
 <h3>Concept Model</h3>
@@ -91,9 +91,9 @@ The permutation iterator implements the member functions
 and operators required for the 
 <a href="http://www.sgi.com/tech/stl/RandomAccessIterator.html">Random Access Iterator</a>
 concept. However, the permutation iterator can only meet the complexity guarantees 
-of the same concept as the OrderIterator. Thus for instance, although the permutation
+of the same concept as the IndexIterator. Thus for instance, although the permutation
 iterator provides <code>operator+=(distance)</code>, this operation will take linear time
-in case the OrderIterator is a model of ForwardIterator instead of amortized constant time.
+in case the IndexIterator is a model of ForwardIterator instead of amortized constant time.
 
 <br>
 
@@ -108,13 +108,16 @@ types.
 <pre>
 template &lt;class ElementIterator, class IndexIterator &gt;
 typename permutation_iterator_generator&lt;ElementIterator, IndexIterator&gt;::type
-make_permutation_iterator(ElementIterator&amp; base, IndexIterator&amp; order);
+make_permutation_iterator(ElementIterator&amp; base, IndexIterator&amp; indices);
 </pre>
 </blockquote>
 
 <h2>Example</h2>
 <blockquote>
 <pre>
+  using namespace boost;
+  int i = 0;
+
   typedef std::vector< int > element_range_type;
   typedef std::list< int > index_type;
 
@@ -122,10 +125,10 @@ make_permutation_iterator(ElementIterator&amp; base, IndexIterator&amp; order);
   static const int index_size = 4;
 
   element_range_type elements( element_range_size );
-  std::iota( elements.begin(), elements.end(), 0 );
+  for(element_range_type::iterator el_it = elements.begin() ; el_it != elements.end() ; ++el_it) *el_it = std::distance(elements.begin(), el_it);
 
   index_type indices( index_size );
-  std::iota( indices.begin(), indices.end(), element_range_size - index_size );
+  for(index_type::iterator i_it = indices.begin() ; i_it != indices.end() ; ++i_it ) *i_it = element_range_size - index_size + std::distance(indices.begin(), i_it);
   std::reverse( indices.begin(), indices.end() );
 
   typedef permutation_iterator_generator< element_range_type::iterator, index_type::iterator >::type permutation_type;
@@ -133,18 +136,33 @@ make_permutation_iterator(ElementIterator&amp; base, IndexIterator&amp; order);
   permutation_type it = begin;
   permutation_type end = make_permutation_iterator( elements.begin(), indices.end() );
 
-  std::cout.setf( std::ios_base::left );
-  std::cout << std::setw( 50 ) << "The original range is : ";
+  std::cout << "The original range is : ";
   std::copy( elements.begin(), elements.end(), std::ostream_iterator< int >( std::cout, " " ) );
   std::cout << "\n";
 
-  std::cout << std::setw( 50 ) << "The reindexing scheme is : ";
+  std::cout << "The reindexing scheme is : ";
   std::copy( indices.begin(), indices.end(), std::ostream_iterator< int >( std::cout, " " ) );
   std::cout << "\n";
 
-  std::cout << std::setw( 50 ) << "The permutated range is : ";
+  std::cout << "The permutated range is : ";
   std::copy( begin, end, std::ostream_iterator< int >( std::cout, " " ) );
   std::cout << "\n";
+
+  std::cout << "Elements at even indices in the permutation : ";
+  it = begin;
+  for(i = 0; i < index_size / 2 ; ++i, it+=2 ) std::cout << *it << " ";
+  std::cout << "\n";
+
+  std::cout << "Permutation backwards : ";
+  it = begin + (index_size);
+  assert( it != begin );
+  for( ; it-- != begin ; ) std::cout << *it << " ";
+  std::cout << "\n";
+
+  std::cout << "Iterate backward with stride 2 : ";
+  it = begin + (index_size - 1);
+  for(i = 0 ; i < index_size / 2 ; ++i, it-=2 ) std::cout << *it << " ";
+  std::cout << "\n";
 </pre>
 </blockquote>
 

ref_ct_test.cpp

@@ -0,0 +1,115 @@
+// compile-time test for "boost/ref.hpp" header content
+// see 'ref_test.cpp' for run-time part
+
+#include <boost/ref.hpp>
+#include <boost/type_traits/same_traits.hpp>
+#include <boost/static_assert.hpp>
+
+namespace {
+
+template< typename T, typename U >
+void ref_test(boost::reference_wrapper<U>)
+{
+    typedef typename boost::reference_wrapper<U>::type type;
+    BOOST_STATIC_ASSERT((boost::is_same<U,type>::value));
+    BOOST_STATIC_ASSERT((boost::is_same<T,type>::value));
+}
+
+template< typename T >
+void assignable_test(T x)
+{
+    x = x;
+}
+
+template< bool R, typename T >
+void is_reference_wrapper_test(T)
+{
+    BOOST_STATIC_ASSERT(boost::is_reference_wrapper<T>::value == R);
+}
+
+template< typename R, typename Ref >
+void cxx_reference_test(Ref)
+{
+    BOOST_STATIC_ASSERT((boost::is_same<R,Ref>::value));
+}
+
+template< typename R, typename Ref >
+void unwrap_reference_test(Ref)
+{
+    typedef typename boost::unwrap_reference<Ref>::type type;
+    BOOST_STATIC_ASSERT((boost::is_same<R,type>::value));
+}
+
+} // namespace
+
+int main()
+{
+    int i = 0;
+    int& ri = i;
+
+    int const ci = 0;
+    int const& rci = ci;
+
+    // 'ref/cref' functions test
+    ref_test<int>(boost::ref(i));
+    ref_test<int>(boost::ref(ri));
+    ref_test<int const>(boost::ref(ci));
+    ref_test<int const>(boost::ref(rci));
+
+    ref_test<int const>(boost::cref(i));
+    ref_test<int const>(boost::cref(ri));
+    ref_test<int const>(boost::cref(ci));
+    ref_test<int const>(boost::cref(rci));
+
+    // test 'assignable' requirement
+    assignable_test(boost::ref(i));
+    assignable_test(boost::ref(ri));
+    assignable_test(boost::cref(i));
+    assignable_test(boost::cref(ci));
+    assignable_test(boost::cref(rci));
+
+    // 'is_reference_wrapper' test
+    is_reference_wrapper_test<true>(boost::ref(i));
+    is_reference_wrapper_test<true>(boost::ref(ri));
+    is_reference_wrapper_test<true>(boost::cref(i));
+    is_reference_wrapper_test<true>(boost::cref(ci));
+    is_reference_wrapper_test<true>(boost::cref(rci));
+
+    is_reference_wrapper_test<false>(i);
+    is_reference_wrapper_test<false, int&>(ri);
+    is_reference_wrapper_test<false>(ci);
+    is_reference_wrapper_test<false, int const&>(rci);
+
+    // ordinary references/function template arguments deduction test
+    cxx_reference_test<int>(i);
+    cxx_reference_test<int>(ri);
+    cxx_reference_test<int>(ci);
+    cxx_reference_test<int>(rci);
+
+    cxx_reference_test<int&, int&>(i);
+    cxx_reference_test<int&, int&>(ri);
+    cxx_reference_test<int const&, int const&>(i);
+    cxx_reference_test<int const&, int const&>(ri);
+    cxx_reference_test<int const&, int const&>(ci);
+    cxx_reference_test<int const&, int const&>(rci);
+
+    // 'unwrap_reference' test
+    unwrap_reference_test<int>(boost::ref(i));
+    unwrap_reference_test<int>(boost::ref(ri));
+    unwrap_reference_test<int const>(boost::cref(i));
+    unwrap_reference_test<int const>(boost::cref(ci));
+    unwrap_reference_test<int const>(boost::cref(rci));
+
+    unwrap_reference_test<int>(i);
+    unwrap_reference_test<int>(ri);
+    unwrap_reference_test<int>(ci);
+    unwrap_reference_test<int>(rci);
+    unwrap_reference_test<int&, int&>(i);
+    unwrap_reference_test<int&, int&>(ri);
+    unwrap_reference_test<int const&, int const&>(i);
+    unwrap_reference_test<int const&, int const&>(ri);
+    unwrap_reference_test<int const&, int const&>(ci);
+    unwrap_reference_test<int const&, int const&>(rci);
+
+    return 0;
+}

ref_test.cpp

@@ -0,0 +1,74 @@
+
+// run-time test for "boost/ref.hpp" header content
+// see 'ref_ct_test.cpp' for compile-time part
+
+#if defined(_MSC_VER) && !defined(__ICL)
+# pragma warning(disable: 4786)  // identifier truncated in debug info
+# pragma warning(disable: 4710)  // function not inlined
+# pragma warning(disable: 4711)  // function selected for automatic inline expansion
+# pragma warning(disable: 4514)  // unreferenced inline removed
+#endif
+
+#include <boost/ref.hpp>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+# pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+# pragma warning(pop)
+#endif
+
+
+#define BOOST_INCLUDE_MAIN
+#include <boost/test/test_tools.hpp>
+
+namespace {
+using namespace boost;
+
+template <class T>
+struct ref_wrapper
+{
+    // Used to verify implicit conversion
+    static T* get_pointer(T& x)
+    {
+        return &x;
+    }
+
+    static T const* get_const_pointer(T const& x)
+    {
+        return &x;
+    }
+
+    template <class Arg>
+    static T* passthru(Arg x)
+    {
+        return get_pointer(x);
+    }
+
+    template <class Arg>
+    static T const* cref_passthru(Arg x)
+    {
+        return get_const_pointer(x);
+    }
+
+    static void test(T x)
+    {
+        BOOST_TEST(passthru(ref(x)) == &x);
+        BOOST_TEST(&ref(x).get() == &x);
+
+        BOOST_TEST(cref_passthru(cref(x)) == &x);
+        BOOST_TEST(&cref(x).get() == &x);
+    }
+};
+
+} // namespace unnamed
+
+int test_main(int, char * [])
+{
+    ref_wrapper<int>::test(1);
+    ref_wrapper<int const>::test(1);
+    return 0;
+}

reverse_iterator_example.cpp

@@ -10,23 +10,32 @@
 
 int main(int, char*[])
 {
-  char letters[] = "hello world!";
-  const int N = sizeof(letters)/sizeof(char) - 1;
+  char letters_[] = "hello world!";
+  const int N = sizeof(letters_)/sizeof(char) - 1;
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+  // Assume there won't be proper iterator traits for pointers. This
+  // is just a wrapper for char* which has the right traits.
+  typedef boost::iterator_adaptor<char*, boost::default_iterator_policies, char> base_iterator;
+#else
+  typedef char* base_iterator;
+#endif
+  base_iterator letters(letters_);
+  
   std::cout << "original sequence of letters:\t"
-	    << letters << std::endl;
+            << letters_ << std::endl;
 
   std::sort(letters, letters + N);
 
   // Use reverse_iterator_generator to print a sequence
   // of letters in reverse order.
   
-  boost::reverse_iterator_generator<char*>::type
+  boost::reverse_iterator_generator<base_iterator>::type
     reverse_letters_first(letters + N),
     reverse_letters_last(letters);
 
   std::cout << "letters in descending order:\t";
   std::copy(reverse_letters_first, reverse_letters_last,
-	    std::ostream_iterator<char>(std::cout));
+            std::ostream_iterator<char>(std::cout));
   std::cout << std::endl;
 
   // Use make_reverse_iterator() to print the sequence
@@ -34,8 +43,8 @@ int main(int, char*[])
 
   std::cout << "letters in ascending order:\t";
   std::copy(boost::make_reverse_iterator(reverse_letters_last),
-	    boost::make_reverse_iterator(reverse_letters_first),
-	    std::ostream_iterator<char>(std::cout));
+            boost::make_reverse_iterator(reverse_letters_first),
+            std::ostream_iterator<char>(std::cout));
   std::cout << std::endl;
 
   return 0;

tie_example.cpp

@@ -41,9 +41,9 @@ main(int, char*[])
     for (int k = 0; k < 2; ++k) {
       boost::tie(i,inserted) = s.insert(new_vals[k]);
       if (!inserted)
-	std::cout << *i << " was already in the set." << std::endl;
+        std::cout << *i << " was already in the set." << std::endl;
       else
-	std::cout << *i << " successfully inserted." << std::endl;    
+        std::cout << *i << " successfully inserted." << std::endl;    
     }
   }    
   {
@@ -55,7 +55,7 @@ main(int, char*[])
 
     boost::tie(i,end) = std::equal_range(vals, vals + 6, 4);
     std::cout << "There were " << std::distance(i,end)
-	      << " occurrences of " << *i << "." << std::endl;
+              << " occurrences of " << *i << "." << std::endl;
     // Footnote: of course one would normally just use std::count()
     // to get this information, but that would spoil the example :)
   }

transform_iterator_example.cpp

@@ -18,15 +18,15 @@ namespace boost {
   template <class Operation> 
   class binder1st
     : public std::unary_function<typename Operation::second_argument_type,
-			         typename Operation::result_type> {
+                                 typename Operation::result_type> {
   protected:
     Operation op;
     typename Operation::first_argument_type value;
   public:
     binder1st() { } // this had to be added!
     binder1st(const Operation& x,
-	      const typename Operation::first_argument_type& y)
-	: op(x), value(y) {}
+              const typename Operation::first_argument_type& y)
+        : op(x), value(y) {}
     typename Operation::result_type
     operator()(const typename Operation::second_argument_type& x) const {
       return op(value, x); 
@@ -66,8 +66,8 @@ main(int, char*[])
   std::cout << "adding 4 to each element in the array:" << std::endl;
 
   std::copy(boost::make_transform_iterator(x, boost::bind1st(std::plus<int>(), 4)),
-	    boost::make_transform_iterator(x + N, boost::bind1st(std::plus<int>(), 4)),
-	    std::ostream_iterator<int>(std::cout, " "));
+            boost::make_transform_iterator(x + N, boost::bind1st(std::plus<int>(), 4)),
+            std::ostream_iterator<int>(std::cout, " "));
   std::cout << std::endl;
   
   return 0;