[Boost-sandbox-cvs] boost-sandbox/boost/units measurement.hpp, 1.9, 1.10

[Matthias S. <mat...@us...>]

Update of /cvsroot/boost-sandbox/boost-sandbox/boost/units
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4389

Modified Files:
	measurement.hpp 
Log Message:
conflict fix


Index: measurement.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/measurement.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- measurement.hpp	4 Apr 2007 19:39:14 -0000	1.9
+++ measurement.hpp	4 Apr 2007 20:04:25 -0000	1.10
@@ -316,16 +316,11 @@
     boost::io::ios_width_saver width_saver(os);
     boost::io::ios_flags_saver flags_saver(os);
 
-//    os << val.value();
-//    
-//    if (val.uncertainty() > Y(0))
-//        os << "(+/-" << val.uncertainty() << ")";
-
     os << std::setprecision(13) 
        << std::setw(21) 
        << std::scientific
        << val.value();
-    
+
     if (val.uncertainty() > Y(0))
         os << " (rel. unc. = " 
            << std::setprecision(1)