From 5795e44f39b59db1ae55005697ff077cb0229714 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Sat, 2 Feb 2008 18:17:54 +0100
Subject: [PATCH] spirit: gcc-4.3 fixes
---
boost/spirit/tree/impl/tree_to_xml.ipp | 1 +
libs/spirit/test/mix_and_match_trees.cpp | 6 +++---
libs/spirit/test/numerics_tests.cpp | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/boost/spirit/tree/impl/tree_to_xml.ipp b/boost/spirit/tree/impl/tree_to_xml.ipp
index b8084f8..7d1ca3b 100644
a
|
b
|
|
15 | 15 | #include <cstdarg> |
16 | 16 | #include <locale> |
17 | 17 | #include <string> |
| 18 | #include <cstring> |
18 | 19 | |
19 | 20 | #include <map> |
20 | 21 | #include <iostream> |
diff --git a/libs/spirit/test/mix_and_match_trees.cpp b/libs/spirit/test/mix_and_match_trees.cpp
index 8a0069a..22232e9 100644
a
|
b
|
struct my_grammar : grammar<my_grammar>
|
54 | 54 | |
55 | 55 | typedef rule<ast_scanner> ast_rule; |
56 | 56 | typedef rule<pt_scanner> pt_rule; |
57 | | typedef rule<Scanner> rule; |
| 57 | typedef rule<Scanner> rule_; |
58 | 58 | |
59 | 59 | definition(my_grammar const & /* self */) |
60 | 60 | { |
… |
… |
struct my_grammar : grammar<my_grammar>
|
62 | 62 | start_ = gen_pt_node_d[ pt_rule_ ]; |
63 | 63 | } |
64 | 64 | |
65 | | rule const & start() const |
| 65 | rule_ const & start() const |
66 | 66 | { |
67 | 67 | return start_; |
68 | 68 | } |
69 | 69 | |
70 | | rule start_; |
| 70 | rule_ start_; |
71 | 71 | ast_rule ast_rule_; |
72 | 72 | pt_rule pt_rule_; |
73 | 73 | }; |
diff --git a/libs/spirit/test/numerics_tests.cpp b/libs/spirit/test/numerics_tests.cpp
index b27546d..3ee4af3 100644
a
|
b
|
|
11 | 11 | #include <boost/spirit/actor/assign_actor.hpp> |
12 | 12 | #include <iostream> |
13 | 13 | #include <boost/detail/lightweight_test.hpp> |
| 14 | #include <climits> |
14 | 15 | |
15 | 16 | using namespace std; |
16 | 17 | using namespace boost::spirit; |