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

[CPP17] Modernize: Replace typedef with using statements

Browse Source
This commit is contained in:
Dennis Luxen
2022-11-06 13:21:45 +01:00
parent fc12b6c365
commit 8bff55cd85
23 changed files with 99 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/util/alias.hpp
+2 -2
View File
@@ -171,8 +171,8 @@ namespace std
{
template <typename From, typename Tag> struct hash<osrm::Alias<From, Tag>>
{
typedef osrm::Alias<From, Tag> argument_type;
typedef std::size_t result_type;
using argument_type = osrm::Alias<From, Tag>;
using result_type = std::size_t;
result_type operator()(argument_type const &s) const
{
return std::hash<From>()(static_cast<const From>(s));
include/util/bit_range.hpp
+5 -9
View File
@@ -49,17 +49,13 @@ class BitIterator : public boost::iterator_facade<BitIterator<DataT>,
boost::forward_traversal_tag,
const std::size_t>
{
typedef boost::iterator_facade<BitIterator<DataT>,
const std::size_t,
boost::forward_traversal_tag,
const std::size_t>
base_t;
using base_t = boost::iterator_facade<BitIterator<DataT>, const std::size_t, boost::forward_traversal_tag, const std::size_t>;
public:
typedef typename base_t::value_type value_type;
typedef typename base_t::difference_type difference_type;
typedef typename base_t::reference reference;
typedef std::random_access_iterator_tag iterator_category;
using value_type = typename base_t::value_type;
using difference_type = typename base_t::difference_type;
using reference = typename base_t::reference;
using iterator_category = std::random_access_iterator_tag;
explicit BitIterator() : m_value(0) {}
explicit BitIterator(const DataT x) : m_value(std::move(x)) {}
include/util/filtered_integer_range.hpp
+7 -11
View File
@@ -26,17 +26,13 @@ class filtered_integer_iterator
boost::single_pass_traversal_tag,
Integer>
{
typedef boost::iterator_facade<filtered_integer_iterator<Integer, Filter>,
Integer,
boost::single_pass_traversal_tag,
Integer>
base_t;
using base_t = boost::iterator_facade<filtered_integer_iterator<Integer, Filter>, Integer, boost::single_pass_traversal_tag, Integer>;
public:
typedef typename base_t::value_type value_type;
typedef typename base_t::difference_type difference_type;
typedef typename base_t::reference reference;
typedef std::random_access_iterator_tag iterator_category;
using value_type = typename base_t::value_type;
using difference_type = typename base_t::difference_type;
using reference = typename base_t::reference;
using iterator_category = std::random_access_iterator_tag;
filtered_integer_iterator() : value(), filter(nullptr) {}
explicit filtered_integer_iterator(value_type x, value_type end_value, const Filter *filter)
@@ -64,8 +60,8 @@ class filtered_integer_iterator
template <typename Integer, typename Filter> class filtered_range
{
public:
typedef filtered_integer_iterator<Integer, Filter> const_iterator;
typedef filtered_integer_iterator<Integer, Filter> iterator;
using const_iterator = filtered_integer_iterator<Integer, Filter>;
using iterator = filtered_integer_iterator<Integer, Filter>;
filtered_range(Integer begin, Integer end, const Filter &filter) : last(end, end, &filter)
{
include/util/integer_range.hpp
+7 -11
View File
@@ -22,17 +22,13 @@ class integer_iterator : public boost::iterator_facade<integer_iterator<Integer>
boost::random_access_traversal_tag,
Integer>
{
typedef boost::iterator_facade<integer_iterator<Integer>,
Integer,
boost::random_access_traversal_tag,
Integer>
base_t;
using base_t = boost::iterator_facade<integer_iterator<Integer>, Integer, boost::random_access_traversal_tag, Integer>;
public:
typedef typename base_t::value_type value_type;
typedef typename base_t::difference_type difference_type;
typedef typename base_t::reference reference;
typedef std::random_access_iterator_tag iterator_category;
using value_type = typename base_t::value_type;
using difference_type = typename base_t::difference_type;
using reference = typename base_t::reference;
using iterator_category = std::random_access_iterator_tag;
integer_iterator() : m_value() {}
explicit integer_iterator(value_type x) : m_value(x) {}
@@ -65,8 +61,8 @@ class integer_iterator : public boost::iterator_facade<integer_iterator<Integer>
template <typename Integer> class range
{
public:
typedef integer_iterator<Integer> const_iterator;
typedef integer_iterator<Integer> iterator;
using const_iterator = integer_iterator<Integer>;
using iterator = integer_iterator<Integer>;
range(Integer begin, Integer end) : iter(begin), last(end) {}
include/util/log.hpp
+1 -1
View File
@@ -73,7 +73,7 @@ class Log
return *this;
}
typedef std::ostream &(manip)(std::ostream &);
using manip = std::ostream &(std::ostream &);
inline Log &operator<<(manip &m)
{
include/util/packed_vector.hpp
+5 -9
View File
@@ -336,17 +336,13 @@ template <typename T, std::size_t Bits, storage::Ownership Ownership> class Pack
boost::random_access_traversal_tag,
ReferenceT>
{
typedef boost::iterator_facade<iterator_impl<DataT, ContainerT, ReferenceT>,
DataT,
boost::random_access_traversal_tag,
ReferenceT>
base_t;
using base_t = boost::iterator_facade<iterator_impl<DataT, ContainerT, ReferenceT>, DataT, boost::random_access_traversal_tag, ReferenceT>;
public:
typedef typename base_t::value_type value_type;
typedef typename base_t::difference_type difference_type;
typedef typename base_t::reference reference;
typedef std::random_access_iterator_tag iterator_category;
using value_type = typename base_t::value_type;
using difference_type = typename base_t::difference_type;
using reference = typename base_t::reference;
using iterator_category = std::random_access_iterator_tag;
explicit iterator_impl()
: container(nullptr), index(std::numeric_limits<std::size_t>::max())
include/util/static_assert.hpp
+2 -2
View File
@@ -10,13 +10,13 @@ namespace util
template <typename It, typename Value> inline void static_assert_iter_value()
{
using IterValueType = typename std::iterator_traits<It>::value_type;
using IterValueType = typename std::iterator_traits;<It>::value_type;
static_assert(std::is_same<IterValueType, Value>::value, "");
}
template <typename It, typename Category> inline void static_assert_iter_category()
{
using IterCategoryType = typename std::iterator_traits<It>::iterator_category;
using IterCategoryType = typename std::iterator_traits;<It>::iterator_category;
static_assert(std::is_base_of<Category, IterCategoryType>::value, "");
}
include/util/vector_view.hpp
+5 -9
View File
@@ -30,17 +30,13 @@ class VectorViewIterator : public boost::iterator_facade<VectorViewIterator<Data
boost::random_access_traversal_tag,
DataT &>
{
typedef boost::iterator_facade<VectorViewIterator<DataT>,
DataT,
boost::random_access_traversal_tag,
DataT &>
base_t;
using base_t = boost::iterator_facade<VectorViewIterator<DataT>, DataT, boost::random_access_traversal_tag, DataT &>;
public:
typedef typename base_t::value_type value_type;
typedef typename base_t::difference_type difference_type;
typedef typename base_t::reference reference;
typedef std::random_access_iterator_tag iterator_category;
using value_type = typename base_t::value_type;
using difference_type = typename base_t::difference_type;
using reference = typename base_t::reference;
using iterator_category = std::random_access_iterator_tag;
explicit VectorViewIterator() : m_value(nullptr) {}
explicit VectorViewIterator(DataT *x) : m_value(x) {}