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

c++98 errors fixed

Browse Source 
[SVN r72620]
This commit is contained in:
Adam Wulkiewicz
2011-06-17 09:46:03 +00:00
parent 1e46876a0d
commit 6c593d13a9
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,7 @@ inline typename Translator::indexable_type const&
element_indexable(Value const& el, Translator const& tr)
{
return tr(el);
};
}
template <typename Value, typename Parameters, typename Box, typename Tag, typename Translator>
inline Box const&

7
include/boost/geometry/extensions/index/rtree/options.hpp
View File

@@ -55,21 +55,21 @@ namespace options { namespace detail {
template <size_t MaxElements>
struct default_rstar_reinserted_elements
{
static const size_t value = MaxElements * 0.3f;
static const size_t value = (MaxElements * 3) / 10;
};
}} // namespace options::detail
template <size_t MaxElements,
size_t MinElements,
size_t UseNearlyMinimumCost = false,
bool UseNearlyMinimumCost = false,
size_t ReinsertedElements = options::detail::default_rstar_reinserted_elements<MaxElements>::value
>
struct rstar
{
static const size_t max_elements = MaxElements;
static const size_t min_elements = MinElements;
static const size_t use_nearly_minimum_cost = UseNearlyMinimumCost;
static const bool use_nearly_minimum_cost = UseNearlyMinimumCost;
static const size_t reinserted_elements = ReinsertedElements;
};
@@ -93,7 +93,6 @@ template <typename Tag>
struct options_type
{
// TODO: awulkiew - use static assert
typedef void type;
};
template <typename Parameters, typename InsertTag, typename ChooseNextNodeTag, typename RedistributeTag, typename NodeTag>

8
tests/additional_sizes_and_times.cpp
View File

@@ -29,12 +29,12 @@ int main()
typedef bg::model::point<float, 2, bg::cs::cartesian> P;
typedef bg::model::box<P> B;
//typedef bgi::rtree<std::pair<B, size_t>, bgi::linear<32, 8> > RT;
typedef bgi::rtree<std::pair<B, size_t>, bgi::quadratic<32, 8> > RT;
//typedef bgi::rtree<std::pair<B, size_t>, bgi::quadratic<32, 8> > RT;
//typedef bgi::rtree<std::pair<B, size_t>, bgi::rstar<32, 8, true> > RT;
/*typedef bgi::rtree<
typedef bgi::rtree<
std::pair<B, size_t>,
bgi::options::rtree<bgi::linear<32, 8>, bgi::insert_tag, bgi::choose_by_area_diff_tag, bgi::linear_tag, bgi::default_static_tag>
> RT;*/
bgi::options::rtree<bgi::linear<32, 8>, bgi::insert_tag, bgi::choose_by_area_diff_tag, bgi::quadratic_tag, bgi::default_static_tag>
> RT;
// load config file
std::ifstream file_cfg("config.txt");