Boost logo

Boost-Commit :

From: david_at_[hidden]
Date: 2007-11-27 13:59:06


Author: djenkins
Date: 2007-11-27 13:59:06 EST (Tue, 27 Nov 2007)
New Revision: 41420
URL: http://svn.boost.org/trac/boost/changeset/41420

Log:
Changes for msvc-9.0 /clr flag
Text files modified:
   trunk/libs/xpressive/test/regress.ipp | 16 ++++++++--------
   trunk/libs/xpressive/test/test.hpp | 6 ++++++
   2 files changed, 14 insertions(+), 8 deletions(-)

Modified: trunk/libs/xpressive/test/regress.ipp
==============================================================================
--- trunk/libs/xpressive/test/regress.ipp (original)
+++ trunk/libs/xpressive/test/regress.ipp 2007-11-27 13:59:06 EST (Tue, 27 Nov 2007)
@@ -84,14 +84,6 @@
 // The global object that contains the current test case
 xpr_test_case<char> test;
 
-sregex const rx_sec = '[' >> (s1= +_) >> ']';
-sregex const rx_str = "str=" >> (s1= *_);
-sregex const rx_pat = "pat=" >> (s1= *_);
-sregex const rx_flg = "flg=" >> (s1= *_);
-sregex const rx_sub = "sub=" >> (s1= *_);
-sregex const rx_res = "res=" >> (s1= *_);
-sregex const rx_br = "br" >> (s1= +digit) >> '=' >> (s2= *_);
-
 struct test_case_formatter
 {
     friend std::ostream &operator <<(std::ostream &sout, test_case_formatter)
@@ -169,6 +161,14 @@
     std::string line;
     smatch what;
 
+ sregex const rx_sec = '[' >> (s1= +_) >> ']';
+ sregex const rx_str = "str=" >> (s1= *_);
+ sregex const rx_pat = "pat=" >> (s1= *_);
+ sregex const rx_flg = "flg=" >> (s1= *_);
+ sregex const rx_sub = "sub=" >> (s1= *_);
+ sregex const rx_res = "res=" >> (s1= *_);
+ sregex const rx_br = "br" >> (s1= +digit) >> '=' >> (s2= *_);
+
     while(in.good())
     {
         std::getline(in, line);

Modified: trunk/libs/xpressive/test/test.hpp
==============================================================================
--- trunk/libs/xpressive/test/test.hpp (original)
+++ trunk/libs/xpressive/test/test.hpp 2007-11-27 13:59:06 EST (Tue, 27 Nov 2007)
@@ -35,6 +35,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 // backrefs
 //
+#if defined(__cplusplus_cli)
+#pragma managed(push, off)
+#endif
 template<typename Char>
 inline std::vector<std::basic_string<Char> > backrefs(Char const *br0, ...)
 {
@@ -54,6 +57,9 @@
     }
     return backrefs;
 }
+#if defined(__cplusplus_cli)
+#pragma managed(pop)
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 //


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk