Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

We don't need templates at all, this is not CRTP?

Browse Source
This commit is contained in:
Daniel J. Hofmann
2016-02-17 16:41:50 -08:00
committed by Patrick Niklaus
parent 25834b89dd
commit f3c4a7dd16
3 changed files with 27 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/api/table_api.hpp
+8 -15
View File
@@ -24,15 +24,11 @@ namespace engine
namespace api
{
namespace detail
class TableAPI final : public BaseAPI
{
template <typename ChildT> class TableAPI_ : public BaseAPI_<TableAPI_<ChildT>>
{
using BaseT = BaseAPI_<TableAPI_<ChildT>>;
public:
TableAPI_(const datafacade::BaseDataFacade &facade_, const TableParameters &parameters_)
: BaseT(facade_, parameters_), parameters(parameters_)
TableAPI(const datafacade::BaseDataFacade &facade_, const TableParameters &parameters_)
: BaseAPI(facade_, parameters_), parameters(parameters_)
{
}
@@ -69,7 +65,7 @@ template <typename ChildT> class TableAPI_ : public BaseAPI_<TableAPI_<ChildT>>
for (; phantom_iter != phantoms.end() && coordinate_iter != parameters.coordinates.end();
++phantom_iter, ++coordinate_iter)
{
json_waypoints.values.push_back(BaseT::MakeWaypoint(*coordinate_iter, *phantom_iter));
json_waypoints.values.push_back(BaseAPI::MakeWaypoint(*coordinate_iter, *phantom_iter));
}
return json_waypoints;
}
@@ -83,7 +79,7 @@ template <typename ChildT> class TableAPI_ : public BaseAPI_<TableAPI_<ChildT>>
{
BOOST_ASSERT(idx < phantoms.size() && idx < parameters.coordinates.size());
json_waypoints.values.push_back(
BaseT::MakeWaypoint(parameters.coordinates[idx], phantoms[idx]));
BaseAPI::MakeWaypoint(parameters.coordinates[idx], phantoms[idx]));
}
return json_waypoints;
}
@@ -106,12 +102,9 @@ template <typename ChildT> class TableAPI_ : public BaseAPI_<TableAPI_<ChildT>>
const TableParameters &parameters;
};
}
// Expose non-templated version
using TableAPI = detail::TableAPI_<std::true_type>;
}
}
}
} // ns api
} // ns engine
} // ns osrm
#endif