This commit was manufactured by cvs2svn to create branch

'python-v2-dev'.

[SVN r14785]

array1.cpp

@@ -1,16 +1,9 @@
 /* simple example for using class array<>
- *
- * (C) Copyright Nicolai M. Josuttis 2001.
- * 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.
  *
  * Changelog:
  * 20 Jan 2001 - Removed boolalpha use since stock GCC doesn't support it
  *               (David Abrahams)
  */
-
 #include <iostream>
 #include <boost/array.hpp>
 

array2.cpp

@@ -1,11 +1,5 @@
 /* example for using class array<>
- * (C) Copyright Nicolai M. Josuttis 2001.
- * 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 <algorithm>
 #include <functional>
 #include <boost/array.hpp>

array3.cpp

@@ -1,11 +1,5 @@
 /* example for using class array<>
- * (C) Copyright Nicolai M. Josuttis 2001.
- * 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 <string>
 #include <iostream>
 #include <boost/array.hpp>

array4.cpp

@@ -1,11 +1,5 @@
 /* example for using class array<>
- * (C) Copyright Nicolai M. Josuttis 2001.
- * 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 <algorithm>
 #include <functional>
 #include <string>

array5.cpp

@@ -1,11 +1,5 @@
 /* simple example for using class array<>
- * (C) Copyright Nicolai M. Josuttis 2001.
- * 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 <iostream>
 #include <boost/array.hpp>
 
@@ -16,8 +10,8 @@ void test_static_size (const T& cont)
     for (unsigned i=0; i<T::static_size; ++i) {
         tmp[i] = int(cont[i]);
     }
-    for (unsigned j=0; j<T::static_size; ++j) {
+    for (unsigned i=0; i<T::static_size; ++i) {
-        std::cout << tmp[j] << ' ';
+        std::cout << tmp[i] << ' ';
     }
     std::cout << std::endl;
 }

include/boost/array.hpp

@@ -11,22 +11,16 @@
  * This software is provided "as is" without express or implied
  * warranty, and with no claim as to its suitability for any purpose.
  *
- * 23 Aug 2002 - fix for Non-MSVC compilers combined with MSVC libraries.
  * 05 Aug 2001 - minor update (Nico Josuttis)
  * 20 Jan 2001 - STLport fix (Beman Dawes)
  * 29 Sep 2000 - Initial Revision (Nico Josuttis)
  */
-
-// See http://www.boost.org/libs/array for Documentation.
-
 #ifndef BOOST_ARRAY_HPP
 #define BOOST_ARRAY_HPP
 
 #include <cstddef>
 #include <stdexcept>
-
+#include <iterator>
-// Handles broken standard libraries better than <iterator>
-#include <boost/detail/iterator.hpp>
 #include <algorithm>
 
 // FIXES for broken compilers
@@ -56,10 +50,10 @@ namespace boost {
         const_iterator end() const { return elems+N; }
 
         // reverse iterator support
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_MSVC_STD_ITERATOR) && !defined(BOOST_NO_STD_ITERATOR_TRAITS)
+#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_MSVC_STD_ITERATOR)
         typedef std::reverse_iterator<iterator> reverse_iterator;
         typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-#elif defined(_MSC_VER) && (_MSC_VER == 1300) && defined(BOOST_DINKUMWARE_STDLIB) && (BOOST_DINKUMWARE_STDLIB == 310)
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1300)
         // workaround for broken reverse_iterator in VC7
         typedef std::reverse_iterator<std::_Ptrit<value_type, difference_type, iterator,
                                       reference, iterator, reference> > reverse_iterator;
@@ -167,9 +161,3 @@ namespace boost {
 
 #endif /*BOOST_ARRAY_HPP*/
 
-
-
-
-
-
-