[Boost-commit] svn:boost r41812 - in branches/release: boost/xpressive/detail/core boost/xpressive/detail/dynamic boost/xpressive/proto/context libs/xpressive/test

From: eric_at_[hidden]
Date: 2007-12-06 18:42:32

Author: eric_niebler
Date: 2007-12-06 18:42:32 EST (Thu, 06 Dec 2007)
New Revision: 41812
URL: http://svn.boost.org/trac/boost/changeset/41812

Log:
merged from trunk
Text files modified: 
   branches/release/boost/xpressive/detail/core/access.hpp       |     1 +                                       
   branches/release/boost/xpressive/detail/core/action.hpp       |     1 +                                       
   branches/release/boost/xpressive/detail/dynamic/matchable.hpp |     1 +                                       
   branches/release/boost/xpressive/proto/context/default.hpp    |     3 ++-                                     
   branches/release/libs/xpressive/test/regress.ipp              |    16 ++++++++--------                        
   branches/release/libs/xpressive/test/test.hpp                 |     6 ++++++                                  
   6 files changed, 19 insertions(+), 9 deletions(-)

Modified: branches/release/boost/xpressive/detail/core/access.hpp
==============================================================================
--- branches/release/boost/xpressive/detail/core/access.hpp	(original)
+++ branches/release/boost/xpressive/detail/core/access.hpp	2007-12-06 18:42:32 EST (Thu, 06 Dec 2007)
@@ -17,6 +17,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/xpressive/detail/detail_fwd.hpp>
 #include <boost/xpressive/detail/dynamic/matchable.hpp>
+#include <boost/xpressive/match_results.hpp> // for type_info_less
 
 namespace boost { namespace xpressive { namespace detail
 {

Modified: branches/release/boost/xpressive/detail/core/action.hpp
==============================================================================
--- branches/release/boost/xpressive/detail/core/action.hpp	(original)
+++ branches/release/boost/xpressive/detail/core/action.hpp	2007-12-06 18:42:32 EST (Thu, 06 Dec 2007)
@@ -14,6 +14,7 @@
 #endif
 
 #include <boost/xpressive/detail/detail_fwd.hpp>
+#include <boost/xpressive/match_results.hpp> // for type_info_less
 
 namespace boost { namespace xpressive { namespace detail
 {

Modified: branches/release/boost/xpressive/detail/dynamic/matchable.hpp
==============================================================================
--- branches/release/boost/xpressive/detail/dynamic/matchable.hpp	(original)
+++ branches/release/boost/xpressive/detail/dynamic/matchable.hpp	2007-12-06 18:42:32 EST (Thu, 06 Dec 2007)
@@ -21,6 +21,7 @@
 #include <boost/xpressive/detail/core/quant_style.hpp>
 #include <boost/xpressive/detail/utility/counted_base.hpp>
 #include <boost/xpressive/detail/detail_fwd.hpp>
+#include <boost/xpressive/detail/dynamic/sequence.hpp>
 #include <boost/xpressive/regex_error.hpp>
 
 namespace boost { namespace xpressive { namespace detail

Modified: branches/release/boost/xpressive/proto/context/default.hpp
==============================================================================
--- branches/release/boost/xpressive/proto/context/default.hpp	(original)
+++ branches/release/boost/xpressive/proto/context/default.hpp	2007-12-06 18:42:32 EST (Thu, 06 Dec 2007)
@@ -40,9 +40,10 @@
     #ifndef BOOST_PROTO_DOXYGEN_INVOKED
         #define BOOST_PROTO_DECLTYPE_NESTED_TYPEDEF_TPL_(Nested, Expr)\
             BOOST_TYPEOF_NESTED_TYPEDEF_TPL(BOOST_PP_CAT(nested_and_hidden_, Nested), Expr)\
+            static int const sz = sizeof(detail::check_reference(Expr));  \
             struct Nested\
               : mpl::if_c<\
-                    1==sizeof(detail::check_reference(Expr))\
+                    1==sz\
                   , typename BOOST_PP_CAT(nested_and_hidden_, Nested)::type &\
                   , typename BOOST_PP_CAT(nested_and_hidden_, Nested)::type\
                 >\

Modified: branches/release/libs/xpressive/test/regress.ipp
==============================================================================
--- branches/release/libs/xpressive/test/regress.ipp	(original)
+++ branches/release/libs/xpressive/test/regress.ipp	2007-12-06 18:42:32 EST (Thu, 06 Dec 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: branches/release/libs/xpressive/test/test.hpp
==============================================================================
--- branches/release/libs/xpressive/test/test.hpp	(original)
+++ branches/release/libs/xpressive/test/test.hpp	2007-12-06 18:42:32 EST (Thu, 06 Dec 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
 
 ///////////////////////////////////////////////////////////////////////////////
 //