This commit was manufactured by cvs2svn to create branch

'python-v2-dev'.

[SVN r14785]

array3.cpp

@@ -17,7 +17,7 @@ int main()
     // copy and change order
     boost::array<std::string,4> seasons_orig = seasons;
     for (unsigned i=seasons.size()-1; i>0; --i) {
-        swap(seasons.at(i),seasons.at((i+1)%seasons.size()));
+        std::swap(seasons.at(i),seasons.at((i+1)%seasons.size()));
     }
 
     std::cout << "one way:   ";
@@ -25,7 +25,7 @@ int main()
 
     // try swap()
     std::cout << "other way: ";
-    swap(seasons,seasons_orig);
+    std::swap(seasons,seasons_orig);
     print_elements(seasons);
 
     // try reverse iterators

array5.cpp

@@ -27,7 +27,8 @@ int main()
     // use some common STL container operations
     std::cout << "static_size: " << a.size() << std::endl;
     std::cout << "size:        " << a.size() << std::endl;
-    std::cout << "empty:       " << std::boolalpha << a.empty() << std::endl;
+    // Can't use std::boolalpha because it isn't portable
+    std::cout << "empty:       " << (a.empty()? "true" : "false") << std::endl;
     std::cout << "max_size:    " << a.max_size() << std::endl;
     std::cout << "front:       " << a.front() << std::endl;
     std::cout << "back:        " << a.back() << std::endl;
@@ -56,7 +57,7 @@ int main()
 
     typedef boost::array<double,6> DArray;
     typedef boost::array<int,6> IArray;
-    IArray ia = { 1, 2, 3, 4, 5, 6 };
+    IArray ia = { { 1, 2, 3, 4, 5, 6 } } ; // extra braces silence GCC warning
     DArray da;
     da = ia;
     da.assign(42);

include/boost/array.hpp

@@ -53,6 +53,12 @@ namespace boost {
 #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(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;
+        typedef std::reverse_iterator<std::_Ptrit<value_type, difference_type, const_iterator,
+		                                const_reference, iterator, reference> > const_reverse_iterator;
 #else
         // workaround for broken reverse_iterator implementations
         typedef std::reverse_iterator<iterator,T> reverse_iterator;
@@ -154,3 +160,4 @@ namespace boost {
 } /* namespace boost */
 
 #endif /*BOOST_ARRAY_HPP*/
+