Phoenix Reloaded

[SVN r53348]

CMakeLists.txt

@@ -0,0 +1,21 @@
+#----------------------------------------------------------------------------
+# This file was automatically generated from the original CMakeLists.txt file
+# Add a variable to hold the headers for the library
+set (lib_headers
+    array.hpp
+)
+
+# Add a library target to the build system
+boost_library_project(
+  array
+  #  SRCDIRS 
+  TESTDIRS  test
+  HEADERS ${lib_headers}
+  #  DOCDIRS 
+  DESCRIPTION  "STL compliant container wrapper for arrays of constant size."
+  MODULARIZED 
+  AUTHORS  "Nicolai Josuttis"
+  #  MAINTAINERS 
+)
+
+

include/boost/array.hpp

@@ -27,6 +27,7 @@
 #include <cstddef>
 #include <stdexcept>
 #include <boost/assert.hpp>
+#include <boost/swap.hpp>
 
 // Handles broken standard libraries better than <iterator>
 #include <boost/detail/iterator.hpp>
@@ -131,7 +132,8 @@ namespace boost {
 
         // swap (note: linear complexity)
         void swap (array<T,N>& y) {
-            std::swap_ranges(begin(),end(),y.begin());
+            for (size_type i = 0; i < N; ++i)
+                boost::swap(elems[i],y.elems[i]);
         }
 
         // direct access to data (read-only)
@@ -157,7 +159,7 @@ namespace boost {
         // check range (may be private because it is static)
         static void rangecheck (size_type i) {
             if (i >= size()) {
-                throw std::range_error("array<>: index out of range");
+                throw std::out_of_range("array<>: index out of range");
             }
         }
 
@@ -209,19 +211,19 @@ namespace boost {
         }
 
         // operator[]
-        reference operator[](size_type i)
+        reference operator[](size_type /*i*/)
         {
             return failed_rangecheck();
         }
 
-        const_reference operator[](size_type i) const
+        const_reference operator[](size_type /*i*/) const
         {
             return failed_rangecheck();
         }
 
         // at() with range check
-        reference at(size_type i)               {   return failed_rangecheck(); }
-        const_reference at(size_type i) const   {   return failed_rangecheck(); }
+        reference at(size_type /*i*/)               {   return failed_rangecheck(); }
+        const_reference at(size_type /*i*/) const   {   return failed_rangecheck(); }
 
         // front() and back()
         reference front()
@@ -250,7 +252,7 @@ namespace boost {
         static size_type max_size() { return 0; }
         enum { static_size = 0 };
 
-        void swap (array<T,0>& y) {
+        void swap (array<T,0>& /*y*/) {
         }
 
         // direct access to data (read-only)
@@ -271,7 +273,7 @@ namespace boost {
 
         // check range (may be private because it is static)
         static reference failed_rangecheck () {
-                std::range_error e("attempt to access element of an empty array");
+                std::out_of_range e("attempt to access element of an empty array");
                 boost::throw_exception(e);
                 //
                 // We need to return something here to keep

module.cmake

@@ -0,0 +1 @@
+boost_module(array DEPENDS utility)

test/CMakeLists.txt

@@ -0,0 +1,8 @@
+boost_additional_test_dependencies(array BOOST_DEPENDS test)
+
+boost_test_run(array0 array0.cpp)
+boost_test_run(array1 array1.cpp)
+boost_test_run(array2 array2.cpp)
+boost_test_run(array3 array3.cpp)
+boost_test_run(array4 array4.cpp)
+boost_test_run(array5 array5.cpp)

test/Jamfile.v2

@@ -0,0 +1,14 @@
+#~ Copyright Rene Rivera 2008
+#~ Distributed under the Boost Software License, Version 1.0.
+#~ (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+import testing ;
+
+test-suite array :
+    [ run array0.cpp ]
+    [ run array1.cpp ]
+    [ run array2.cpp ]
+    [ run array3.cpp ]
+    [ run array4.cpp ]
+    [ run array5.cpp ]
+    ;

test/array0.cpp

@@ -85,12 +85,12 @@ void    RunTests()
     //  Confirm at() throws the std lib defined exception
     try {
         BadValue( test_case.at( 0 ) );
-    } catch ( const std::range_error & ) {
+    } catch ( const std::out_of_range & ) {
     }
 
     try {
         BadValue( const_test_case.at( 0 ) );
-    } catch ( const std::range_error & ) {
+    } catch ( const std::out_of_range & ) {
     }
 }
 

test/array3.cpp

@@ -21,7 +21,7 @@ int main()
 
     // copy and change order
     boost::array<std::string,4> seasons_orig = seasons;
-    for (unsigned i=seasons.size()-1; i>0; --i) {
+    for (std::size_t i=seasons.size()-1; i>0; --i) {
         std::swap(seasons.at(i),seasons.at((i+1)%seasons.size()));
     }
 

test/array5.cpp

@@ -27,7 +27,7 @@ int main()
     typedef boost::array<float,6> Array;
 
     // create and initialize an array
-    const Array a = { { 42.42 } };
+    const Array a = { { 42.42f } };
 
     // use some common STL container operations
     std::cout << "static_size: " << a.size() << std::endl;