|
From: Steven W. <ste...@us...> - 2007-04-15 02:57:05
|
Update of /cvsroot/boost-sandbox/boost-sandbox/libs/units/example In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26207/boost-sandbox/libs/units/example Modified Files: unit_example_5.cpp Log Message: Supress implicit narrowing conversions Index: unit_example_5.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/units/example/unit_example_5.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- unit_example_5.cpp 3 Apr 2007 20:48:07 -0000 1.3 +++ unit_example_5.cpp 15 Apr 2007 02:57:02 -0000 1.4 @@ -32,12 +32,12 @@ volume (cm^3) = 1e+06 cm^3 volume (m^3) = 1 m^3 -energy (joules) = 1 m^2 kg s^(-2) -energy (ergs) = 1e+07 cm^2 g s^(-2) -energy (joules) = 1 m^2 kg s^(-2) +energy (joules) = 1 m^2 kg s^-2 +energy (ergs) = 1e+07 cm^2 g s^-2 +energy (joules) = 1 m^2 kg s^-2 -velocity (2 m/s) = 2 m s^(-1) -velocity (2 cm/s) = 0.02 m s^(-1) +velocity (2 m/s) = 2 m s^-1 +velocity (2 cm/s) = 0.02 m s^-1 //] //[unit_example_5_output_3 @@ -45,11 +45,11 @@ volume (m^3) = 1 m^3 volume (cm^3) = 1e+06 cm^3 -energy (joules) = 1 m^2 kg s^(-2) -energy (ergs) = 1e+07 cm^2 g s^(-2) +energy (joules) = 1 m^2 kg s^-2 +energy (ergs) = 1e+07 cm^2 g s^-2 -velocity (2 m/s) = 2 m s^(-1) -velocity (2 cm/s) = 0.02 m s^(-1) +velocity (2 m/s) = 2 m s^-1 +velocity (2 cm/s) = 0.02 m s^-1 //] @endverbatim @@ -79,7 +79,7 @@ // implicit value_type conversions //[unit_example_5_snippet_1 quantity<SI::length> L1 = quantity<SI::length,int>(int(2.5)*SI::meters); - quantity<SI::length,int> L2 = quantity<SI::length,double>(2.5*SI::meters); + quantity<SI::length,int> L2(quantity<SI::length,double>(2.5*SI::meters)); //] //[unit_example_5_snippet_2 @@ -183,12 +183,12 @@ sstream2 << "volume (cm^3) = " << 1e6 << " cm^3" << std::endl; sstream2 << "volume (m^3) = 1 m^3" << std::endl; sstream2 << std::endl; - sstream2 << "energy (joules) = 1 m^2 kg s^(-2)" << std::endl; - sstream2 << "energy (ergs) = " << 1e7 << " cm^2 g s^(-2)" << std::endl; - sstream2 << "energy (joules) = 1 m^2 kg s^(-2)" << std::endl; + sstream2 << "energy (joules) = 1 m^2 kg s^-2" << std::endl; + sstream2 << "energy (ergs) = " << 1e7 << " cm^2 g s^-2" << std::endl; + sstream2 << "energy (joules) = 1 m^2 kg s^-2" << std::endl; sstream2 << std::endl; - sstream2 << "velocity (2 m/s) = 2 m s^(-1)" << std::endl; - sstream2 << "velocity (2 cm/s) = 0.02 m s^(-1)" << std::endl; + sstream2 << "velocity (2 m/s) = 2 m s^-1" << std::endl; + sstream2 << "velocity (2 cm/s) = 0.02 m s^-1" << std::endl; sstream2 << std::endl; #ifdef BOOST_UNITS_ENABLE_IMPLICIT_UNIT_CONVERSION sstream2 << std::endl; @@ -196,11 +196,11 @@ sstream2 << "volume (m^3) = 1 m^3" << std::endl; sstream2 << "volume (cm^3) = " << 1e6 << " cm^3" << std::endl; sstream2 << std::endl; - sstream2 << "energy (joules) = 1 m^2 kg s^(-2)" << std::endl; - sstream2 << "energy (ergs) = " << 1e7 << " cm^2 g s^(-2)" << std::endl; + sstream2 << "energy (joules) = 1 m^2 kg s^-2" << std::endl; + sstream2 << "energy (ergs) = " << 1e7 << " cm^2 g s^-2" << std::endl; sstream2 << std::endl; - sstream2 << "velocity (2 m/s) = 2 m s^(-1)" << std::endl; - sstream2 << "velocity (2 cm/s) = 0.02 m s^(-1)" << std::endl; + sstream2 << "velocity (2 m/s) = 2 m s^-1" << std::endl; + sstream2 << "velocity (2 cm/s) = 0.02 m s^-1" << std::endl; sstream2 << std::endl; #endif |