Update of /cvsroot/boost/boost/boost/wave/grammars
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8096/boost/wave/grammars
Modified Files:
Tag: RC_1_34_0
cpp_chlit_grammar.hpp cpp_expression_grammar.hpp
Log Message:
Fixed predefined macros to appear to be defined at a position referring to a
file named '<built-in>'.
Index: cpp_chlit_grammar.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/grammars/cpp_chlit_grammar.hpp,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- cpp_chlit_grammar.hpp 17 Mar 2006 22:40:01 -0000 1.17
+++ cpp_chlit_grammar.hpp 24 Jun 2006 20:44:47 -0000 1.17.2.1
@@ -90,8 +90,8 @@
else {
// calculate the new value (avoiding a warning regarding
// shifting count >= size of the type)
- value <<= 8 * (sizeof(wchar_t)-1);
- value <<= 8;
+ value <<= CHAR_BIT * (sizeof(wchar_t)-1);
+ value <<= CHAR_BIT;
value |= character & masks[sizeof(wchar_t)-1];
}
}
@@ -102,7 +102,7 @@
}
else {
// calculate the new value
- value <<= 8 * sizeof(char);
+ value <<= CHAR_BIT * sizeof(char);
value |= character & masks[sizeof(char)-1];
}
}
Index: cpp_expression_grammar.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/grammars/cpp_expression_grammar.hpp,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- cpp_expression_grammar.hpp 17 Mar 2006 22:40:01 -0000 1.13
+++ cpp_expression_grammar.hpp 24 Jun 2006 20:44:47 -0000 1.13.2.1
@@ -444,11 +444,11 @@
;
constant
- = ch_p(T_INTLIT)
+ = ch_p(T_PP_NUMBER)
[
constant.val = impl::as_intlit(arg1)
]
- | ch_p(T_PP_NUMBER)
+ | ch_p(T_INTLIT)
[
constant.val = impl::as_intlit(arg1)
]
@@ -571,8 +571,8 @@
;
constant_nocalc
- = ch_p(T_INTLIT)
- | ch_p(T_PP_NUMBER)
+ = ch_p(T_PP_NUMBER)
+ | ch_p(T_INTLIT)
| ch_p(T_CHARLIT)
;
@@ -706,7 +706,7 @@
if (if_block_status) {
string_type expression = as_string<string_type>(first,
last);
if (0 == expression.size())
- expression = "empty expression";
+ expression = "<empty expression>";
BOOST_WAVE_THROW(preprocess_exception,
ill_formed_expression,
expression.c_str(), act_pos);
}
@@ -720,10 +720,10 @@
}
if (closure_value::error_noerror != result.is_valid()) {
- // division by zero occured
+ // division by zero occurred
string_type expression = as_string<string_type>(first, last);
if (0 == expression.size())
- expression = "empty expression";
+ expression = "<empty expression>";
if (closure_value::error_division_by_zero == result.is_valid()) {
BOOST_WAVE_THROW(preprocess_exception, division_by_zero,
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
