merge new MPL version from 'mplbook' branch

[SVN r24874]

test/bool.cpp

@@ -1,34 +1,31 @@
-//-----------------------------------------------------------------------------
-// boost mpl/test/bool_.cpp source file
-// See http://www.boost.org for updates, documentation, and revision history.
-//-----------------------------------------------------------------------------
-//
-// Copyright (c) 2001-02
-// Aleksey Gurtovoy
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
 
-#include "boost/mpl/bool.hpp"
-#include "boost/mpl/assert_is_same.hpp"
-#include "boost/static_assert.hpp"
+// Copyright Aleksey Gurtovoy 2001-2004
+//
+// Distributed under the Boost Software License,Version 1.0. 
+// (See accompanying file LICENSE_1_0.txt or copy at 
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/mpl for documentation.
+
+// $Source$
+// $Date$
+// $Revision$
+
+#include <boost/mpl/bool.hpp>
+#include <boost/mpl/aux_/test.hpp>
 
 #include <cassert>
 
-namespace mpl = boost::mpl;
-
-#define BOOL_C_TEST(c) \
-    { BOOST_MPL_ASSERT_IS_SAME(mpl::bool_<c>::value_type, bool); } \
-    { BOOST_MPL_ASSERT_IS_SAME(mpl::bool_<c>, mpl::c##_); } \
-    { BOOST_MPL_ASSERT_IS_SAME(mpl::bool_<c>::type, mpl::bool_<c>); } \
-    { BOOST_STATIC_ASSERT(mpl::bool_<c>::value == c); } \
-    assert(mpl::bool_<c>() == c); \
+#define BOOL_TEST(c) \
+    { MPL_ASSERT(( is_same< bool_<c>::value_type, bool > )); } \
+    { MPL_ASSERT(( is_same< bool_<c>, c##_ > )); } \
+    { MPL_ASSERT(( is_same< bool_<c>::type, bool_<c> > )); } \
+    { MPL_ASSERT_RELATION( bool_<c>::value, ==, c ); } \
+    assert( bool_<c>() == c ); \
 /**/
 
-int main()
+MPL_TEST_CASE()
 {
-    BOOL_C_TEST(true)
-    BOOL_C_TEST(false)
-    return 0;
+    BOOL_TEST(true)
+    BOOL_TEST(false)
 }