summaryrefslogtreecommitdiff
path: root/boost/geometry/geometries/polygon.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/geometry/geometries/polygon.hpp')
-rw-r--r--boost/geometry/geometries/polygon.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/boost/geometry/geometries/polygon.hpp b/boost/geometry/geometries/polygon.hpp
index 5f2e87a11d..5e6064e893 100644
--- a/boost/geometry/geometries/polygon.hpp
+++ b/boost/geometry/geometries/polygon.hpp
@@ -27,12 +27,10 @@
#include <boost/geometry/geometries/concepts/point_concept.hpp>
#include <boost/geometry/geometries/ring.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
{
@@ -57,6 +55,7 @@ namespace model
\note The container collecting the points in the rings can be different
from the container collecting the inner rings. They all default to vector.
+\qbk{[include reference/geometries/polygon.qbk]}
\qbk{before.synopsis,
[heading Model of]
[link geometry.reference.concepts.concept_polygon Polygon Concept]
@@ -91,7 +90,10 @@ public:
inline ring_type& outer() { return m_outer; }
inline inner_container_type & inners() { return m_inners; }
-#ifdef BOOST_GEOMETRY_EXPERIMENTAL_ENABLE_INITIALIZER_LIST
+#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST
+
+ // default constructor definition is required only
+ // if the constructor taking std::initializer_list is defined
/// \constructor_default{polygon}
inline polygon()
@@ -99,7 +101,6 @@ public:
, m_inners()
{}
-#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST
/// \constructor_initializer_list{polygon}
inline polygon(std::initializer_list<ring_type> l)
: m_outer(l.size() > 0 ? *l.begin() : ring_type())
@@ -129,7 +130,6 @@ public:
//#endif
#endif
-#endif
/// Utility method, clears outer and inner rings
inline void clear()