Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r82906 - in trunk: boost libs/array/test
From: marshall_at_[hidden]
Date: 2013-02-15 12:11:09


Author: marshall
Date: 2013-02-15 12:11:09 EST (Fri, 15 Feb 2013)
New Revision: 82906
URL: http://svn.boost.org/trac/boost/changeset/82906

Log:
Back out some of the constexpr support Boost.Array; it crashes gcc
Text files modified:
   trunk/boost/array.hpp | 10 +++++-----
   trunk/libs/array/test/Jamfile.v2 | 2 +-
   2 files changed, 6 insertions(+), 6 deletions(-)

Modified: trunk/boost/array.hpp
==============================================================================
--- trunk/boost/array.hpp (original)
+++ trunk/boost/array.hpp 2013-02-15 12:11:09 EST (Fri, 15 Feb 2013)
@@ -125,14 +125,14 @@
             return BOOST_ASSERT_MSG( i < N, "out of range" ), elems[i];
         }
         
- BOOST_CONSTEXPR const_reference operator[](size_type i) const
+ /*BOOST_CONSTEXPR*/ const_reference operator[](size_type i) const
         {
             return BOOST_ASSERT_MSG( i < N, "out of range" ), elems[i];
         }
 
         // at() with range check
- reference at(size_type i) { return rangecheck(i), elems[i]; }
- BOOST_CONSTEXPR const_reference at(size_type i) const { return rangecheck(i), elems[i]; }
+ reference at(size_type i) { return rangecheck(i), elems[i]; }
+ /*BOOST_CONSTEXPR*/ const_reference at(size_type i) const { return rangecheck(i), elems[i]; }
     
         // front() and back()
         reference front()
@@ -261,14 +261,14 @@
             return failed_rangecheck();
         }
 
- BOOST_CONSTEXPR const_reference operator[](size_type /*i*/) const
+ /*BOOST_CONSTEXPR*/ const_reference operator[](size_type /*i*/) const
         {
             return failed_rangecheck();
         }
 
         // at() with range check
         reference at(size_type /*i*/) { return failed_rangecheck(); }
- BOOST_CONSTEXPR const_reference at(size_type /*i*/) const { return failed_rangecheck(); }
+ /*BOOST_CONSTEXPR*/ const_reference at(size_type /*i*/) const { return failed_rangecheck(); }
 
         // front() and back()
         reference front()

Modified: trunk/libs/array/test/Jamfile.v2
==============================================================================
--- trunk/libs/array/test/Jamfile.v2 (original)
+++ trunk/libs/array/test/Jamfile.v2 2013-02-15 12:11:09 EST (Fri, 15 Feb 2013)
@@ -18,7 +18,7 @@
     [ run array5.cpp ]
     [ run array6.cpp unit_test_framework : : : : array6 ]
     [ run array7.cpp unit_test_framework : : : : array7 ]
- [ run array_constexpr.cpp unit_test_framework : : : : array_constexpr ]
+# [ run array_constexpr.cpp unit_test_framework : : : : array_constexpr ]
     [ compile-fail array_getfail1.cpp ]
     [ compile-fail array_getfail2.cpp ]
     [ run array_hash.cpp unit_test_framework : : : : array_hash ]


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk