From: hartmut.kaiser_at_[hidden]
Date: 2007-12-02 14:08:14
Author: hkaiser
Date: 2007-12-02 14:08:13 EST (Sun, 02 Dec 2007)
New Revision: 41590
URL: http://svn.boost.org/trac/boost/changeset/41590
Log:
Wave: More fixes to allow error free compilation of every header on its own.
Text files modified:
trunk/boost/wave/grammars/cpp_chlit_grammar.hpp | 9 +++++----
trunk/boost/wave/grammars/cpp_defined_grammar.hpp | 3 ++-
trunk/boost/wave/grammars/cpp_expression_grammar.hpp | 3 ++-
trunk/boost/wave/grammars/cpp_intlit_grammar.hpp | 3 ++-
trunk/boost/wave/wave_config.hpp | 4 ++--
trunk/libs/wave/ChangeLog | 5 +++++
6 files changed, 18 insertions(+), 9 deletions(-)
Modified: trunk/boost/wave/grammars/cpp_chlit_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_chlit_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_chlit_grammar.hpp 2007-12-02 14:08:13 EST (Sun, 02 Dec 2007)
@@ -14,6 +14,8 @@
#include <limits> // std::numeric_limits
#include <climits> // CHAR_BIT
+#include <boost/wave/wave_config.hpp>
+
#include <boost/static_assert.hpp>
#include <boost/cstdint.hpp>
@@ -26,7 +28,6 @@
#include <boost/spirit/phoenix/statements.hpp>
#include <boost/spirit/phoenix/functions.hpp>
-#include <boost/wave/wave_config.hpp>
#include <boost/wave/cpp_exceptions.hpp>
#include <boost/wave/grammars/cpp_literal_grammar_gen.hpp>
@@ -63,9 +64,9 @@
///////////////////////////////////////////////////////////////////////////////
struct compose_character_literal {
- template <typename ResultT, typename A1, typename A2, typename A3>
- struct result {
-
+ template <typename A1, typename A2, typename A3, typename A4>
+ struct result
+ {
typedef void type;
};
Modified: trunk/boost/wave/grammars/cpp_defined_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_defined_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_defined_grammar.hpp 2007-12-02 14:08:13 EST (Sun, 02 Dec 2007)
@@ -11,6 +11,8 @@
#if !defined(CPP_DEFINED_GRAMMAR_HPP_F48287B2_DC67_40A8_B4A1_800EFBD67869_INCLUDED)
#define CPP_DEFINED_GRAMMAR_HPP_F48287B2_DC67_40A8_B4A1_800EFBD67869_INCLUDED
+#include <boost/wave/wave_config.hpp>
+
#include <boost/assert.hpp>
#include <boost/spirit/core.hpp>
#include <boost/spirit/attribute/closure.hpp>
@@ -19,7 +21,6 @@
#include <boost/spirit/actor/push_back_actor.hpp>
#endif // SPIRIT_VERSION >= 0x1700
-#include <boost/wave/wave_config.hpp>
#include <boost/wave/token_ids.hpp>
#include <boost/wave/util/pattern_parser.hpp>
#include <boost/wave/grammars/cpp_defined_grammar_gen.hpp>
Modified: trunk/boost/wave/grammars/cpp_expression_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_expression_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_expression_grammar.hpp 2007-12-02 14:08:13 EST (Sun, 02 Dec 2007)
@@ -11,6 +11,8 @@
#if !defined(CPP_EXPRESSION_GRAMMAR_HPP_099CD1A4_A6C0_44BE_8F24_0B00F5BE5674_INCLUDED)
#define CPP_EXPRESSION_GRAMMAR_HPP_099CD1A4_A6C0_44BE_8F24_0B00F5BE5674_INCLUDED
+#include <boost/wave/wave_config.hpp>
+
#include <boost/assert.hpp>
#include <boost/spirit/core.hpp>
#include <boost/spirit/attribute/closure.hpp>
@@ -26,7 +28,6 @@
#include <boost/spirit/phoenix/statements.hpp>
#include <boost/spirit/phoenix/casts.hpp>
-#include <boost/wave/wave_config.hpp>
#include <boost/wave/token_ids.hpp>
#include <boost/wave/cpp_exceptions.hpp>
Modified: trunk/boost/wave/grammars/cpp_intlit_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_intlit_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_intlit_grammar.hpp 2007-12-02 14:08:13 EST (Sun, 02 Dec 2007)
@@ -11,6 +11,8 @@
#if !defined(CPP_INTLIT_GRAMMAR_HPP_2E1E70B1_F15C_4132_8554_10A231B0D91C_INCLUDED)
#define CPP_INTLIT_GRAMMAR_HPP_2E1E70B1_F15C_4132_8554_10A231B0D91C_INCLUDED
+#include <boost/wave/wave_config.hpp>
+
#include <boost/spirit/core.hpp>
#include <boost/spirit/attribute/closure.hpp>
#if SPIRIT_VERSION >= 0x1700
@@ -22,7 +24,6 @@
#include <boost/spirit/phoenix/primitives.hpp>
#include <boost/spirit/phoenix/statements.hpp>
-#include <boost/wave/wave_config.hpp>
#include <boost/wave/cpp_exceptions.hpp>
#include <boost/wave/grammars/cpp_literal_grammar_gen.hpp>
Modified: trunk/boost/wave/wave_config.hpp
==============================================================================
--- trunk/boost/wave/wave_config.hpp (original)
+++ trunk/boost/wave/wave_config.hpp 2007-12-02 14:08:13 EST (Sun, 02 Dec 2007)
@@ -405,8 +405,8 @@
#endif
#if PHOENIX_LIMIT < 6
// boost/spirit/attribute.hpp sets PHOENIX_LIMIT to 3!
-#error "Boost.Wave: the constant PHOENIX_LIMIT must be at least defined to 4" \
- " to compile the library."
+#error "Boost.Wave: the constant PHOENIX_LIMIT must be at least defined to 6" \
+" to compile the library."
#endif
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/libs/wave/ChangeLog
==============================================================================
--- trunk/libs/wave/ChangeLog (original)
+++ trunk/libs/wave/ChangeLog 2007-12-02 14:08:13 EST (Sun, 02 Dec 2007)
@@ -24,6 +24,9 @@
CHANGELOG
+- Wave Version 1.4
+
+Boost V1.35.0
- Wave Version 1.3
- Changed the return value of the 'evaluated_conditional_expression()' pp hook
to 'bool' allowing to force Wave to re-evaluate the current conditional
@@ -151,6 +154,8 @@
spotting the problem.
- Unterminated C++/C comment diagnostics are now a warning and not an error
anymore.
+- Applied patch provided by Jens Seidel making sure every header compiles on
+ its own.
Boost V1.34.0
- Wave Version 1.2.4