boostorg/mpl
1
0
Fork 1
mirror of https://github.com/boostorg/mpl.git synced 2025-08-03 14:54:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

add workaround for sun

Browse Source 
[SVN r52542]
This commit is contained in:
Eric Niebler
2009-04-22 16:36:18 +00:00
parent cec3e22b63
commit 9708dbc454
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/boost/mpl/string.hpp
View File

@@ -13,11 +13,18 @@
// $Id: string.hpp 49239 2009-04-01 09:10:26Z eric_niebler $ // $Id: string.hpp 49239 2009-04-01 09:10:26Z eric_niebler $
// $Date: 2009-04-01 02:10:26 -0700 (Wed, 1 Apr 2009) $ // $Date: 2009-04-01 02:10:26 -0700 (Wed, 1 Apr 2009) $
// $Revision: 49239 $ // $Revision: 49239 $
//
// Thanks to:
// Dmitry Goncharov for porting this to the Sun compiler
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/mpl/limits/string.hpp> #include <boost/mpl/limits/string.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/char.hpp> #include <boost/mpl/char.hpp>
#include <boost/mpl/copy.hpp> #include <boost/mpl/copy.hpp>
#include <boost/mpl/size.hpp> #include <boost/mpl/size.hpp>
#include <boost/mpl/empty.hpp>
#include <boost/mpl/assert.hpp> #include <boost/mpl/assert.hpp>
#include <boost/mpl/size_t.hpp> #include <boost/mpl/size_t.hpp>
#include <boost/mpl/begin_end.hpp> #include <boost/mpl/begin_end.hpp>
@@ -243,11 +250,13 @@ namespace boost { namespace mpl
type; type;
}; };
#if !BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
template<typename Value> template<typename Value>
struct apply<mpl::string<>, Value, false> struct apply<mpl::string<>, Value, false>
{ {
typedef mpl::string<(char)Value::value> type; typedef mpl::string<(char)Value::value> type;
}; };
#endif
#define M0(z,n,data) \ #define M0(z,n,data) \
template<BOOST_PP_ENUM_PARAMS_Z(z, n, unsigned C), typename Value> \ template<BOOST_PP_ENUM_PARAMS_Z(z, n, unsigned C), typename Value> \
@@ -272,7 +281,19 @@ namespace boost { namespace mpl
((((unsigned char)Value::value)<<(BOOST_MPL_MULTICHAR_LENGTH(C0)*8))|C0) ((((unsigned char)Value::value)<<(BOOST_MPL_MULTICHAR_LENGTH(C0)*8))|C0)
, BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C) , BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)
> >
type; type0;
#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
typedef
typename mpl::if_<
mpl::empty<mpl::string<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)> >
, mpl::string<(char)Value::value>
, type0
>::type
type;
#else
typedef type0 type;
#endif
}; };
}; };

6
test/string.cpp
View File

@@ -293,6 +293,9 @@ int main()
BOOST_MPL_ASSERT((boost::is_same<t7, mpl::string<'aaaa','aaaa','aaaX'> >)); BOOST_MPL_ASSERT((boost::is_same<t7, mpl::string<'aaaa','aaaa','aaaX'> >));
} }
BOOST_MPL_ASSERT((mpl::empty<mpl::string<> >));
BOOST_MPL_ASSERT_NOT((mpl::empty<mpl::string<'hi!'> >));
// testing push_front // testing push_front
{ {
typedef mpl::push_front<mpl::string<>, mpl::char_<'a'> >::type t1; typedef mpl::push_front<mpl::string<>, mpl::char_<'a'> >::type t1;
@@ -343,9 +346,6 @@ int main()
mpl::for_each<mpl::string<'Hell','o wo','rld!'> >(push_char(result)); mpl::for_each<mpl::string<'Hell','o wo','rld!'> >(push_char(result));
BOOST_TEST("Hello world!" == result); BOOST_TEST("Hello world!" == result);
BOOST_MPL_ASSERT((mpl::empty<mpl::string<> >));
BOOST_MPL_ASSERT_NOT((mpl::empty<mpl::string<'hi!'> >));
BOOST_TEST(('h' == mpl::front<mpl::string<'hi!'> >::type())); BOOST_TEST(('h' == mpl::front<mpl::string<'hi!'> >::type()));
BOOST_TEST(('!' == mpl::back<mpl::string<'hi!'> >::type())); BOOST_TEST(('!' == mpl::back<mpl::string<'hi!'> >::type()));