Update of /cvsroot/boost/boost/libs/wave/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22911/libs/wave/src
Modified Files:
Tag: RC_1_34_0
token_ids.cpp wave_config_constant.cpp
Log Message:
Fixed a missing #define BOOST_WAVE_SOURCE 1 in wave_config_constant.cpp.
Index: token_ids.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/wave/src/token_ids.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- token_ids.cpp 22 Jun 2006 23:51:18 -0000 1.2.2.1
+++ token_ids.cpp 23 Jun 2006 15:42:16 -0000 1.2.2.2
@@ -13,6 +13,7 @@
#define BOOST_WAVE_SOURCE 1
#include <string>
#include <boost/assert.hpp>
+#include <boost/static_assert.hpp>
#include <boost/wave/wave_config.hpp>
#include <boost/wave/token_ids.hpp>
@@ -204,8 +205,13 @@
/* 419 */ "MSEXT_ASM",
/* 420 */ "MSEXT_REGION",
/* 421 */ "MSEXT_ENDREGION",
- };
-
+ };
+
+ // make sure, I have not forgotten any commas (as I did more than once)
+ BOOST_STATIC_ASSERT(
+ sizeof(tok_names)/sizeof(tok_names[0]) == T_LAST_TOKEN-T_FIRST_TOKEN
+ );
+
unsigned int id = BASEID_FROM_TOKEN(tokid)-T_FIRST_TOKEN;
return (id < T_LAST_TOKEN-T_FIRST_TOKEN) ? tok_names[id] :
"<UnknownToken>";
}
@@ -219,7 +225,7 @@
//
// Please note that the sequence of token names must match the sequence of
// token id's defined in then enum token_id above.
-static char const *tok_names[] = {
+static char const *tok_values[] = {
/* 256 */ "&",
/* 257 */ "&&",
/* 258 */ "=",
@@ -390,8 +396,13 @@
/* 421 */ "#endregion",
};
+ // make sure, I have not forgotten any commas (as I did more than once)
+ BOOST_STATIC_ASSERT(
+ sizeof(tok_values)/sizeof(tok_values[0]) == T_LAST_TOKEN-T_FIRST_TOKEN
+ );
+
unsigned int id = BASEID_FROM_TOKEN(tokid)-T_FIRST_TOKEN;
- return (id < T_LAST_TOKEN-T_FIRST_TOKEN) ? tok_names[id] :
"<UnknownToken>";
+ return (id < T_LAST_TOKEN-T_FIRST_TOKEN) ? tok_values[id] :
"<UnknownToken>";
}
///////////////////////////////////////////////////////////////////////////////
Index: wave_config_constant.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/wave/src/wave_config_constant.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- wave_config_constant.cpp 18 Jun 2006 16:57:36 -0000 1.1.2.1
+++ wave_config_constant.cpp 23 Jun 2006 15:42:16 -0000 1.1.2.2
@@ -9,6 +9,7 @@
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
+#define BOOST_WAVE_SOURCE 1
#include <boost/preprocessor/stringize.hpp>
#include <boost/wave/wave_config.hpp>
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
