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

Safety issue fixed in pushable_array.

Browse Source 
Filenames related to filters(old name) changed to adaptors.

[SVN r81436]
This commit is contained in:
Adam Wulkiewicz
2012-11-20 13:45:48 +00:00
parent ff1ccbdf29
commit e2beb3cf2f
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/geometry/extensions/index/filters/nearest_filter.hpp → include/boost/geometry/extensions/index/adaptors/nearest_query.hpp
View File

@@ -1,6 +1,6 @@
// Boost.Geometry Index
//
// Nearest neighbour filter implementation
// Nearest neighbour query range adaptor
//
// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
//
@@ -8,8 +8,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_NEAREST_FILTER_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_NEAREST_FILTER_HPP
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP
namespace boost { namespace geometry { namespace index {
@@ -98,4 +98,4 @@ operator|(
}}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_NEAREST_FILTER_HPP
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP

8
include/boost/geometry/extensions/index/filters/query_filter.hpp → include/boost/geometry/extensions/index/adaptors/spatial_query.hpp
View File

@@ -1,6 +1,6 @@
// Boost.Geometry Index
//
// Query filter implementation
// Spatial query range adaptor
//
// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
//
@@ -8,8 +8,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_QUERY_FILTER_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_QUERY_FILTER_HPP
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP
namespace boost { namespace geometry { namespace index {
@@ -74,4 +74,4 @@ operator|(
}}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_QUERY_FILTER_HPP
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP

3
include/boost/geometry/extensions/index/pushable_array.hpp
View File

@@ -151,7 +151,8 @@ public:
inline void push_back(Element const& v)
{
BOOST_GEOMETRY_INDEX_ASSERT(m_size < Capacity, "can't further increase the size of the container");
m_array[m_size++] = v;
m_array[m_size] = v;
++m_size;
}
inline void pop_back()

12
include/boost/geometry/extensions/index/rtree/filters.hpp → include/boost/geometry/extensions/index/rtree/adaptors.hpp
View File

@@ -1,6 +1,6 @@
// Boost.Geometry Index
//
// R-tree queries filters implementation
// R-tree queries range adaptors
//
// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
//
@@ -8,14 +8,14 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_FILTERS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_FILTERS_HPP
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP
#include <deque>
#include <boost/static_assert.hpp>
#include <boost/geometry/extensions/index/filters/query_filter.hpp>
#include <boost/geometry/extensions/index/filters/nearest_filter.hpp>
#include <boost/geometry/extensions/index/adaptors/spatial_query.hpp>
#include <boost/geometry/extensions/index/adaptors/nearest_query.hpp>
namespace boost { namespace geometry { namespace index {
@@ -82,4 +82,4 @@ private:
}}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_FILTERS_HPP
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP

2
include/boost/geometry/extensions/index/rtree/rtree.hpp
View File

@@ -26,7 +26,7 @@
#include <boost/geometry/extensions/index/rtree/options.hpp>
#include <boost/geometry/extensions/index/predicates.hpp>
#include <boost/geometry/extensions/index/rtree/filters.hpp>
#include <boost/geometry/extensions/index/rtree/adaptors.hpp>
#include <boost/geometry/extensions/index/rtree/node/node.hpp>