Branch at revision 46530

[SVN r46531]

include/boost/array.hpp

@@ -24,19 +24,9 @@
 #ifndef BOOST_ARRAY_HPP
 #define BOOST_ARRAY_HPP
 
-#include <boost/detail/workaround.hpp>
-
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)  
-# pragma warning(push)  
-# pragma warning(disable:4996) // 'std::equal': Function call with parameters that may be unsafe
-# pragma warning(disable:4510) // boost::array<T,N>' : default constructor could not be generated 
-# pragma warning(disable:4610) // warning C4610: class 'boost::array<T,N>' can never be instantiated - user defined constructor required 
-#endif
-
 #include <cstddef>
 #include <stdexcept>
 #include <boost/assert.hpp>
-#include <boost/swap.hpp>
 
 // Handles broken standard libraries better than <iterator>
 #include <boost/detail/iterator.hpp>
@@ -141,8 +131,7 @@ namespace boost {
 
         // swap (note: linear complexity)
         void swap (array<T,N>& y) {
-            for (size_type i = 0; i < N; ++i)
-                boost::swap(elems[i],y.elems[i]);
+            std::swap_ranges(begin(),end(),y.begin());
         }
 
         // direct access to data (read-only)
@@ -220,19 +209,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()
@@ -261,7 +250,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)
@@ -284,7 +273,6 @@ namespace boost {
         static reference failed_rangecheck () {
                 std::out_of_range e("attempt to access element of an empty array");
                 boost::throw_exception(e);
-#if defined(BOOST_NO_EXCEPTIONS) || !defined(BOOST_MSVC)
                 //
                 // We need to return something here to keep
                 // some compilers happy: however we will never
@@ -292,7 +280,6 @@ namespace boost {
                 //
                 static T placeholder;
                 return placeholder;
-#endif
             }
     };
 #endif
@@ -331,9 +318,4 @@ namespace boost {
 
 } /* namespace boost */
 
-
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)  
-# pragma warning(pop)  
-#endif 
-
 #endif /*BOOST_ARRAY_HPP*/

test/array2.cpp

@@ -5,11 +5,6 @@
  * http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef _SCL_SECURE_NO_WARNINGS
-// Suppress warnings from the std lib:
-#  define _SCL_SECURE_NO_WARNINGS
-#endif
-
 #include <algorithm>
 #include <functional>
 #include <boost/array.hpp>

test/array3.cpp

@@ -21,7 +21,7 @@ int main()
 
     // copy and change order
     boost::array<std::string,4> seasons_orig = seasons;
-    for (std::size_t i=seasons.size()-1; i>0; --i) {
+    for (unsigned 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.42f } };
+    const Array a = { { 42.42 } };
 
     // use some common STL container operations
     std::cout << "static_size: " << a.size() << std::endl;