Subject: [Boost-commit] svn:boost r56102 - in trunk/boost/spirit/home: karma karma/numeric lex/lexer
From: hartmut.kaiser_at_[hidden]
Date: 2009-09-07 22:34:32
Author: hkaiser
Date: 2009-09-07 22:34:32 EDT (Mon, 07 Sep 2009)
New Revision: 56102
URL: http://svn.boost.org/trac/boost/changeset/56102
Log:
Spirit: fixing C++0x compilation issues
Text files modified:
trunk/boost/spirit/home/karma/generator.hpp | 20 ++++++++++----------
trunk/boost/spirit/home/karma/numeric/real_policies.hpp | 14 +++++++-------
trunk/boost/spirit/home/lex/lexer/lexer.hpp | 12 ++++++------
3 files changed, 23 insertions(+), 23 deletions(-)
Modified: trunk/boost/spirit/home/karma/generator.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/generator.hpp (original)
+++ trunk/boost/spirit/home/karma/generator.hpp 2009-09-07 22:34:32 EDT (Mon, 07 Sep 2009)
@@ -13,22 +13,22 @@
#include <boost/mpl/has_xxx.hpp>
#include <boost/mpl/int.hpp>
-#include <boost/spirit/home/support/detail/scoped_enum_emulation.hpp>
#include <boost/spirit/home/karma/domain.hpp>
namespace boost { namespace spirit { namespace karma
{
- BOOST_SCOPED_ENUM_START(generator_properties)
+ struct generator_properties
{
- no_properties = 0,
- buffering = 0x01, // generator requires buffering
- counting = 0x02, // generator requires counting
- tracking = 0x04, // generator requires position tracking
-
- countingbuffer = 0x03, // buffering | counting
- all_properties = 0x07 // buffering | counting | tracking
+ enum enum_type {
+ no_properties = 0,
+ buffering = 0x01, // generator requires buffering
+ counting = 0x02, // generator requires counting
+ tracking = 0x04, // generator requires position tracking
+
+ countingbuffer = 0x03, // buffering | counting
+ all_properties = 0x07 // buffering | counting | tracking
+ };
};
- BOOST_SCOPED_ENUM_END
template <typename Derived>
struct generator
Modified: trunk/boost/spirit/home/karma/numeric/real_policies.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/numeric/real_policies.hpp (original)
+++ trunk/boost/spirit/home/karma/numeric/real_policies.hpp 2009-09-07 22:34:32 EDT (Mon, 07 Sep 2009)
@@ -14,7 +14,6 @@
#include <boost/math/special_functions/fpclassify.hpp>
#include <boost/spirit/home/support/char_class.hpp>
-#include <boost/spirit/home/support/detail/scoped_enum_emulation.hpp>
#include <boost/spirit/home/karma/generate.hpp>
#include <boost/spirit/home/karma/char.hpp>
#include <boost/spirit/home/karma/numeric/int.hpp>
@@ -64,14 +63,15 @@
// Specifies, which representation type to use during output
// generation.
///////////////////////////////////////////////////////////////////////
- BOOST_SCOPED_ENUM_START(fmtflags)
+ struct fmtflags
{
- scientific = 0, // Generate floating-point values in scientific
- // format (with an exponent field).
- fixed = 1 // Generate floating-point values in fixed-point
- // format (with no exponent field).
+ enum {
+ scientific = 0, // Generate floating-point values in scientific
+ // format (with an exponent field).
+ fixed = 1 // Generate floating-point values in fixed-point
+ // format (with no exponent field).
+ };
};
- BOOST_SCOPED_ENUM_END
///////////////////////////////////////////////////////////////////////
// This is the main function used to generate the output for a
Modified: trunk/boost/spirit/home/lex/lexer/lexer.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexer.hpp (original)
+++ trunk/boost/spirit/home/lex/lexer/lexer.hpp 2009-09-07 22:34:32 EDT (Mon, 07 Sep 2009)
@@ -11,7 +11,6 @@
#endif
#include <boost/spirit/home/support/info.hpp>
-#include <boost/spirit/home/support/detail/scoped_enum_emulation.hpp>
#include <boost/spirit/home/qi/skip_over.hpp>
#include <boost/spirit/home/qi/parser.hpp>
#include <boost/spirit/home/qi/detail/assign_to.hpp>
@@ -279,13 +278,14 @@
///////////////////////////////////////////////////////////////////////////
// The match_flags flags are used to influence different matching
// modes of the lexer
- BOOST_SCOPED_ENUM_START(match_flags)
+ struct match_flags
{
- match_default = 0, // no flags
- match_not_dot_newline = 1, // the regex '.' doesn't match newlines
- match_icase = 2 // all matching operations are case insensitive
+ enum enum_type {
+ match_default = 0, // no flags
+ match_not_dot_newline = 1, // the regex '.' doesn't match newlines
+ match_icase = 2 // all matching operations are case insensitive
+ };
};
- BOOST_SCOPED_ENUM_END
///////////////////////////////////////////////////////////////////////////
// This represents a lexer object