[Boost-commit] svn:boost r47305 - in branches/release: boost/tr1/detail boost/tr1/tr1 libs/tr1/doc libs/tr1/test

From: john_at_[hidden]
Date: 2008-07-11 06:40:49

Author: johnmaddock
Date: 2008-07-11 06:40:49 EDT (Fri, 11 Jul 2008)
New Revision: 47305
URL: http://svn.boost.org/trac/boost/changeset/47305

Log:
Merge TR1 changes from Trunk.
Properties modified: 
   branches/release/boost/tr1/tr1/algorithm   (props changed)
   branches/release/boost/tr1/tr1/array   (props changed)
   branches/release/boost/tr1/tr1/bitset   (props changed)
   branches/release/boost/tr1/tr1/complex   (props changed)
   branches/release/boost/tr1/tr1/deque   (props changed)
   branches/release/boost/tr1/tr1/exception   (props changed)
   branches/release/boost/tr1/tr1/fstream   (props changed)
   branches/release/boost/tr1/tr1/functional   (props changed)
   branches/release/boost/tr1/tr1/iomanip   (props changed)
   branches/release/boost/tr1/tr1/ios   (props changed)
   branches/release/boost/tr1/tr1/iostream   (props changed)
   branches/release/boost/tr1/tr1/istream   (props changed)
   branches/release/boost/tr1/tr1/iterator   (props changed)
   branches/release/boost/tr1/tr1/limits   (props changed)
   branches/release/boost/tr1/tr1/list   (props changed)
   branches/release/boost/tr1/tr1/locale   (props changed)
   branches/release/boost/tr1/tr1/map   (props changed)
   branches/release/boost/tr1/tr1/memory   (props changed)
   branches/release/boost/tr1/tr1/new   (props changed)
   branches/release/boost/tr1/tr1/numeric   (props changed)
   branches/release/boost/tr1/tr1/ostream   (props changed)
   branches/release/boost/tr1/tr1/queue   (props changed)
   branches/release/boost/tr1/tr1/random   (props changed)
   branches/release/boost/tr1/tr1/regex   (props changed)
   branches/release/boost/tr1/tr1/set   (props changed)
   branches/release/boost/tr1/tr1/sstream   (props changed)
   branches/release/boost/tr1/tr1/stack   (props changed)
   branches/release/boost/tr1/tr1/stdexcept   (props changed)
   branches/release/boost/tr1/tr1/streambuf   (props changed)
   branches/release/boost/tr1/tr1/string   (props changed)
   branches/release/boost/tr1/tr1/strstream   (props changed)
   branches/release/boost/tr1/tr1/tuple   (props changed)
   branches/release/boost/tr1/tr1/type_traits   (props changed)
   branches/release/boost/tr1/tr1/typeinfo   (props changed)
   branches/release/boost/tr1/tr1/utility   (props changed)
   branches/release/boost/tr1/tr1/valarray   (props changed)
   branches/release/boost/tr1/tr1/vector   (props changed)
Text files modified: 
   branches/release/boost/tr1/detail/config.hpp |     4 +++-                                    
   branches/release/libs/tr1/doc/tr1.qbk        |     3 +--                                     
   branches/release/libs/tr1/test/Jamfile.v2    |     6 ++----                                  
   3 files changed, 6 insertions(+), 7 deletions(-)

Modified: branches/release/boost/tr1/detail/config.hpp
==============================================================================
--- branches/release/boost/tr1/detail/config.hpp	(original)
+++ branches/release/boost/tr1/detail/config.hpp	2008-07-11 06:40:49 EDT (Fri, 11 Jul 2008)
@@ -112,7 +112,9 @@
 #if defined(_MSC_VER) && (_MSC_VER >= 1500) \
    && defined(_MSC_FULL_VER) && \
    !defined(__SGI_STL_PORT) && \
-   !defined(_STLPORT_VERSION)
+   !defined(_STLPORT_VERSION) && \
+   !defined(_RWSTD_VER_STR) && \
+   !defined(_RWSTD_VER)
 //
 // MSVC-9.0 defines a not-quite TR1 conforming hash
 // function object in <functional>, so we must define

Modified: branches/release/libs/tr1/doc/tr1.qbk
==============================================================================
--- branches/release/libs/tr1/doc/tr1.qbk	(original)
+++ branches/release/libs/tr1/doc/tr1.qbk	2008-07-11 06:40:49 EDT (Fri, 11 Jul 2008)
@@ -5,8 +5,7 @@
     [license
         Distributed under the Boost Software License, Version 1.0.
         (See accompanying file LICENSE_1_0.txt or copy at
-        <ulink url="http://www.boost.org/LICENSE_1_0.txt">
-           http://www.boost.org/LICENSE_1_0.txt>)]
+        [@http://www.boost.org/LICENSE_1_0.txt])]
     [authors [Maddock, John]]
     [category misc]
     [last-revision $Date$]

Modified: branches/release/libs/tr1/test/Jamfile.v2
==============================================================================
--- branches/release/libs/tr1/test/Jamfile.v2	(original)
+++ branches/release/libs/tr1/test/Jamfile.v2	2008-07-11 06:40:49 EDT (Fri, 11 Jul 2008)
@@ -46,13 +46,11 @@
    }
    for local file2 in [ glob config/tr1_has_tr1*fail.cpp ]
    {
-      local test = [ compile-fail $(file2) ] ;
-      all_rules += $(test) ;
+      all_rules += [ compile-fail $(file2) : $(TR1_PROPERTIES) ] ;
    }
    for local filec in [ glob config/tr1_has_tr1*pass.cpp ]
    {
-      local test = [ compile $(filec) ] ;
-      all_rules += $(test) ;
+      all_rules += [ compile $(filec) : $(TR1_PROPERTIES) ] ;
    }
    
    for local file3 in [ glob type_traits/*.cpp ]