mirror of
https://github.com/boostorg/mpl.git
synced 2025-08-03 14:54:30 +02:00
fix integral constant definition issue
[SVN r18240]
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
|
||||
// + file: boost/mpl/aux_/intergal_wrapper.hpp
|
||||
// + last modified: 27/jan/03
|
||||
// + last modified: 12/apr/03
|
||||
|
||||
// Copyright (c) 2000-03
|
||||
// Aleksey Gurtovoy
|
||||
@@ -78,6 +78,11 @@ struct AUX_WRAPPER_NAME
|
||||
operator AUX_WRAPPER_VALUE_TYPE() const { return this->value; }
|
||||
};
|
||||
|
||||
#if !defined(BOOST_NO_INCLASS_MEMBER_INITIALIZATION)
|
||||
template< AUX_WRAPPER_PARAMS(N) >
|
||||
AUX_WRAPPER_VALUE_TYPE const AUX_WRAPPER_INST(N)::value;
|
||||
#endif
|
||||
|
||||
}} // namespace boost::mpl
|
||||
|
||||
#undef AUX_WRAPPER_NAME
|
||||
|
@@ -3,7 +3,7 @@
|
||||
#define BOOST_MPL_BOOL_HPP_INCLUDED
|
||||
|
||||
// + file: boost/mpl/bool.hpp
|
||||
// + last modified: 08/mar/03
|
||||
// + last modified: 12/apr/03
|
||||
|
||||
// Copyright (c) 2000-03
|
||||
// Aleksey Gurtovoy
|
||||
@@ -31,6 +31,11 @@ template< bool C_ > struct bool_
|
||||
operator bool() const { return this->value; }
|
||||
};
|
||||
|
||||
#if !defined(BOOST_NO_INCLASS_MEMBER_INITIALIZATION)
|
||||
template< bool C_ >
|
||||
bool const bool_<C_>::value;
|
||||
#endif
|
||||
|
||||
}} // namespace boost::mpl
|
||||
|
||||
#endif // BOOST_MPL_BOOL_HPP_INCLUDED
|
||||
|
27
test/int.cpp
27
test/int.cpp
@@ -1,9 +1,8 @@
|
||||
//-----------------------------------------------------------------------------
|
||||
// boost mpl/test/int.cpp source file
|
||||
// See http://www.boost.org for updates, documentation, and revision history.
|
||||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// Copyright (c) 2001-02
|
||||
|
||||
// + file: libs/mpl/int.cpp
|
||||
// + last modified: 12/apr/03
|
||||
|
||||
// Copyright (c) 2001-03
|
||||
// Aleksey Gurtovoy
|
||||
//
|
||||
// Permission to use, copy, modify, distribute and sell this software
|
||||
@@ -13,6 +12,8 @@
|
||||
// supporting documentation. No representations are made about the
|
||||
// suitability of this software for any purpose. It is provided "as is"
|
||||
// without express or implied warranty.
|
||||
//
|
||||
// See http://www.boost.org/libs/mpl for documentation.
|
||||
|
||||
#include "boost/mpl/int.hpp"
|
||||
#include "boost/mpl/assert_is_same.hpp"
|
||||
@@ -23,13 +24,13 @@
|
||||
|
||||
namespace mpl = boost::mpl;
|
||||
|
||||
#define INT_C_TEST(z, i, unused) \
|
||||
{ BOOST_MPL_ASSERT_IS_SAME(mpl::int_<i>::value_type, int); } \
|
||||
{ BOOST_MPL_ASSERT_IS_SAME(mpl::int_<i>::type, mpl::int_<i>); } \
|
||||
{ BOOST_MPL_ASSERT_IS_SAME(mpl::int_<i>::next, mpl::int_<i+1>); } \
|
||||
{ BOOST_MPL_ASSERT_IS_SAME(mpl::int_<i>::prior, mpl::int_<i-1>); } \
|
||||
{ BOOST_STATIC_ASSERT(mpl::int_<i>::value == i); } \
|
||||
assert(mpl::int_<i>() == i);
|
||||
#define INT_C_TEST(unused1, i, unused2) \
|
||||
{ BOOST_MPL_ASSERT_IS_SAME(mpl::int_<i>::value_type, int); } \
|
||||
{ BOOST_MPL_ASSERT_IS_SAME(mpl::int_<i>::type, mpl::int_<i>); } \
|
||||
{ BOOST_MPL_ASSERT_IS_SAME(mpl::int_<i>::next, mpl::int_<i+1>); } \
|
||||
{ BOOST_MPL_ASSERT_IS_SAME(mpl::int_<i>::prior, mpl::int_<i-1>); } \
|
||||
{ BOOST_STATIC_ASSERT(mpl::int_<i>::value == i); } \
|
||||
assert(mpl::int_<i>() == i); \
|
||||
/**/
|
||||
|
||||
int main()
|
||||
|
Reference in New Issue
Block a user