From: eric_at_[hidden]
Date: 2007-11-08 01:48:09
Author: eric_niebler
Date: 2007-11-08 01:48:08 EST (Thu, 08 Nov 2007)
New Revision: 40923
URL: http://svn.boost.org/trac/boost/changeset/40923
Log:
fix errors and warnings on msvc-9
Text files modified:
trunk/libs/xpressive/example/Jamfile.v2 | 1 +
trunk/libs/xpressive/proto/test/Jamfile.v2 | 1 +
trunk/libs/xpressive/test/Jamfile.v2 | 1 +
trunk/libs/xpressive/tools/Jamfile.v2 | 1 +
trunk/libs/xpressive/tools/perl2xpr.cpp | 5 +++--
5 files changed, 7 insertions(+), 2 deletions(-)
Modified: trunk/libs/xpressive/example/Jamfile.v2
==============================================================================
--- trunk/libs/xpressive/example/Jamfile.v2 (original)
+++ trunk/libs/xpressive/example/Jamfile.v2 2007-11-08 01:48:08 EST (Thu, 08 Nov 2007)
@@ -5,6 +5,7 @@
project
: requirements
<toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
+ <toolset>msvc-9.0:<define>_SCL_SECURE_NO_DEPRECATE
<toolset>msvc,<stdlib>stlport:<define>_STLP_EXPOSE_GLOBALS_IMPLEMENTATION
;
Modified: trunk/libs/xpressive/proto/test/Jamfile.v2
==============================================================================
--- trunk/libs/xpressive/proto/test/Jamfile.v2 (original)
+++ trunk/libs/xpressive/proto/test/Jamfile.v2 2007-11-08 01:48:08 EST (Thu, 08 Nov 2007)
@@ -11,6 +11,7 @@
<toolset>msvc-7.1:<debug-symbols>off
<toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
<toolset>msvc-8.0:<define>_CRT_SECURE_NO_DEPRECATE
+ <toolset>msvc-9.0:<define>_SCL_SECURE_NO_DEPRECATE
<toolset>gcc:<cxxflags>-ftemplate-depth-1024
<library>/boost/test//boost_unit_test_framework
<link>static
Modified: trunk/libs/xpressive/test/Jamfile.v2
==============================================================================
--- trunk/libs/xpressive/test/Jamfile.v2 (original)
+++ trunk/libs/xpressive/test/Jamfile.v2 2007-11-08 01:48:08 EST (Thu, 08 Nov 2007)
@@ -11,6 +11,7 @@
<toolset>msvc-7.1:<debug-symbols>off
<toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
<toolset>msvc-8.0:<define>_CRT_SECURE_NO_DEPRECATE
+ <toolset>msvc-9.0:<define>_SCL_SECURE_NO_DEPRECATE
<toolset>gcc:<cxxflags>-ftemplate-depth-1024
# <toolset>gcc:<cxxflags>-W
# <toolset>gcc:<cxxflags>-Wall
Modified: trunk/libs/xpressive/tools/Jamfile.v2
==============================================================================
--- trunk/libs/xpressive/tools/Jamfile.v2 (original)
+++ trunk/libs/xpressive/tools/Jamfile.v2 2007-11-08 01:48:08 EST (Thu, 08 Nov 2007)
@@ -8,6 +8,7 @@
<toolset>msvc-7.1:<debug-symbols>off
<toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
<toolset>msvc-8.0:<define>_CRT_SECURE_NO_DEPRECATE
+ <toolset>msvc-9.0:<define>_SCL_SECURE_NO_DEPRECATE
<toolset>gcc:<cxxflags>-ftemplate-depth-1024
<toolset>msvc,<stdlib>stlport:<define>_STLP_EXPOSE_GLOBALS_IMPLEMENTATION
;
Modified: trunk/libs/xpressive/tools/perl2xpr.cpp
==============================================================================
--- trunk/libs/xpressive/tools/perl2xpr.cpp (original)
+++ trunk/libs/xpressive/tools/perl2xpr.cpp 2007-11-08 01:48:08 EST (Thu, 08 Nov 2007)
@@ -13,7 +13,8 @@
#include <boost/xpressive/xpressive_static.hpp>
#include <boost/xpressive/regex_actions.hpp>
-using namespace boost::xpressive;
+namespace x = boost::xpressive;
+using namespace x;
int main(int argc, char *argv[])
{
@@ -82,7 +83,7 @@
| as_xpr("?<!") [top(strings) += " ~after( "]
| nil [top(strings) += " ( s" + as<std::string>(++mark_nbr) + "= "]
)
- >> ref(regex)
+ >> x::ref(regex)
>> as_xpr(')') [top(strings) += " ) "]
;