[Boost-commit] svn:boost r66440 - trunk/boost/proto

Subject: [Boost-commit] svn:boost r66440 - trunk/boost/proto
From: admin_at_[hidden]
Date: 2010-11-07 14:15:43

Author: wash
Date: 2010-11-07 14:15:38 EST (Sun, 07 Nov 2010)
New Revision: 66440
URL: http://svn.boost.org/trac/boost/changeset/66440

Log:
My original patch for this file (applied by hkaiser I believe) removed the need
to include typeinfo; however, I overlooked the removal of the actual include of
typeinfo. Additionally, I've removed the use of iomanip; on Linux, iomanip causes
problems with path64, intel and clang when using GNU's standard library version
4.5 or higher (specifically, newer versions of GNU's standard library use C++0x
extensively, with no workarounds for compilers that lack GNU GCC's C++0x support).
Eric, please let me know if this is a problem. It's a two line change.

Text files modified: 
   trunk/boost/proto/debug.hpp |    11 ++++++-----                             
   1 files changed, 6 insertions(+), 5 deletions(-)

Modified: trunk/boost/proto/debug.hpp
==============================================================================
--- trunk/boost/proto/debug.hpp	(original)
+++ trunk/boost/proto/debug.hpp	2010-11-07 14:15:38 EST (Sun, 07 Nov 2010)
@@ -9,9 +9,7 @@
 #ifndef BOOST_PROTO_DEBUG_HPP_EAN_12_31_2006
 #define BOOST_PROTO_DEBUG_HPP_EAN_12_31_2006
 
-#include <iomanip>
 #include <iostream>
-#include <typeinfo>
 #include <boost/preprocessor/stringize.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/proto/proto_fwd.hpp>
@@ -142,7 +140,8 @@
             {
                 using namespace hidden_detail_;
                 typedef typename tag_of<Expr>::type tag;
-                this->sout_ << std::setw(this->depth_) << (this->first_? "" : ", ");
+                this->sout_.width(this->depth_);
+                this->sout_ << (this->first_? "" : ", ");
                 this->sout_ << tag() << "(" << proto::value(expr) << ")\n";
                 this->first_ = false;
             }
@@ -152,11 +151,13 @@
             {
                 using namespace hidden_detail_;
                 typedef typename tag_of<Expr>::type tag;
-                this->sout_ << std::setw(this->depth_) << (this->first_? "" : ", ");
+                this->sout_.width(this->depth_);
+                this->sout_ << (this->first_? "" : ", ");
                 this->sout_ << tag() << "(\n";
                 display_expr display(this->sout_, this->depth_ + 4);
                 fusion::for_each(expr, display);
-                this->sout_ << std::setw(this->depth_) << "" << ")\n";
+                this->sout_.width(this->depth_);
+                this->sout_ << "" << ")\n";
                 this->first_ = false;
             }