|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r78158 - in sandbox/coerce: boost boost/coerce boost/coerce/detail boost/coerce/tag libs/coerce/example libs/coerce/test
From: vexocide_at_[hidden]
Date: 2012-04-23 08:53:20
Author: vexocide
Date: 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
New Revision: 78158
URL: http://svn.boost.org/trac/boost/changeset/78158
Log:
Fixed incorrect use of BOOST_NO_INTRINSIC_WCHAR_T and style changes
Text files modified:
sandbox/coerce/boost/coerce.hpp | 10 +++++-----
sandbox/coerce/boost/coerce/char.hpp | 13 +++++--------
sandbox/coerce/boost/coerce/coerce.hpp | 10 +++++-----
sandbox/coerce/boost/coerce/detail/karma.hpp | 10 +++++-----
sandbox/coerce/boost/coerce/detail/precision.hpp | 10 +++++-----
sandbox/coerce/boost/coerce/detail/qi.hpp | 18 ++++++++++++------
sandbox/coerce/boost/coerce/detail/reserve.hpp | 10 +++++-----
sandbox/coerce/boost/coerce/detail/spirit.hpp | 10 +++++-----
sandbox/coerce/boost/coerce/reserve.hpp | 20 +++++++++-----------
sandbox/coerce/boost/coerce/string.hpp | 8 ++++++--
sandbox/coerce/boost/coerce/tag.hpp | 10 +++++-----
sandbox/coerce/boost/coerce/tag/base.hpp | 31 ++++++++++++-------------------
sandbox/coerce/boost/coerce/tag/precision.hpp | 10 +++++-----
sandbox/coerce/boost/coerce/tag_fwd.hpp | 10 +++++-----
sandbox/coerce/libs/coerce/example/grammar.cpp | 8 ++++----
sandbox/coerce/libs/coerce/example/rule.cpp | 8 ++++----
sandbox/coerce/libs/coerce/test/default.cpp | 4 ++--
sandbox/coerce/libs/coerce/test/integral.cpp | 8 ++++----
sandbox/coerce/libs/coerce/test/karma.cpp | 2 +-
sandbox/coerce/libs/coerce/test/tag.cpp | 8 ++++----
sandbox/coerce/libs/coerce/test/wchar_t.cpp | 4 ----
21 files changed, 108 insertions(+), 114 deletions(-)
Modified: sandbox/coerce/boost/coerce.hpp
==============================================================================
--- sandbox/coerce/boost/coerce.hpp (original)
+++ sandbox/coerce/boost/coerce.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,13 +4,13 @@
// (See accompanying file ../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_HPP
+#if !defined(BOOST_COERCE_HPP)
#define BOOST_COERCE_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/coerce/coerce.hpp>
-#endif // BOOST_COERCE_HPP
+#endif // !defined(BOOST_COERCE_HPP)
Modified: sandbox/coerce/boost/coerce/char.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/char.hpp (original)
+++ sandbox/coerce/boost/coerce/char.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,14 +4,13 @@
// (See accompanying file ../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_CHAR_HPP
+#if !defined(BOOST_COERCE_CHAR_HPP)
#define BOOST_COERCE_CHAR_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
-#include <boost/config.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/type_traits/remove_const.hpp>
@@ -25,11 +24,9 @@
struct is_char_impl<char>
: mpl::true_ { };
-#ifndef BOOST_NO_INTRINSIC_WCHAR_T
template <>
struct is_char_impl<wchar_t>
: mpl::true_ { };
-#endif
template <typename T, typename Enable = void>
struct is_char
@@ -37,4 +34,4 @@
} } } // namespace boost::coerce::traits
-#endif // BOOST_COERCE_CHAR_HPP
+#endif // !defined(BOOST_COERCE_CHAR_HPP)
Modified: sandbox/coerce/boost/coerce/coerce.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/coerce.hpp (original)
+++ sandbox/coerce/boost/coerce/coerce.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,12 +4,12 @@
// (See accompanying file ../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_COERCE_HPP
+#if !defined(BOOST_COERCE_COERCE_HPP)
#define BOOST_COERCE_COERCE_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/coerce/detail/spirit.hpp>
#include <boost/coerce/string.hpp>
@@ -98,4 +98,4 @@
} } // namespace boost::coerce
-#endif // BOOST_COERCE_COERCE_HPP
+#endif // !defined(BOOST_COERCE_COERCE_HPP)
Modified: sandbox/coerce/boost/coerce/detail/karma.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/detail/karma.hpp (original)
+++ sandbox/coerce/boost/coerce/detail/karma.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,12 +4,12 @@
// (See accompanying file ../../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_DETAIL_KARMA_HPP
+#if !defined(BOOST_COERCE_DETAIL_KARMA_HPP)
#define BOOST_COERCE_DETAIL_KARMA_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/coerce/reserve.hpp>
#include <boost/coerce/string.hpp>
@@ -43,4 +43,4 @@
} } } // namespace boost::coerce::detail
-#endif // BOOST_COERCE_DETAIL_KARMA_HPP
+#endif // !defined(BOOST_COERCE_DETAIL_KARMA_HPP)
Modified: sandbox/coerce/boost/coerce/detail/precision.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/detail/precision.hpp (original)
+++ sandbox/coerce/boost/coerce/detail/precision.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,12 +4,12 @@
// (See accompanying file ../../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_DETAIL_PRECISION_HPP
+#if !defined(BOOST_COERCE_DETAIL_PRECISION_HPP)
#define BOOST_COERCE_DETAIL_PRECISION_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/config.hpp>
#include <boost/limits.hpp>
@@ -62,4 +62,4 @@
} } } // namespace boost::coerce::detail
-#endif // BOOST_COERCE_DETAIL_PRECISION_HPP
+#endif // !defined(BOOST_COERCE_DETAIL_PRECISION_HPP)
Modified: sandbox/coerce/boost/coerce/detail/qi.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/detail/qi.hpp (original)
+++ sandbox/coerce/boost/coerce/detail/qi.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,12 +4,12 @@
// (See accompanying file ../../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_DETAIL_QI_HPP
+#if !defined(BOOST_COERCE_DETAIL_QI_HPP)
#define BOOST_COERCE_DETAIL_QI_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/coerce/reserve.hpp>
#include <boost/coerce/string.hpp>
@@ -18,7 +18,13 @@
#include <boost/spirit/home/qi/char.hpp>
#include <boost/spirit/home/qi/numeric.hpp>
#include <boost/spirit/home/qi/operator/optional.hpp>
-#include <boost/spirit/home/qi/parse.hpp>
+
+#include <boost/spirit/version.hpp>
+#if SPIRIT_VERSION < 0x3000
+ #include <boost/spirit/home/qi/parse.hpp>
+#else
+ #include <boost/spirit/home/qi/core/parse.hpp>
+#endif // SPIRIT_VERSION < 0x3000
namespace boost { namespace coerce { namespace detail {
@@ -47,4 +53,4 @@
} } } // namespace boost::coerce::detail
-#endif // BOOST_COERCE_DETAIL_QI_HPP
+#endif // !defined(BOOST_COERCE_DETAIL_QI_HPP)
Modified: sandbox/coerce/boost/coerce/detail/reserve.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/detail/reserve.hpp (original)
+++ sandbox/coerce/boost/coerce/detail/reserve.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -5,12 +5,12 @@
// (See accompanying file ../../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_DETAIL_RESERVE_HPP
+#if !defined(BOOST_COERCE_DETAIL_RESERVE_HPP)
#define BOOST_COERCE_DETAIL_RESERVE_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/config.hpp>
#include <boost/mpl/bool.hpp>
@@ -79,4 +79,4 @@
} } } // namespace boost::coerce::detail
-#endif // BOOST_COERCE_DETAIL_RESERVE_HPP
+#endif // !defined(BOOST_COERCE_DETAIL_RESERVE_HPP)
Modified: sandbox/coerce/boost/coerce/detail/spirit.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/detail/spirit.hpp (original)
+++ sandbox/coerce/boost/coerce/detail/spirit.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,12 +4,12 @@
// (See accompanying file ../../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_DETAIL_SPIRIT_HPP
+#if !defined(BOOST_COERCE_DETAIL_SPIRIT_HPP)
#define BOOST_COERCE_DETAIL_SPIRIT_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/coerce/detail/karma.hpp>
#include <boost/coerce/detail/qi.hpp>
@@ -36,4 +36,4 @@
} } } // namespace boost::coerce::detail
-#endif // BOOST_COERCE_DETAIL_SPIRIT_HPP
+#endif // !defined(BOOST_COERCE_DETAIL_SPIRIT_HPP)
Modified: sandbox/coerce/boost/coerce/reserve.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/reserve.hpp (original)
+++ sandbox/coerce/boost/coerce/reserve.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,12 +4,12 @@
// (See accompanying file ../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_RESERVE_HPP
+#if !defined(BOOST_COERCE_RESERVE_HPP)
#define BOOST_COERCE_RESERVE_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/coerce/detail/precision.hpp>
#include <boost/coerce/detail/reserve.hpp>
@@ -34,12 +34,12 @@
BOOST_STATIC_CONSTANT(std::size_t, value = 1);
};
-#ifndef BOOST_NO_INTRINSIC_WCHAR_T
+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
template <typename Tag>
struct reserve_size_impl<wchar_t, Tag> {
BOOST_STATIC_CONSTANT(std::size_t, value = 1);
};
-#endif
+#endif // !defined(BOOST_NO_INTRINSIC_WCHAR_T)
template <typename T, typename Tag>
struct reserve_size_impl_integral {
@@ -101,8 +101,7 @@
struct reserve_size_impl<unsigned long, Tag>
: reserve_size_impl_integral<unsigned long, Tag> { };
-#ifdef BOOST_HAS_LONG_LONG
-
+#if defined(BOOST_HAS_LONG_LONG)
template <typename Tag>
struct reserve_size_impl<boost::long_long_type, Tag>
: reserve_size_impl_integral<boost::long_long_type, Tag> { };
@@ -110,8 +109,7 @@
template <typename Tag>
struct reserve_size_impl<boost::ulong_long_type, Tag>
: reserve_size_impl_integral<boost::ulong_long_type, Tag> { };
-
-#endif // BOOST_HAS_LONG_LONG
+#endif // defined(BOOST_HAS_LONG_LONG)
template <typename T, typename Tag>
struct reserve_size_impl_floating_point {
@@ -154,4 +152,4 @@
} } } // namespace boost::coerce::traits
-#endif // BOOST_COERCE_RESERVE_HPP
+#endif // !defined(BOOST_COERCE_RESERVE_HPP)
Modified: sandbox/coerce/boost/coerce/string.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/string.hpp (original)
+++ sandbox/coerce/boost/coerce/string.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,9 +4,13 @@
// (See accompanying file ../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_STRING_HPP
+#if !defined(BOOST_COERCE_STRING_HPP)
#define BOOST_COERCE_STRING_HPP
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
+
#include <boost/coerce/char.hpp>
#include <boost/mpl/bool.hpp>
@@ -153,4 +157,4 @@
} } } // namespace boost::coerce::traits
-#endif // BOOST_COERCE_STRING_HPP
+#endif // !defined(BOOST_COERCE_STRING_HPP)
Modified: sandbox/coerce/boost/coerce/tag.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/tag.hpp (original)
+++ sandbox/coerce/boost/coerce/tag.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,12 +4,12 @@
// (See accompanying file ../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_TAG_HPP
+#if !defined(BOOST_COERCE_TAG_HPP)
#define BOOST_COERCE_TAG_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/coerce/detail/precision.hpp>
@@ -52,4 +52,4 @@
} } } // namespace boost::coerce::tag
-#endif // BOOST_COERCE_TAG_HPP
+#endif // !defined(BOOST_COERCE_TAG_HPP)
Modified: sandbox/coerce/boost/coerce/tag/base.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/tag/base.hpp (original)
+++ sandbox/coerce/boost/coerce/tag/base.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,12 +4,12 @@
// (See accompanying file ../../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_TAG_BASE_HPP
+#if !defined(BOOST_COERCE_TAG_BASE_HPP)
#define BOOST_COERCE_TAG_BASE_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/config.hpp>
#include <boost/spirit/home/karma/numeric/int.hpp>
@@ -28,17 +28,14 @@
namespace boost { namespace coerce { namespace tag {
+#if defined(BOOST_MSVC)
+ #pragma warning(push)
+ #pragma warning(disable: 4348) // redefinition of default parameter : parameter 2
+#endif // defined(BOOST_MSVC)
template <unsigned Radix>
struct base {
-#ifdef BOOST_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4348) // redefinition of default parameter : parameter 2
-#endif
template <typename Target, bool U = is_signed<Target>::value>
struct parser_base;
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
template <typename Target>
struct parser_base<Target, true>
@@ -56,15 +53,8 @@
}
};
-#ifdef BOOST_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4348) // redefinition of default parameter : parameter 2
-#endif
template <typename Source, bool U = is_signed<Source>::value>
struct generator_base;
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
template <typename Source>
struct generator_base<Source, true>
@@ -82,6 +72,9 @@
}
};
};
+#if defined(BOOST_MSVC)
+ #pragma warning(pop)
+#endif // defined(BOOST_MSVC)
struct bin
: base<2> { };
@@ -121,4 +114,4 @@
} } } // namespace boost::coerce::tag
-#endif // BOOST_COERCE_TAG_HPP
+#endif // !defined(BOOST_COERCE_TAG_HPP)
Modified: sandbox/coerce/boost/coerce/tag/precision.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/tag/precision.hpp (original)
+++ sandbox/coerce/boost/coerce/tag/precision.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,12 +4,12 @@
// (See accompanying file ../../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_TAG_PRECISION_HPP
+#if !defined(BOOST_COERCE_TAG_PRECISION_HPP)
#define BOOST_COERCE_TAG_PRECISION_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
#include <boost/spirit/home/karma/numeric/real.hpp>
#include <boost/spirit/home/karma/numeric/real_policies.hpp>
@@ -61,4 +61,4 @@
} } } // namespace boost::coerce::tag
-#endif // BOOST_COERCE_TAG_PRECISION_HPP
+#endif // !defined(BOOST_COERCE_TAG_PRECISION_HPP)
Modified: sandbox/coerce/boost/coerce/tag_fwd.hpp
==============================================================================
--- sandbox/coerce/boost/coerce/tag_fwd.hpp (original)
+++ sandbox/coerce/boost/coerce/tag_fwd.hpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,12 +4,12 @@
// (See accompanying file ../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_COERCE_TAG_FWD_HPP
+#if !defined(BOOST_COERCE_TAG_FWD_HPP)
#define BOOST_COERCE_TAG_FWD_HPP
-#ifdef _MSC_VER
-#pragma once
-#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+ #pragma once
+#endif // defined(_MSC_VER) && _MSC_VER >= 1200
namespace boost { namespace coerce { namespace tag {
@@ -26,4 +26,4 @@
} } } // namespace boost::coerce::tag
-#endif // BOOST_COERCE_TAG_FWD_HPP
+#endif // !defined(BOOST_COERCE_TAG_FWD_HPP)
Modified: sandbox/coerce/libs/coerce/example/grammar.cpp
==============================================================================
--- sandbox/coerce/libs/coerce/example/grammar.cpp (original)
+++ sandbox/coerce/libs/coerce/example/grammar.cpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -27,13 +27,13 @@
: spirit::qi::grammar<Iterator, Target()> {
parser(tag::hexadecimal const &)
: parser::base_type(start) {
-#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
+#if !defined(BOOST_SPIRIT_NO_PREDEFINED_TERMINALS)
start = spirit::qi::lit("0x")
>> spirit::qi::hex;
#else
start = spirit::qi::lit_type()("0x")
>> spirit::qi::hex_type();
-#endif
+#endif // !defined(BOOST_SPIRIT_NO_PREDEFINED_TERMINALS)
}
spirit::qi::rule<Iterator, Target()> start;
@@ -44,13 +44,13 @@
: spirit::karma::grammar<Iterator, Source()> {
generator(tag::hexadecimal const &)
: generator::base_type(start) {
-#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
+#if !defined(BOOST_SPIRIT_NO_PREDEFINED_TERMINALS)
start = spirit::karma::lit("0x")
<< spirit::karma::hex;
#else
start = spirit::karma::lit_type()("0x")
<< spirit::karma::hex_type();
-#endif
+#endif // !defined(BOOST_SPIRIT_NO_PREDEFINED_TERMINALS)
}
spirit::karma::rule<Iterator, Source()> start;
Modified: sandbox/coerce/libs/coerce/example/rule.cpp
==============================================================================
--- sandbox/coerce/libs/coerce/example/rule.cpp (original)
+++ sandbox/coerce/libs/coerce/example/rule.cpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -27,13 +27,13 @@
: spirit::qi::rule<Iterator, Target()> {
parser(tag::hexadecimal const &)
: spirit::qi::rule<Iterator, Target()>(
-#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
+#if !defined(BOOST_SPIRIT_NO_PREDEFINED_TERMINALS)
spirit::qi::lit("0x")
>> spirit::qi::hex
#else
spirit::qi::lit_type()("0x")
>> spirit::qi::hex_type()
-#endif
+#endif // !defined(BOOST_SPIRIT_NO_PREDEFINED_TERMINALS)
) { }
};
@@ -42,13 +42,13 @@
: spirit::karma::rule<Iterator, Source()> {
generator(tag::hexadecimal const &)
: spirit::karma::rule<Iterator, Source()>(
-#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
+#if !defined(BOOST_SPIRIT_NO_PREDEFINED_TERMINALS)
spirit::karma::lit("0x")
<< spirit::karma::hex
#else
spirit::karma::lit_type()("0x")
<< spirit::karma::hex_type()
-#endif
+#endif // !defined(BOOST_SPIRIT_NO_PREDEFINED_TERMINALS)
) { }
};
};
Modified: sandbox/coerce/libs/coerce/test/default.cpp
==============================================================================
--- sandbox/coerce/libs/coerce/test/default.cpp (original)
+++ sandbox/coerce/libs/coerce/test/default.cpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -4,14 +4,14 @@
// (See accompanying file ../../../LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#define BOOST_TEST_MODULE default
+#define BOOST_TEST_MODULE default_value
#define BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <boost/coerce.hpp>
#include <boost/test/unit_test.hpp>
-BOOST_AUTO_TEST_CASE(default_) {
+BOOST_AUTO_TEST_CASE(default_value) {
using namespace boost;
BOOST_CHECK_EQUAL(coerce::as_default<int>("XXX"), 0);
Modified: sandbox/coerce/libs/coerce/test/integral.cpp
==============================================================================
--- sandbox/coerce/libs/coerce/test/integral.cpp (original)
+++ sandbox/coerce/libs/coerce/test/integral.cpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -42,10 +42,10 @@
, unsigned int
, long
, unsigned long
-#ifdef BOOST_HAS_LONG_LONG
+#if defined(BOOST_HAS_LONG_LONG)
, boost::long_long_type
, boost::ulong_long_type
-#endif
+#endif // defined(BOOST_HAS_LONG_LONG)
> integral_types;
boost::mpl::for_each<integral_types>(test);
@@ -110,10 +110,10 @@
, unsigned int
, long
, unsigned long
-#ifdef BOOST_HAS_LONG_LONG
+#if defined(BOOST_HAS_LONG_LONG)
, boost::long_long_type
, boost::ulong_long_type
-#endif
+#endif // defined(BOOST_HAS_LONG_LONG)
, float
, double
, long double
Modified: sandbox/coerce/libs/coerce/test/karma.cpp
==============================================================================
--- sandbox/coerce/libs/coerce/test/karma.cpp (original)
+++ sandbox/coerce/libs/coerce/test/karma.cpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -18,7 +18,7 @@
BOOST_TEST_DONT_PRINT_LOG_VALUE(std::vector<char>);
BOOST_TEST_DONT_PRINT_LOG_VALUE(std::vector<wchar_t>);
-BOOST_AUTO_TEST_CASE(qi) {
+BOOST_AUTO_TEST_CASE(karma) {
using namespace boost;
BOOST_CHECK_EQUAL(coerce::as<std::string>(1), std::string("1"));
Modified: sandbox/coerce/libs/coerce/test/tag.cpp
==============================================================================
--- sandbox/coerce/libs/coerce/test/tag.cpp (original)
+++ sandbox/coerce/libs/coerce/test/tag.cpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -51,10 +51,10 @@
, unsigned int
, long
, unsigned long
-#ifdef BOOST_HAS_LONG_LONG
+#if defined(BOOST_HAS_LONG_LONG)
, boost::long_long_type
, boost::ulong_long_type
-#endif
+#endif // defined(BOOST_HAS_LONG_LONG)
> integral_types;
boost::mpl::for_each<integral_types>(test);
@@ -97,10 +97,10 @@
, unsigned int
, long
, unsigned long
-#ifdef BOOST_HAS_LONG_LONG
+#if defined(BOOST_HAS_LONG_LONG)
, boost::long_long_type
, boost::ulong_long_type
-#endif
+#endif // defined(BOOST_HAS_LONG_LONG)
> integral_types;
boost::mpl::for_each<integral_types>(test);
Modified: sandbox/coerce/libs/coerce/test/wchar_t.cpp
==============================================================================
--- sandbox/coerce/libs/coerce/test/wchar_t.cpp (original)
+++ sandbox/coerce/libs/coerce/test/wchar_t.cpp 2012-04-23 08:53:18 EDT (Mon, 23 Apr 2012)
@@ -17,18 +17,15 @@
BOOST_AUTO_TEST_CASE(source) {
using namespace boost;
-#ifndef BOOST_NO_INTRINSIC_WCHAR_T
BOOST_CHECK_EQUAL(coerce::as<std::string>(L'\0'), std::string("\0", 1));
BOOST_CHECK_EQUAL(coerce::as<std::string>(L' '), " ");
BOOST_CHECK_EQUAL(coerce::as<std::string>(L'\x23'), "\x23");
BOOST_CHECK_EQUAL(coerce::as<std::string>(L'A'), "A");
-#endif
}
BOOST_AUTO_TEST_CASE(target) {
using namespace boost;
-#ifndef BOOST_NO_INTRINSIC_WCHAR_T
BOOST_CHECK_THROW(coerce::as<wchar_t>(""), coerce::bad_cast);
BOOST_CHECK_EQUAL(coerce::as<wchar_t>("\0"), L'\0');
@@ -37,5 +34,4 @@
BOOST_CHECK_EQUAL(coerce::as<wchar_t>("A"), L'A');
BOOST_CHECK_THROW(coerce::as<wchar_t>("XXX"), coerce::bad_cast);
-#endif
}
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