feedc0de/boost_array
1
0
Fork 0
forked from boostorg/array
Code Pull Requests Activity

Uncomment BOOST_CONSTEXPR; update and enable test/array_constexpr.cpp

Browse Source
This commit is contained in:
Peter Dimov
2024-11-04 03:56:02 +02:00
parent 31b9fdd397
commit 2099995189
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/array.hpp
View File

@ -117,14 +117,14 @@ namespace boost {
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]; }
BOOST_CONSTEXPR const_reference at(size_type i) const { return rangecheck(i), elems[i]; }
// front() and back()
reference front()
@ -246,14 +246,14 @@ namespace boost {
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()

2
test/Jamfile.v2
View File

@ -18,7 +18,7 @@ run array5.cpp ;
run array6.cpp ;
run array7.cpp ;
# run array_constexpr.cpp ;
compile array_constexpr.cpp ;
compile-fail array_getfail1.cpp ;
compile-fail array_getfail2.cpp ;

18
test/array_constexpr.cpp
View File

@ -5,27 +5,15 @@
* http://www.boost.org/LICENSE_1_0.txt)
*/
#include <string>
#include <iostream>
#include <boost/array.hpp>
#include <algorithm>
#ifndef BOOST_NO_CXX11_HDR_ARRAY
#include <array>
#endif
#include <boost/config.hpp>
#ifndef BOOST_NO_CXX11_CONSTEXPR
constexpr boost::array<int, 10> arr {{ 0,1,2,3,4,5,6,7,8,9 }};
constexpr std::array<int, 10> arr_std {{ 0,1,2,3,4,5,6,7,8,9 }};
template <typename T>
void sink ( T t ) {}
template <typename T, size_t N>
void sink ( boost::array<T,N> &arr ) {}
int main()
{
// constexpr int two = arr_std.at (2);
constexpr int three = arr.at (3);
int whatever [ arr.at(4) ];
(void)three;
@ -33,7 +21,9 @@ int main()
}
#else // no constexpr means no constexpr tests!
int main()
{
}
#endif