[Boost-commit] svn:boost r76856 - trunk/boost/geometry/io/wkt

Subject: [Boost-commit] svn:boost r76856 - trunk/boost/geometry/io/wkt
From: barend.gehrels_at_[hidden]
Date: 2012-02-03 13:21:06

Author: barendgehrels
Date: 2012-02-03 13:21:05 EST (Fri, 03 Feb 2012)
New Revision: 76856
URL: http://svn.boost.org/trac/boost/changeset/76856

Log:
Bugfix, fixes including wkt/iomanip.hpp which should not be done. It might cause an assertion to fail on any non-streamable type
Text files modified: 
   trunk/boost/geometry/io/wkt/iomanip.hpp |    14 ++++----------                          
   trunk/boost/geometry/io/wkt/wkt.hpp     |     6 +++++-                                  
   2 files changed, 9 insertions(+), 11 deletions(-)

Modified: trunk/boost/geometry/io/wkt/iomanip.hpp
==============================================================================
--- trunk/boost/geometry/io/wkt/iomanip.hpp	(original)
+++ trunk/boost/geometry/io/wkt/iomanip.hpp	2012-02-03 13:21:05 EST (Fri, 03 Feb 2012)
@@ -17,23 +17,19 @@
 #include <boost/geometry/io/wkt/write.hpp>
 
 // This short file contains only one manipulator, streaming as WKT
-// Don't move contents to as_wkt, developers must be able to choose how to stream
+// Don't include this in any standard-included header file.
 
 // Don't use namespace boost::geometry, to enable the library to stream custom geometries which
-// are living outside the namespace boost { namespace geometry
-
-//namespace boost { namespace geometry
-//{
-
+// are living outside the namespace boost::geometry
 
 /*!
 \brief Streams a geometry as Well-Known Text
 \ingroup wkt
 */
 template<typename Char, typename Traits, typename Geometry>
-inline std::basic_ostream<Char,Traits>& operator<<
+inline std::basic_ostream<Char, Traits>& operator<<
     (
-        std::basic_ostream<Char,Traits> &os,
+        std::basic_ostream<Char, Traits> &os,
         Geometry const& geom
     )
 {
@@ -41,6 +37,4 @@
     return os;
 }
 
-//}} // namespace boost::geometry
-
 #endif // BOOST_GEOMETRY_IO_WKT_IOMANIP_HPP

Modified: trunk/boost/geometry/io/wkt/wkt.hpp
==============================================================================
--- trunk/boost/geometry/io/wkt/wkt.hpp	(original)
+++ trunk/boost/geometry/io/wkt/wkt.hpp	2012-02-03 13:21:05 EST (Fri, 03 Feb 2012)
@@ -16,6 +16,10 @@
 
 #include <boost/geometry/io/wkt/read.hpp>
 #include <boost/geometry/io/wkt/write.hpp>
-#include <boost/geometry/io/wkt/iomanip.hpp>
+
+// BSG 2011-02-03
+// We don't include iomanip by default. That tries to stream anything not known
+// by default (such as ttmath) and reports errors.
+// Users can include iomanip themselves (if they want to)
 
 #endif // BOOST_GEOMETRY_IO_WKT_WKT_HPP