[Boost-commit] svn:boost r53696 - in branches/release: . boost/xpressive libs/xpressive/test

Subject: [Boost-commit] svn:boost r53696 - in branches/release: . boost/xpressive libs/xpressive/test
From: eric_at_[hidden]
Date: 2009-06-06 12:23:48

Author: eric_niebler
Date: 2009-06-06 12:23:47 EDT (Sat, 06 Jun 2009)
New Revision: 53696
URL: http://svn.boost.org/trac/boost/changeset/53696

Log:
Merged revisions 53695 via svnmerge from https://svn.boost.org/svn/boost/trunk
Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/boost/xpressive/xpressive_typeof.hpp |     2 +-                                      
   branches/release/libs/xpressive/test/Jamfile.v2       |     4 ++--                                    
   branches/release/libs/xpressive/test/test_typeof.cpp  |     2 +-                                      
   branches/release/libs/xpressive/test/test_typeof2.cpp |     2 +-                                      
   4 files changed, 5 insertions(+), 5 deletions(-)

Modified: branches/release/boost/xpressive/xpressive_typeof.hpp
==============================================================================
--- branches/release/boost/xpressive/xpressive_typeof.hpp	(original)
+++ branches/release/boost/xpressive/xpressive_typeof.hpp	2009-06-06 12:23:47 EDT (Sat, 06 Jun 2009)
@@ -16,7 +16,7 @@
 
 #include <boost/config.hpp>
 #include <boost/typeof/typeof.hpp>
-#ifndef BOOST_NO_STL_LOCALE
+#ifndef BOOST_NO_STD_LOCALE
 # include <boost/typeof/std/locale.hpp>
 #endif
 #include <boost/proto/proto_typeof.hpp>

Modified: branches/release/libs/xpressive/test/Jamfile.v2
==============================================================================
--- branches/release/libs/xpressive/test/Jamfile.v2	(original)
+++ branches/release/libs/xpressive/test/Jamfile.v2	2009-06-06 12:23:47 EDT (Sat, 06 Jun 2009)
@@ -71,7 +71,7 @@
          [ compile test_regex_token_iterator.cpp ]
          [ compile test_regex_traits.cpp ]
          [ compile test_sub_match.cpp ]
-#         [ compile test_typeof.cpp : <define>BOOST_TYPEOF_EMULATION=1 <define>BOOST_TYPEOF_LIMIT_SIZE=200 ]
-#         [ compile test_typeof2.cpp : <define>BOOST_TYPEOF_EMULATION=1 <define>BOOST_TYPEOF_LIMIT_SIZE=200 ]
+#         [ compile test_typeof.cpp ]
+#         [ compile test_typeof2.cpp ]
     ;
 

Modified: branches/release/libs/xpressive/test/test_typeof.cpp
==============================================================================
--- branches/release/libs/xpressive/test/test_typeof.cpp	(original)
+++ branches/release/libs/xpressive/test/test_typeof.cpp	2009-06-06 12:23:47 EDT (Sat, 06 Jun 2009)
@@ -6,7 +6,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_TYPEOF_LIMIT_SIZE 200
-#define BOOST_TYPEOF_COMPILANT
+#define BOOST_TYPEOF_EMULATION 1
 
 #include <string>
 #include <boost/version.hpp>

Modified: branches/release/libs/xpressive/test/test_typeof2.cpp
==============================================================================
--- branches/release/libs/xpressive/test/test_typeof2.cpp	(original)
+++ branches/release/libs/xpressive/test/test_typeof2.cpp	2009-06-06 12:23:47 EDT (Sat, 06 Jun 2009)
@@ -6,7 +6,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_TYPEOF_LIMIT_SIZE 200
-#define BOOST_TYPEOF_COMPILANT
+#define BOOST_TYPEOF_EMULATION 1
 
 #include <string>
 #include <map>