boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-02 21:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #281 from awulkiew/feature/access_debugging

Browse Source 
Detection of access to uninitialized or destroyed geometries.
This commit is contained in:
Adam Wulkiewicz
2015-04-22 15:30:31 +02:00
parent 0851688794 34bdc44b10
commit 5c8e7aa6cf
2 changed files with 98 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
include/boost/geometry/geometries/box.hpp
View File

@@ -22,6 +22,9 @@
#include <boost/geometry/algorithms/convert.hpp>
#include <boost/geometry/geometries/concepts/point_concept.hpp>
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
#include <boost/assert.hpp>
#endif
namespace boost { namespace geometry
@@ -54,7 +57,8 @@ class box
public:
#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
#if !defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
/// \constructor_default_no_init
box() = default;
#else
@@ -62,6 +66,16 @@ public:
inline box()
{}
#endif
#else // defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
inline box()
{
m_created = 1;
}
~box()
{
m_created = 0;
}
#endif
/*!
\brief Constructor taking the minimum corner point and the maximum corner point
@@ -70,18 +84,50 @@ public:
{
geometry::convert(min_corner, m_min_corner);
geometry::convert(max_corner, m_max_corner);
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
m_created = 1;
#endif
}
inline Point const& min_corner() const { return m_min_corner; }
inline Point const& max_corner() const { return m_max_corner; }
inline Point const& min_corner() const
{
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
BOOST_ASSERT(m_created == 1);
#endif
return m_min_corner;
}
inline Point const& max_corner() const
{
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
BOOST_ASSERT(m_created == 1);
#endif
return m_max_corner;
}
inline Point& min_corner() { return m_min_corner; }
inline Point& max_corner() { return m_max_corner; }
inline Point& min_corner()
{
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
BOOST_ASSERT(m_created == 1);
#endif
return m_min_corner;
}
inline Point& max_corner()
{
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
BOOST_ASSERT(m_created == 1);
#endif
return m_max_corner;
}
private:
Point m_min_corner;
Point m_max_corner;
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
int m_created;
#endif
};

48
include/boost/geometry/geometries/point.hpp
View File

@@ -31,6 +31,11 @@
#include <boost/geometry/core/coordinate_system.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp>
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
#include <algorithm>
#include <boost/assert.hpp>
#endif
namespace boost { namespace geometry
{
@@ -112,7 +117,8 @@ class point
public:
#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
#if !defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
/// \constructor_default_no_init
point() = default;
#else
@@ -120,6 +126,18 @@ public:
inline point()
{}
#endif
#else // defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
point()
{
m_created = 1;
std::fill_n(m_values_initialized, DimensionCount, 0);
}
~point()
{
m_created = 0;
std::fill_n(m_values_initialized, DimensionCount, 0);
}
#endif
/// @brief Constructor to set one value
explicit inline point(CoordinateType const& v0)
@@ -127,6 +145,11 @@ public:
detail::array_assign<DimensionCount, 0>::apply(m_values, v0);
detail::array_assign<DimensionCount, 1>::apply(m_values, CoordinateType());
detail::array_assign<DimensionCount, 2>::apply(m_values, CoordinateType());
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
m_created = 1;
std::fill_n(m_values_initialized, (std::min)(std::size_t(3), DimensionCount), 1);
#endif
}
/// @brief Constructor to set two values
@@ -135,6 +158,11 @@ public:
detail::array_assign<DimensionCount, 0>::apply(m_values, v0);
detail::array_assign<DimensionCount, 1>::apply(m_values, v1);
detail::array_assign<DimensionCount, 2>::apply(m_values, CoordinateType());
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
m_created = 1;
std::fill_n(m_values_initialized, (std::min)(std::size_t(3), DimensionCount), 1);
#endif
}
/// @brief Constructor to set three values
@@ -144,6 +172,11 @@ public:
detail::array_assign<DimensionCount, 0>::apply(m_values, v0);
detail::array_assign<DimensionCount, 1>::apply(m_values, v1);
detail::array_assign<DimensionCount, 2>::apply(m_values, v2);
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
m_created = 1;
std::fill_n(m_values_initialized, (std::min)(std::size_t(3), DimensionCount), 1);
#endif
}
/// @brief Get a coordinate
@@ -152,6 +185,10 @@ public:
template <std::size_t K>
inline CoordinateType const& get() const
{
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
BOOST_ASSERT(m_created == 1);
BOOST_ASSERT(m_values_initialized[K] == 1);
#endif
BOOST_STATIC_ASSERT(K < DimensionCount);
return m_values[K];
}
@@ -162,6 +199,10 @@ public:
template <std::size_t K>
inline void set(CoordinateType const& value)
{
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
BOOST_ASSERT(m_created == 1);
m_values_initialized[K] = 1;
#endif
BOOST_STATIC_ASSERT(K < DimensionCount);
m_values[K] = value;
}
@@ -169,6 +210,11 @@ public:
private:
CoordinateType m_values[DimensionCount];
#if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
int m_created;
int m_values_initialized[DimensionCount];
#endif
};