Skip to content

Commit 43a94ee

Browse files
committed
Remove redundant "inline" on constexpr inline functions
1 parent 430faea commit 43a94ee

16 files changed

Lines changed: 51 additions & 51 deletions

File tree

include/osmium/area/detail/vector.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,37 +73,37 @@ namespace osmium {
7373
}; // struct vec
7474

7575
// addition
76-
constexpr inline vec operator+(const vec& lhs, const vec& rhs) noexcept {
76+
constexpr vec operator+(const vec& lhs, const vec& rhs) noexcept {
7777
return vec{lhs.x + rhs.x, lhs.y + rhs.y};
7878
}
7979

8080
// subtraction
81-
constexpr inline vec operator-(const vec& lhs, const vec& rhs) noexcept {
81+
constexpr vec operator-(const vec& lhs, const vec& rhs) noexcept {
8282
return vec{lhs.x - rhs.x, lhs.y - rhs.y};
8383
}
8484

8585
// cross product
86-
constexpr inline int64_t operator*(const vec& lhs, const vec& rhs) noexcept {
86+
constexpr int64_t operator*(const vec& lhs, const vec& rhs) noexcept {
8787
return lhs.x * rhs.y - lhs.y * rhs.x;
8888
}
8989

9090
// scale vector
91-
constexpr inline vec operator*(double s, const vec& v) noexcept {
91+
constexpr vec operator*(double s, const vec& v) noexcept {
9292
return vec{static_cast<int64_t>(s * static_cast<double>(v.x)), static_cast<int64_t>(s * static_cast<double>(v.y))};
9393
}
9494

9595
// scale vector
96-
constexpr inline vec operator*(const vec& v, double s) noexcept {
96+
constexpr vec operator*(const vec& v, double s) noexcept {
9797
return vec{static_cast<int64_t>(s * static_cast<double>(v.x)), static_cast<int64_t>(s * static_cast<double>(v.y))};
9898
}
9999

100100
// equality
101-
constexpr inline bool operator==(const vec& lhs, const vec& rhs) noexcept {
101+
constexpr bool operator==(const vec& lhs, const vec& rhs) noexcept {
102102
return lhs.x == rhs.x && lhs.y == rhs.y;
103103
}
104104

105105
// inequality
106-
constexpr inline bool operator!=(const vec& lhs, const vec& rhs) noexcept {
106+
constexpr bool operator!=(const vec& lhs, const vec& rhs) noexcept {
107107
return !(lhs == rhs);
108108
}
109109

include/osmium/builder/attr.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ namespace osmium {
381381
};
382382

383383
template <typename TTagIterator>
384-
inline constexpr detail::tags_from_iterator_pair<TTagIterator> _tags(TTagIterator first, TTagIterator last) {
384+
constexpr detail::tags_from_iterator_pair<TTagIterator> _tags(TTagIterator first, TTagIterator last) {
385385
return {first, last};
386386
}
387387

@@ -409,7 +409,7 @@ namespace osmium {
409409
};
410410

411411
template <typename TIdIterator>
412-
inline constexpr detail::nodes_from_iterator_pair<TIdIterator> _nodes(TIdIterator first, TIdIterator last) {
412+
constexpr detail::nodes_from_iterator_pair<TIdIterator> _nodes(TIdIterator first, TIdIterator last) {
413413
return {first, last};
414414
}
415415

@@ -449,7 +449,7 @@ namespace osmium {
449449
};
450450

451451
template <typename TMemberIterator>
452-
inline constexpr detail::members_from_iterator_pair<TMemberIterator> _members(TMemberIterator first, TMemberIterator last) {
452+
constexpr detail::members_from_iterator_pair<TMemberIterator> _members(TMemberIterator first, TMemberIterator last) {
453453
return {first, last};
454454
}
455455

@@ -481,7 +481,7 @@ namespace osmium {
481481
};
482482

483483
template <typename TCommentIterator>
484-
inline constexpr detail::comments_from_iterator_pair<TCommentIterator> _comments(TCommentIterator first, TCommentIterator last) {
484+
constexpr detail::comments_from_iterator_pair<TCommentIterator> _comments(TCommentIterator first, TCommentIterator last) {
485485
return {first, last};
486486
}
487487

@@ -501,7 +501,7 @@ namespace osmium {
501501

502502

503503
template <typename TIdIterator>
504-
inline constexpr detail::outer_ring_from_iterator_pair<TIdIterator> _outer_ring(TIdIterator first, TIdIterator last) {
504+
constexpr detail::outer_ring_from_iterator_pair<TIdIterator> _outer_ring(TIdIterator first, TIdIterator last) {
505505
return {first, last};
506506
}
507507

@@ -527,7 +527,7 @@ namespace osmium {
527527
}
528528

529529
template <typename TIdIterator>
530-
inline constexpr detail::inner_ring_from_iterator_pair<TIdIterator> _inner_ring(TIdIterator first, TIdIterator last) {
530+
constexpr detail::inner_ring_from_iterator_pair<TIdIterator> _inner_ring(TIdIterator first, TIdIterator last) {
531531
return {first, last};
532532
}
533533

@@ -649,16 +649,16 @@ namespace osmium {
649649
// ==============================================================
650650

651651
template <typename... TArgs>
652-
inline constexpr const char* get_user(const attr::_user& user, const TArgs&... /*args*/) noexcept {
652+
constexpr const char* get_user(const attr::_user& user, const TArgs&... /*args*/) noexcept {
653653
return user.value;
654654
}
655655

656-
inline constexpr const char* get_user() noexcept {
656+
constexpr const char* get_user() noexcept {
657657
return "";
658658
}
659659

660660
template <typename TFirst, typename... TRest>
661-
inline constexpr typename std::enable_if<!std::is_same<attr::_user, TFirst>::value, const char*>::type
661+
constexpr typename std::enable_if<!std::is_same<attr::_user, TFirst>::value, const char*>::type
662662
get_user(const TFirst& /*first*/, const TRest&... args) noexcept {
663663
return get_user(args...);
664664
}

include/osmium/geom/mercator_projection.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace osmium {
4949
constexpr double earth_radius_for_epsg3857 = 6378137.0;
5050
constexpr double max_coordinate_epsg3857 = 20037508.34;
5151

52-
constexpr inline double lon_to_x(double lon) noexcept {
52+
constexpr double lon_to_x(double lon) noexcept {
5353
return earth_radius_for_epsg3857 * deg_to_rad(lon);
5454
}
5555

@@ -96,7 +96,7 @@ namespace osmium {
9696
}
9797
#endif
9898

99-
constexpr inline double x_to_lon(double x) {
99+
constexpr double x_to_lon(double x) {
100100
return rad_to_deg(x) / earth_radius_for_epsg3857;
101101
}
102102

include/osmium/geom/tile.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace osmium {
4747
namespace detail {
4848

4949
template <typename T>
50-
inline constexpr const T clamp(const T value, const T min, const T max) {
50+
constexpr const T clamp(const T value, const T min, const T max) {
5151
return value < min ? min : (max < value ? max : value);
5252
}
5353

@@ -57,15 +57,15 @@ namespace osmium {
5757
* Returns the number of tiles (in each direction) for the given zoom
5858
* level.
5959
*/
60-
inline constexpr uint32_t num_tiles_in_zoom(uint32_t zoom) noexcept {
60+
constexpr uint32_t num_tiles_in_zoom(uint32_t zoom) noexcept {
6161
return 1U << zoom;
6262
}
6363

6464
/**
6565
* Returns the width or height of a tile in web mercator coordinates for
6666
* the given zoom level.
6767
*/
68-
inline constexpr double tile_extent_in_zoom(uint32_t zoom) noexcept {
68+
constexpr double tile_extent_in_zoom(uint32_t zoom) noexcept {
6969
return detail::max_coordinate_epsg3857 * 2 / num_tiles_in_zoom(zoom);
7070
}
7171

@@ -74,7 +74,7 @@ namespace osmium {
7474
* projection in the given zoom level. Tiles are numbered from left
7575
* to right.
7676
*/
77-
inline constexpr uint32_t mercx_to_tilex(uint32_t zoom, double x) noexcept {
77+
constexpr uint32_t mercx_to_tilex(uint32_t zoom, double x) noexcept {
7878
return static_cast<uint32_t>(detail::clamp<int32_t>(
7979
static_cast<int32_t>((x + detail::max_coordinate_epsg3857) / tile_extent_in_zoom(zoom)),
8080
0, num_tiles_in_zoom(zoom) - 1));
@@ -85,7 +85,7 @@ namespace osmium {
8585
* projection in the given zoom level. Tiles are numbered from top
8686
* to bottom.
8787
*/
88-
inline constexpr uint32_t mercy_to_tiley(uint32_t zoom, double y) noexcept {
88+
constexpr uint32_t mercy_to_tiley(uint32_t zoom, double y) noexcept {
8989
return static_cast<uint32_t>(detail::clamp<int32_t>(
9090
static_cast<int32_t>((detail::max_coordinate_epsg3857 - y) / tile_extent_in_zoom(zoom)),
9191
0, num_tiles_in_zoom(zoom) - 1));

include/osmium/geom/util.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ namespace osmium {
6161
constexpr double PI = 3.14159265358979323846;
6262

6363
/// Convert angle from degrees to radians.
64-
inline constexpr double deg_to_rad(double degree) noexcept {
64+
constexpr double deg_to_rad(double degree) noexcept {
6565
return degree * (PI / 180.0);
6666
}
6767

6868
/// Convert angle from radians to degrees.
69-
inline constexpr double rad_to_deg(double radians) noexcept {
69+
constexpr double rad_to_deg(double radians) noexcept {
7070
return radians * (180.0 / PI);
7171
}
7272

include/osmium/index/index.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ namespace osmium {
7676
* object, but it can be specialized.
7777
*/
7878
template <typename T>
79-
inline constexpr T empty_value() {
79+
constexpr T empty_value() {
8080
return T{};
8181
}
8282

@@ -86,7 +86,7 @@ namespace osmium {
8686
* the full range, so the max value is a good "empty" value.
8787
*/
8888
template <>
89-
inline constexpr size_t empty_value<size_t>() {
89+
constexpr size_t empty_value<size_t>() {
9090
return std::numeric_limits<size_t>::max();
9191
}
9292

include/osmium/io/detail/lz4.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ namespace osmium {
5858

5959
namespace detail {
6060

61-
constexpr inline int lz4_default_compression_level() noexcept {
61+
constexpr int lz4_default_compression_level() noexcept {
6262
return 1; // LZ4_ACCELERATION_DEFAULT
6363
}
6464

include/osmium/io/detail/zlib.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ namespace osmium {
5555

5656
namespace detail {
5757

58-
constexpr inline int zlib_default_compression_level() noexcept {
58+
constexpr int zlib_default_compression_level() noexcept {
5959
return Z_DEFAULT_COMPRESSION;
6060
}
6161

include/osmium/memory/item.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ namespace osmium {
6161
align_bytes = 8UL
6262
};
6363

64-
inline constexpr std::size_t padded_length(std::size_t length) noexcept {
64+
constexpr std::size_t padded_length(std::size_t length) noexcept {
6565
return (length + align_bytes - 1) & ~(align_bytes - 1);
6666
}
6767

include/osmium/memory/item_iterator.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace osmium {
4949
namespace detail {
5050

5151
template <typename T>
52-
constexpr inline bool type_is_compatible(const osmium::item_type t) noexcept {
52+
constexpr bool type_is_compatible(const osmium::item_type t) noexcept {
5353
return T::is_compatible_to(t);
5454
}
5555

0 commit comments

Comments
 (0)