Boost logo

Boost-Commit :

From: bdawes_at_[hidden]
Date: 2008-07-17 07:06:36


Author: bemandawes
Date: 2008-07-17 07:06:35 EDT (Thu, 17 Jul 2008)
New Revision: 47501
URL: http://svn.boost.org/trac/boost/changeset/47501

Log:
Merge trunk
Text files modified:
   branches/release/boost/any.hpp | 2 ++
   branches/release/libs/any/test.hpp | 11 ++++++++---
   2 files changed, 10 insertions(+), 3 deletions(-)

Modified: branches/release/boost/any.hpp
==============================================================================
--- branches/release/boost/any.hpp (original)
+++ branches/release/boost/any.hpp 2008-07-17 07:06:35 EDT (Thu, 17 Jul 2008)
@@ -127,6 +127,8 @@
 
             ValueType held;
 
+ private: // intentionally left unimplemented
+ holder & operator=(const holder &);
         };
 
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS

Modified: branches/release/libs/any/test.hpp
==============================================================================
--- branches/release/libs/any/test.hpp (original)
+++ branches/release/libs/any/test.hpp 2008-07-17 07:06:35 EDT (Thu, 17 Jul 2008)
@@ -232,7 +232,12 @@
     template<typename test_iterator>
     bool tester<test_iterator>::operator()()
     {
- using namespace std;
+ using std::cerr;
+ using std::endl;
+ using std::ends;
+ using std::exception;
+ using std::flush;
+ using std::string;
 
         unsigned long passed = 0, failed = 0, unimplemented = 0;
 
@@ -251,9 +256,9 @@
                     unsigned long allocated = allocations::instance().allocated();
                     unsigned long deallocated = allocations::instance().deallocated();
 #ifdef BOOST_NO_STRINGSTREAM
- ostrstream report;
+ std::ostrstream report;
 #else
- ostringstream report;
+ std::ostringstream report;
 #endif
                     report << "new/delete ("
                            << allocated << " allocated, "


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