diff options
Diffstat (limited to 'boost/geometry/geometries/multi_linestring.hpp')
-rw-r--r-- | boost/geometry/geometries/multi_linestring.hpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/boost/geometry/geometries/multi_linestring.hpp b/boost/geometry/geometries/multi_linestring.hpp index 195a58139c..cd08fdbe14 100644 --- a/boost/geometry/geometries/multi_linestring.hpp +++ b/boost/geometry/geometries/multi_linestring.hpp @@ -23,12 +23,10 @@ #include <boost/geometry/core/tags.hpp> #include <boost/geometry/geometries/concepts/linestring_concept.hpp> -#ifdef BOOST_GEOMETRY_EXPERIMENTAL_ENABLE_INITIALIZER_LIST #include <boost/config.hpp> #ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST #include <initializer_list> #endif -#endif namespace boost { namespace geometry { @@ -43,6 +41,7 @@ namespace model e.g. a highway (with interruptions) \ingroup geometries +\qbk{[include reference/geometries/multi_linestring.qbk]} \qbk{before.synopsis, [heading Model of] [link geometry.reference.concepts.concept_multi_linestring MultiLineString Concept] @@ -58,7 +57,10 @@ class multi_linestring : public Container<LineString, Allocator<LineString> > { BOOST_CONCEPT_ASSERT( (concept::Linestring<LineString>) ); -#ifdef BOOST_GEOMETRY_EXPERIMENTAL_ENABLE_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST + + // default constructor and base_type definitions are required only + // if the constructor taking std::initializer_list is defined typedef Container<LineString, Allocator<LineString> > base_type; @@ -68,8 +70,6 @@ public: : base_type() {} -#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST - /// \constructor_initializer_list{multi_linestring} inline multi_linestring(std::initializer_list<LineString> l) : base_type(l.begin(), l.end()) @@ -89,7 +89,6 @@ public: //#endif #endif -#endif }; |