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

Use nested namespace

Browse Source 
It's a mechanical change to modernize the code base
This commit is contained in:
Dennis Luxen
2022-12-11 10:10:26 +01:00
parent 152a52bc1a
commit a4aa153ba4
456 changed files with 469 additions and 2474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/util/bearing.hpp
+1 -4
View File
@@ -6,9 +6,7 @@
#include <cmath>
#include <string>
namespace osrm
{
namespace util
namespace osrm::util
{
namespace bearing
{
@@ -144,7 +142,6 @@ inline double restrictAngleToValidRange(const double angle)
return angle;
}
} // namespace util
} // namespace osrm
#endif // BEARING_HPP
include/util/bit_range.hpp
+1 -4
View File
@@ -6,9 +6,7 @@
#include <boost/iterator/iterator_facade.hpp>
#include <boost/range/iterator_range.hpp>
namespace osrm
{
namespace util
namespace osrm::util
{
namespace detail
@@ -92,7 +90,6 @@ template <typename T> auto makeBitRange(const T value)
{
return boost::make_iterator_range(BitIterator<T>{value}, BitIterator<T>{});
}
} // namespace util
} // namespace osrm
#endif
include/util/concurrent_id_map.hpp
+1 -4
View File
@@ -7,9 +7,7 @@
#include <unordered_map>
namespace osrm
{
namespace util
namespace osrm::util
{
/**
@@ -74,7 +72,6 @@ struct ConcurrentIDMap
}
};
} // namespace util
} // namespace osrm
#endif // CONCURRENT_ID_MAP_HPP
include/util/conditional_restrictions.hpp
+1 -4
View File
@@ -4,9 +4,7 @@
#include <string>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
// Helper functions for OSM conditional restrictions
@@ -21,7 +19,6 @@ struct ConditionalRestriction
std::vector<ConditionalRestriction> ParseConditionalRestrictions(const std::string &str);
} // namespace util
} // namespace osrm
#endif // OSRM_CONDITIONAL_RESTRICTIONS_HPP
include/util/connectivity_checksum.hpp
+1 -4
View File
@@ -9,9 +9,7 @@
#include <climits>
#include <cstdint>
namespace osrm
{
namespace util
namespace osrm::util
{
struct ConnectivityChecksum
@@ -84,7 +82,6 @@ struct ConnectivityChecksum
std::size_t byte_number;
unsigned char bit_number;
};
} // namespace util
} // namespace osrm
#endif
include/util/coordinate_calculation.hpp
+1 -7
View File
@@ -12,11 +12,7 @@
#include <utility>
#include <vector>
namespace osrm
{
namespace util
{
namespace coordinate_calculation
namespace osrm::util::coordinate_calculation
{
namespace detail
@@ -377,8 +373,6 @@ bool areParallel(const iterator_type lhs_begin,
double computeArea(const std::vector<Coordinate> &polygon);
} // namespace coordinate_calculation
} // namespace util
} // namespace osrm
#endif // COORDINATE_CALCULATION
include/util/deallocating_vector.hpp
+1 -4
View File
@@ -11,9 +11,7 @@
#include <utility>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
template <typename ElementT> struct ConstDeallocatingVectorIteratorState
{
@@ -348,7 +346,6 @@ template <typename T> void swap(DeallocatingVector<T> &lhs, DeallocatingVector<T
{
lhs.swap(rhs);
}
} // namespace util
} // namespace osrm
#endif /* DEALLOCATING_VECTOR_HPP */
include/util/debug.hpp
+1 -4
View File
@@ -29,9 +29,7 @@ inline std::ostream &operator<<(std::ostream &out, const Coordinate &coordinate)
}
} // namespace util
namespace engine
{
namespace guidance
namespace engine::guidance
{
inline std::ostream &operator<<(std::ostream &out, const RouteStep &step)
{
@@ -62,7 +60,6 @@ inline std::ostream &operator<<(std::ostream &out, const RouteStep &step)
return out;
}
} // namespace guidance
} // namespace engine
namespace guidance
include/util/dist_table_wrapper.hpp
+1 -4
View File
@@ -9,9 +9,7 @@
#include <utility>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
// This Wrapper provides an easier access to a distance table that is given as an linear vector
@@ -77,7 +75,6 @@ template <typename T> class DistTableWrapper
std::vector<T> table_;
const std::size_t number_of_nodes_;
};
} // namespace util
} // namespace osrm
#endif // DIST_TABLE_WRAPPER_H
include/util/dynamic_graph.hpp
+1 -4
View File
@@ -18,9 +18,7 @@
#include <tuple>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
namespace detail
{
@@ -468,7 +466,6 @@ template <typename EdgeDataT> class DynamicGraph
std::vector<Node> node_array;
DeallocatingVector<Edge> edge_list;
};
} // namespace util
} // namespace osrm
#endif // DYNAMICGRAPH_HPP
include/util/exception.hpp
+1 -4
View File
@@ -37,9 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "osrm/error_codes.hpp"
#include <boost/format.hpp>
namespace osrm
{
namespace util
namespace osrm::util
{
class exception : public std::exception
@@ -124,7 +122,6 @@ class RuntimeError : public exception
return result;
}
};
} // namespace util
} // namespace osrm
#endif /* OSRM_EXCEPTION_HPP */
include/util/exclude_flag.hpp
+1 -4
View File
@@ -4,9 +4,7 @@
#include "extractor/node_data_container.hpp"
#include "extractor/profile_properties.hpp"
namespace osrm
{
namespace util
namespace osrm::util
{
inline std::vector<std::vector<bool>>
@@ -29,7 +27,6 @@ excludeFlagsToNodeFilter(const NodeID number_of_nodes,
}
return filters;
}
} // namespace util
} // namespace osrm
#endif
include/util/filtered_graph.hpp
+1 -4
View File
@@ -8,9 +8,7 @@
#include "util/static_graph.hpp"
#include "util/vector_view.hpp"
namespace osrm
{
namespace util
namespace osrm::util
{
namespace detail
{
@@ -159,7 +157,6 @@ template <typename GraphT>
using FilteredGraphContainer = detail::FilteredGraphImpl<GraphT, storage::Ownership::Container>;
template <typename GraphT>
using FilteredGraphView = detail::FilteredGraphImpl<GraphT, storage::Ownership::View>;
} // namespace util
} // namespace osrm
#endif
include/util/filtered_integer_range.hpp
+1 -4
View File
@@ -8,9 +8,7 @@
#include <cstdint>
namespace osrm
{
namespace util
namespace osrm::util
{
// This implements a single-pass integer range.
@@ -94,7 +92,6 @@ filtered_range<Integer, Filter> filtered_irange(
{
return filtered_range<Integer, Filter>(first, last, filter);
}
} // namespace util
} // namespace osrm
#endif // INTEGER_RANGE_HPP
include/util/fingerprint.hpp
+1 -4
View File
@@ -6,9 +6,7 @@
#include <cstdint>
#include <type_traits>
namespace osrm
{
namespace util
namespace osrm::util
{
// implements a singleton, i.e. there is one and only one conviguration object
@@ -36,7 +34,6 @@ struct FingerPrint
static_assert(sizeof(FingerPrint) == 8, "FingerPrint has unexpected size");
static_assert(std::is_trivial<FingerPrint>::value, "FingerPrint needs to be trivial.");
static_assert(std::is_pod<FingerPrint>::value, "FingerPrint needs to be a POD.");
} // namespace util
} // namespace osrm
#endif /* FingerPrint_H */
include/util/for_each_indexed.hpp
+1 -4
View File
@@ -5,9 +5,7 @@
#include <numeric>
#include <utility>
namespace osrm
{
namespace util
namespace osrm::util
{
template <typename ForwardIterator, typename Function>
@@ -25,7 +23,6 @@ void for_each_indexed(ContainerT &container, Function function)
for_each_indexed(std::begin(container), std::end(container), function);
}
} // namespace util
} // namespace osrm
#endif /* FOR_EACH_INDEXED_HPP */
include/util/for_each_pair.hpp
+1 -4
View File
@@ -5,9 +5,7 @@
#include <numeric>
#include <utility>
namespace osrm
{
namespace util
namespace osrm::util
{
// TODO: check why this is not an option here:
@@ -39,7 +37,6 @@ void for_each_pair(ContainerT &container, Function &&function)
for_each_pair(begin(container), end(container), std::forward<Function>(function));
}
} // namespace util
} // namespace osrm
#endif /* FOR_EACH_PAIR_HPP */
include/util/for_each_range.hpp
+1 -4
View File
@@ -1,9 +1,7 @@
#ifndef OSRM_UTIL_FOR_EACH_RANGE_HPP
#define OSRM_UTIL_FOR_EACH_RANGE_HPP
namespace osrm
{
namespace util
namespace osrm::util
{
template <typename Iter, typename Func> void for_each_range(Iter begin, Iter end, Func f)
@@ -20,7 +18,6 @@ template <typename Iter, typename Func> void for_each_range(Iter begin, Iter end
f(begin_range, iter);
}
}
} // namespace util
} // namespace osrm
#endif
include/util/geojson_debug_logger.hpp
+1 -4
View File
@@ -11,9 +11,7 @@
#include "util/json_renderer.hpp"
#include "util/log.hpp"
namespace osrm
{
namespace util
namespace osrm::util
{
// in case we want to do scenario-based logging, we can specify a dedicated logging scenario to be
@@ -183,7 +181,6 @@ std::ofstream GeojsonLogger<geojson_conversion_policy, scenario>::ofs;
template <class geojson_conversion_policy, LoggingScenario scenario>
geojson_conversion_policy *GeojsonLogger<geojson_conversion_policy, scenario>::policy;
} // namespace util
} // namespace osrm
#endif /* OSRM_GEOJSON_DEBUG_LOGGER_HPP */
include/util/geojson_debug_policies.hpp
+1 -4
View File
@@ -11,9 +11,7 @@
#include <boost/optional.hpp>
namespace osrm
{
namespace util
namespace osrm::util
{
struct NodeIdVectorToLineString
@@ -52,7 +50,6 @@ struct CoordinateVectorToMultiPoint
const boost::optional<json::Object> &properties = {}) const;
};
} /* namespace util */
} /* namespace osrm */
#endif /* OSRM_GEOJSON_DEBUG_POLICIES */
include/util/geojson_debug_policy_toolkit.hpp
+1 -4
View File
@@ -10,9 +10,7 @@
#include <boost/optional.hpp>
namespace osrm
{
namespace util
namespace osrm::util
{
enum GeojsonStyleSize
@@ -109,7 +107,6 @@ inline util::json::Array makeJsonArray(const std::vector<util::Coordinate> &inpu
CoordinateToJsonArray());
return coordinates;
}
} // namespace util
} // namespace osrm
#endif /* OSRM_GEOJSON_DEBUG_POLICY_TOOLKIT_HPP */
include/util/geojson_validation.hpp
+1 -4
View File
@@ -6,9 +6,7 @@
#include "rapidjson/document.h"
namespace osrm
{
namespace util
namespace osrm::util
{
inline void validateCoordinate(const rapidjson::Value &coordinate)
@@ -85,6 +83,5 @@ inline void validateFeature(const rapidjson::Value &feature)
}
}
}
} // namespace util
} // namespace osrm
#endif // OSRM_GEOJSON_VALIDATION_HPP
include/util/graph_traits.hpp
+1 -8
View File
@@ -3,12 +3,7 @@
#include <type_traits>
namespace osrm
{
namespace util
{
namespace traits
namespace osrm::util::traits
{
// Introspection for an arbitrary .data member attribute
@@ -49,8 +44,6 @@ struct HasFirstEdgeMember<T, decltype((void)(sizeof(std::declval<T>().first_edge
{
};
} // namespace traits
} // namespace util
} // namespace osrm
#endif // STATIC_GRAPH_TRAITS_HPP
include/util/graph_utils.hpp
+1 -4
View File
@@ -6,9 +6,7 @@
#include <boost/assert.hpp>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
/// This function checks if the graph (consisting of directed edges) is undirected
@@ -96,7 +94,6 @@ std::vector<OutputEdgeT> directedEdgesFromCompressed(const std::vector<InputEdge
return output_edge_list;
}
} // namespace util
} // namespace osrm
#endif
include/util/group_by.hpp
+1 -4
View File
@@ -4,9 +4,7 @@
#include <algorithm>
#include <utility>
namespace osrm
{
namespace util
namespace osrm::util
{
// Runs fn on consecutive items in sub-ranges determined by pred.
@@ -34,7 +32,6 @@ Fn group_by(Iter first, Iter last, Pred pred, Fn fn)
return fn;
}
} // namespace util
} // namespace osrm
#endif
include/util/guidance/bearing_class.hpp
+2 -14
View File
@@ -10,15 +10,9 @@
#include "util/typedefs.hpp"
namespace osrm
{
namespace util
{
namespace guidance
namespace osrm::util::guidance
{
class BearingClass;
} // namespace guidance
} // namespace util
} // namespace osrm
namespace std
@@ -29,11 +23,7 @@ template <> struct hash<::osrm::util::guidance::BearingClass>
};
} // namespace std
namespace osrm
{
namespace util
{
namespace guidance
namespace osrm::util::guidance
{
class BearingClass
@@ -64,8 +54,6 @@ class BearingClass
friend std::size_t std::hash<BearingClass>::operator()(const BearingClass &) const;
};
} // namespace guidance
} // namespace util
} // namespace osrm
// make Bearing Class hasbable
include/util/guidance/entry_class.hpp
+2 -11
View File
@@ -8,15 +8,9 @@
#include <bitset>
namespace osrm
{
namespace util
{
namespace guidance
namespace osrm::util::guidance
{
class EntryClass;
} // namespace guidance
} // namespace util
} // namespace osrm
namespace std
@@ -29,9 +23,7 @@ template <> struct hash<::osrm::util::guidance::EntryClass>
namespace osrm
{
namespace util
{
namespace guidance
namespace util::guidance
{
class EntryClass
@@ -71,7 +63,6 @@ static_assert(std::is_trivially_copyable<EntryClass>::value,
"requires trivially copyable type");
#endif
} // namespace guidance
} // namespace util
constexpr const util::guidance::EntryClass EMPTY_ENTRY_CLASS{};
include/util/guidance/name_announcements.hpp
+1 -7
View File
@@ -18,11 +18,7 @@
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp>
namespace osrm
{
namespace util
{
namespace guidance
namespace osrm::util::guidance
{
// Name Change Logic
// Used both during Extraction as well as during Post-Processing
@@ -240,8 +236,6 @@ inline bool requiresNameAnnounced(const NameID from_name_id,
suffix_table);
}
} // namespace guidance
} // namespace util
} // namespace osrm
#endif /* OSRM_UTIL_GUIDANCE_NAME_ANNOUNCEMENT_HPP_ */
include/util/guidance/turn_lanes.hpp
+2 -14
View File
@@ -12,16 +12,10 @@
#include <boost/functional/hash.hpp>
namespace osrm
{
namespace util
{
namespace guidance
namespace osrm::util::guidance
{
class LaneTuple;
class LaneTupleIdPair;
} // namespace guidance
} // namespace util
} // namespace osrm
namespace std
@@ -37,11 +31,7 @@ template <> struct hash<::osrm::util::guidance::LaneTupleIdPair>
};
} // namespace std
namespace osrm
{
namespace util
{
namespace guidance
namespace osrm::util::guidance
{
// The mapping of turn lanes can be done two values. We describe every turn by the number of
@@ -100,8 +90,6 @@ class LaneTupleIdPair
using LaneDataIdMap = ConcurrentIDMap<LaneTupleIdPair, LaneDataID, boost::hash<LaneTupleIdPair>>;
} // namespace guidance
} // namespace util
} // namespace osrm
#endif /* OSRM_UTIL_GUIDANCE_TURN_LANES_HPP */
include/util/hilbert_value.hpp
+1 -4
View File
@@ -6,9 +6,7 @@
#include <climits>
#include <cstdint>
namespace osrm
{
namespace util
namespace osrm::util
{
// Transform x and y to Hilbert SFC linear coordinate
@@ -69,7 +67,6 @@ inline std::uint64_t GetHilbertCode(const Coordinate &coordinate)
static_cast<std::int32_t>(90 * COORDINATE_PRECISION);
return HilbertToLinear(x, y);
}
} // namespace util
} // namespace osrm
#endif /* HILBERT_VALUE_HPP */
include/util/indexed_data.hpp
+1 -4
View File
@@ -16,9 +16,7 @@
#include <string_view>
#include <type_traits>
namespace osrm
{
namespace util
namespace osrm::util
{
namespace detail
{
@@ -389,6 +387,5 @@ template <typename GroupBlockPolicy>
using IndexedData = detail::IndexedDataImpl<GroupBlockPolicy, storage::Ownership::Container>;
template <typename GroupBlockPolicy>
using IndexedDataView = detail::IndexedDataImpl<GroupBlockPolicy, storage::Ownership::View>;
} // namespace util
} // namespace osrm
#endif // OSRM_INDEXED_DATA_HPP
include/util/integer_range.hpp
+1 -4
View File
@@ -8,9 +8,7 @@
#include <cstdint>
namespace osrm
{
namespace util
namespace osrm::util
{
// Ported from Boost.Range 1.56 due to required fix
@@ -89,7 +87,6 @@ irange(const Integer first,
{
return range<Integer>(first, last);
}
} // namespace util
} // namespace osrm
#endif // INTEGER_RANGE_HPP
include/util/isatty.hpp
+1 -4
View File
@@ -16,9 +16,7 @@
#include <cstdio>
namespace osrm
{
namespace util
namespace osrm::util
{
// Returns true if stdout is a tty, false otherwise
@@ -26,7 +24,6 @@ namespace util
// output is redirected to a logfile
inline bool IsStdoutATTY() { return isatty(fileno(stdout)); }
} // namespace util
} // namespace osrm
#endif
include/util/json_container.hpp
+1 -26
View File
@@ -38,30 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <utility>
#include <vector>
namespace osrm
{
namespace util
{
/**
* JSON types representing OSRM responses.
*
* The json::Value type represents the basic sum-type, implemented as a variant.
*
* There are two ways for destructuring such types:
* - Either provide a visitor and use the apply_visitor function or
* - use the get function and explicitely specify the type
*
* See the following documentations on variants:
* - https://github.com/mapbox/variant
* - http://www.boost.org/doc/libs/1_55_0/doc/html/variant.html
*
* And take a look at the example we provide.
*
* \see OSRM
*/
namespace json
namespace osrm::util::json
{
// fwd. decls.
@@ -147,8 +124,6 @@ struct Array
std::vector<Value> values;
};
} // namespace json
} // namespace util
} // namespace osrm
#endif // JSON_CONTAINER_HPP
include/util/json_deep_compare.hpp
+1 -7
View File
@@ -10,11 +10,7 @@
#include <functional>
#include <set>
namespace osrm
{
namespace util
{
namespace json
namespace osrm::util::json
{
struct Comparator
@@ -158,8 +154,6 @@ inline bool compare(const Value &reference, const Value &result, std::string &re
return mapbox::util::apply_visitor(
Comparator(reason, "reference", "result"), reference, result);
}
} // namespace json
} // namespace util
} // namespace osrm
#endif
include/util/json_renderer.hpp
+1 -7
View File
@@ -16,11 +16,7 @@
#include <fmt/compile.h>
namespace osrm
{
namespace util
{
namespace json
namespace osrm::util::json
{
template <typename Out> struct Renderer
@@ -165,8 +161,6 @@ inline void render(std::vector<char> &out, const Object &object)
renderer(object);
}
} // namespace json
} // namespace util
} // namespace osrm
#endif // JSON_RENDERER_HPP
include/util/json_util.hpp
+1 -7
View File
@@ -6,11 +6,7 @@
#include <cmath>
#include <limits>
namespace osrm
{
namespace util
{
namespace json
namespace osrm::util::json
{
// Make sure we don't have inf and NaN values
template <typename T> T clamp_float(T d)
@@ -26,8 +22,6 @@ template <typename T> T clamp_float(T d)
return d;
}
} // namespace json
} // namespace util
} // namespace osrm
#endif // JSON_UTIL_HPP
include/util/log.hpp
+1 -4
View File
@@ -14,9 +14,7 @@ enum LogLevel
logDEBUG
};
namespace osrm
{
namespace util
namespace osrm::util
{
class LogPolicy
@@ -104,7 +102,6 @@ class UnbufferedLog : public Log
public:
UnbufferedLog(LogLevel level_ = logINFO);
};
} // namespace util
} // namespace osrm
#endif /* LOG_HPP */
include/util/lua_util.hpp
+1 -4
View File
@@ -13,9 +13,7 @@ extern "C"
#include <iostream>
#include <string>
namespace osrm
{
namespace util
namespace osrm::util
{
// Add the folder contain the script to the lua load path, so script can easily require() other lua
@@ -28,7 +26,6 @@ inline void luaAddScriptFolderToLoadPath(lua_State *lua_state, const char *file_
const std::string lua_code = "package.path = \"" + folder + "/?.lua;\" .. package.path";
luaL_dostring(lua_state, lua_code.c_str());
}
} // namespace util
} // namespace osrm
#endif // LUA_UTIL_HPP
include/util/matrix_graph_wrapper.hpp
+1 -4
View File
@@ -7,9 +7,7 @@
#include "util/typedefs.hpp"
namespace osrm
{
namespace util
namespace osrm::util
{
// This Wrapper provides all methods that are needed for extractor::TarjanSCC, when the graph is
@@ -46,7 +44,6 @@ template <typename T> class MatrixGraphWrapper
const std::vector<T> table_;
const std::size_t number_of_nodes_;
};
} // namespace util
} // namespace osrm
#endif // MATRIX_GRAPH_WRAPPER_H
include/util/meminfo.hpp
+1 -4
View File
@@ -7,9 +7,7 @@
#include <sys/resource.h>
#endif
namespace osrm
{
namespace util
namespace osrm::util
{
inline void DumpMemoryStats()
@@ -28,7 +26,6 @@ inline void DumpMemoryStats()
util::Log() << "RAM: peak bytes used: <not implemented on Windows>";
#endif // _WIN32
}
} // namespace util
} // namespace osrm
#endif
include/util/mmap_file.hpp
+1 -4
View File
@@ -8,9 +8,7 @@
#include <boost/filesystem/path.hpp>
#include <boost/iostreams/device/mapped_file.hpp>
namespace osrm
{
namespace util
namespace osrm::util
{
namespace detail
@@ -83,7 +81,6 @@ util::vector_view<T> mmapFile(const boost::filesystem::path &file,
{
return detail::mmapFile<T>(file, mmap_container, size);
}
} // namespace util
} // namespace osrm
#endif
include/util/mmap_tar.hpp
+1 -4
View File
@@ -10,9 +10,7 @@
#include <tuple>
#include <unordered_map>
namespace osrm
{
namespace util
namespace osrm::util
{
using DataRange = std::pair<const char *, const char *>;
using DataMap = std::unordered_map<std::string, DataRange>;
@@ -38,7 +36,6 @@ inline DataMap mmapTarFile(const boost::filesystem::path &path,
return map;
}
} // namespace util
} // namespace osrm
#endif
include/util/msb.hpp
+1 -4
View File
@@ -7,9 +7,7 @@
#include <cstdint>
#include <utility>
namespace osrm
{
namespace util
namespace osrm::util
{
// get the msb of an integer
@@ -47,7 +45,6 @@ inline std::size_t msb(unsigned int v)
return MSB_INDEX - __builtin_clz(v);
}
#endif
} // namespace util
} // namespace osrm
#endif
include/util/node_based_graph.hpp
+1 -4
View File
@@ -13,9 +13,7 @@
#include <memory>
#include <utility>
namespace osrm
{
namespace util
namespace osrm::util
{
struct NodeBasedEdgeData
@@ -97,7 +95,6 @@ NodeBasedDynamicGraphFromEdges(NodeID number_of_nodes,
return NodeBasedDynamicGraph(number_of_nodes, edges_list);
}
} // namespace util
} // namespace osrm
#endif // NODE_BASED_GRAPH_HPP
include/util/opening_hours.hpp
+1 -4
View File
@@ -6,9 +6,7 @@
#include <string>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
// Helper classes for "opening hours" format http://wiki.openstreetmap.org/wiki/Key:opening_hours
@@ -223,7 +221,6 @@ std::vector<OpeningHours> ParseOpeningHours(const std::string &str);
bool CheckOpeningHours(const std::vector<OpeningHours> &input, const struct tm &time);
} // namespace util
} // namespace osrm
#endif // OSRM_OPENING_HOURS_HPP
include/util/packed_vector.hpp
+1 -4
View File
@@ -20,9 +20,7 @@
#include <windows.h>
#endif
namespace osrm
{
namespace util
namespace osrm::util
{
namespace detail
{
@@ -601,7 +599,6 @@ template <typename T, std::size_t Bits>
using PackedVector = detail::PackedVector<T, Bits, storage::Ownership::Container>;
template <typename T, std::size_t Bits>
using PackedVectorView = detail::PackedVector<T, Bits, storage::Ownership::View>;
} // namespace util
} // namespace osrm
#endif /* PACKED_VECTOR_HPP */
include/util/percent.hpp
+1 -4
View File
@@ -7,9 +7,7 @@
#include "util/isatty.hpp"
#include "util/log.hpp"
namespace osrm
{
namespace util
namespace osrm::util
{
class Percent
@@ -87,7 +85,6 @@ class Percent
}
}
};
} // namespace util
} // namespace osrm
#endif // PERCENT_HPP
include/util/permutation.hpp
+1 -4
View File
@@ -5,9 +5,7 @@
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
namespace permutation_detail
@@ -67,7 +65,6 @@ std::vector<IndexT> orderingToPermutation(const std::vector<IndexT> &ordering)
return permutation;
}
} // namespace util
} // namespace osrm
#endif
include/util/query_heap.hpp
+1 -4
View File
@@ -11,9 +11,7 @@
#include <unordered_map>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
template <typename NodeID, typename Key> class GenerationArrayStorage
@@ -372,7 +370,6 @@ class QueryHeap
HeapContainer heap;
IndexStorage node_index;
};
} // namespace util
} // namespace osrm
#endif // OSRM_UTIL_QUERY_HEAP_HPP
include/util/range_table.hpp
+1 -4
View File
@@ -10,9 +10,7 @@
#include <fstream>
#include <utility>
namespace osrm
{
namespace util
namespace osrm::util
{
/*
* These pre-declarations are needed because parsing C++ is hard
@@ -215,7 +213,6 @@ unsigned RangeTable<BLOCK_SIZE, Ownership>::PrefixSumAtIndex(int index, const Bl
return sum;
}
} // namespace util
} // namespace osrm
#endif // RANGE_TABLE_HPP
include/util/rectangle.hpp
+1 -4
View File
@@ -11,9 +11,7 @@
#include <cstdint>
namespace osrm
{
namespace util
namespace osrm::util
{
struct RectangleInt2D
@@ -171,7 +169,6 @@ struct RectangleInt2D
max_lat != FixedLatitude{std::numeric_limits<std::int32_t>::min()};
}
};
} // namespace util
} // namespace osrm
#endif
include/util/serialization.hpp
+1 -7
View File
@@ -11,11 +11,7 @@
#include "storage/io.hpp"
#include "storage/serialization.hpp"
namespace osrm
{
namespace util
{
namespace serialization
namespace osrm::util::serialization
{
template <unsigned BlockSize, storage::Ownership Ownership>
@@ -143,8 +139,6 @@ void write(storage::tar::FileWriter &writer,
storage::serialization::write(
writer, name + "/search_tree_level_starts", rtree.m_tree_level_starts);
}
} // namespace serialization
} // namespace util
} // namespace osrm
#endif
include/util/static_assert.hpp
+3 -6
View File
@@ -3,24 +3,21 @@
#include <type_traits>
namespace osrm
{
namespace util
namespace osrm::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, "");
}
} // namespace util
} // namespace osrm
#endif // OSRM_STATIC_ASSERT_HPP
include/util/static_graph.hpp
+1 -4
View File
@@ -19,9 +19,7 @@
#include <utility>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
template <typename EdgeDataT, storage::Ownership Ownership> class StaticGraph;
@@ -320,7 +318,6 @@ class StaticGraph
Vector<EdgeArrayEntry> edge_array;
};
} // namespace util
} // namespace osrm
#endif // STATIC_GRAPH_HPP
include/util/static_rtree.hpp
+1 -4
View File
@@ -36,9 +36,7 @@
#include <string>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
template <class EdgeDataT,
storage::Ownership Ownership = storage::Ownership::Container,
@@ -774,7 +772,6 @@ class StaticRTree
//[2] "Nearest Neighbor Queries", N. Roussopulos et al; 1995; DOI: 10.1145/223784.223794
//[3] "Distance Browsing in Spatial Databases"; G. Hjaltason, H. Samet; 1999; ACM Trans. DB Sys
// Vol.24 No.2, pp.265-318
} // namespace util
} // namespace osrm
#endif // STATIC_RTREE_HPP
include/util/string_util.hpp
+1 -4
View File
@@ -7,9 +7,7 @@
#include <string>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
// precision: position after decimal point
@@ -143,7 +141,6 @@ inline std::size_t URIDecode(const std::string &input, std::string &output)
}
inline std::size_t URIDecodeInPlace(std::string &URI) { return URIDecode(URI, URI); }
} // namespace util
} // namespace osrm
#endif // STRING_UTIL_HPP
include/util/timed_histogram.hpp
+1 -4
View File
@@ -9,9 +9,7 @@
#include <sstream>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
namespace detail
{
@@ -88,7 +86,6 @@ template <std::size_t TimeBinSize = 1000, std::size_t IndexBinSize = 1000> class
std::vector<std::uint32_t> frame_offsets;
std::vector<std::uint32_t> frame_counters;
};
} // namespace util
} // namespace osrm
#endif
include/util/timezones.hpp
+1 -4
View File
@@ -12,9 +12,7 @@
#include <chrono>
namespace osrm
{
namespace updater
namespace osrm::updater
{
// Time zone shape polygons loaded in R-tree
@@ -44,7 +42,6 @@ class Timezoner
rtree_t rtree;
std::vector<local_time_t> local_times;
};
} // namespace updater
} // namespace osrm
#endif
include/util/timing_util.hpp
+1 -4
View File
@@ -4,9 +4,7 @@
#include <chrono>
#include <cstdint>
namespace osrm
{
namespace util
namespace osrm::util
{
#define TIMER_START(_X) auto _X##_start = std::chrono::steady_clock::now(), _X##_stop = _X##_start
@@ -23,7 +21,6 @@ namespace util
std::chrono::duration_cast<std::chrono::microseconds>(_X##_stop - _X##_start).count())
#define TIMER_MIN(_X) \
std::chrono::duration_cast<std::chrono::minutes>(_X##_stop - _X##_start).count()
} // namespace util
} // namespace osrm
#endif // TIMING_UTIL_HPP
include/util/to_osm_link.hpp
+1 -4
View File
@@ -6,9 +6,7 @@
#include <iomanip>
#include <string>
namespace osrm
{
namespace util
namespace osrm::util
{
inline std::string toOSMLink(const util::FloatCoordinate &c)
{
@@ -25,7 +23,6 @@ inline std::string toOSMLink(const util::Coordinate &c)
<< toFloating(c.lat) << "&mlon=" << toFloating(c.lon);
return link.str();
}
} // namespace util
} // namespace osrm
#endif
include/util/trigonometry_table.hpp
+1 -4
View File
@@ -8,9 +8,7 @@
#include <boost/math/constants/constants.hpp>
namespace osrm
{
namespace util
namespace osrm::util
{
constexpr unsigned short atan_table[4096] = {
@@ -431,7 +429,6 @@ inline double atan2_lookup(double y, double x)
}
return angle;
}
} // namespace util
} // namespace osrm
#endif // TRIGONOMETRY_TABLE_HPP
include/util/vector_tile.hpp
+1 -7
View File
@@ -3,16 +3,10 @@
#include <cstdint>
namespace osrm
{
namespace util
{
namespace vector_tile
namespace osrm::util::vector_tile
{
// Vector tiles are 4096 virtual pixels on each side
const constexpr double EXTENT = 4096.0;
const constexpr double BUFFER = 128.0;
} // namespace vector_tile
} // namespace util
} // namespace osrm
#endif
include/util/vector_view.hpp
+1 -4
View File
@@ -19,9 +19,7 @@
#include <utility>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
template <typename DataT>
@@ -267,7 +265,6 @@ struct is_view_or_vector
std::is_same<util::vector_view<ValueT>, VectorT>::value>
{
};
} // namespace util
} // namespace osrm
#endif // SHARED_MEMORY_VECTOR_WRAPPER_HPP
include/util/viewport.hpp
+1 -7
View File
@@ -11,11 +11,7 @@
// Port of https://github.com/mapbox/geo-viewport
namespace osrm
{
namespace util
{
namespace viewport
namespace osrm::util::viewport
{
namespace detail
@@ -44,8 +40,6 @@ inline unsigned getFittedZoom(util::Coordinate south_west, util::Coordinate nort
else
return detail::MIN_ZOOM;
}
} // namespace viewport
} // namespace util
} // namespace osrm
#endif
include/util/web_mercator.hpp
+1 -7
View File
@@ -5,11 +5,7 @@
#include <boost/math/constants/constants.hpp>
namespace osrm
{
namespace util
{
namespace web_mercator
namespace osrm::util::web_mercator
{
namespace detail
{
@@ -169,8 +165,6 @@ inline void xyzToMercator(
maxx = static_cast<double>(clamp(util::FloatLongitude{maxx})) * DEGREE_TO_PX;
maxy = latToY(util::FloatLatitude{maxy}) * DEGREE_TO_PX;
}
} // namespace web_mercator
} // namespace util
} // namespace osrm
#endif
include/util/xor_fast_hash.hpp
+1 -4
View File
@@ -12,9 +12,7 @@
#include <cstdint>
namespace osrm
{
namespace util
namespace osrm::util
{
/*
@@ -65,7 +63,6 @@ template <std::size_t MaxNumElements = (1u << 16u)> class XORFastHash
return table1[lsb] ^ table2[msb];
}
};
} // namespace util
} // namespace osrm
#endif // XOR_FAST_HASH_HPP
include/util/xor_fast_hash_storage.hpp
+1 -4
View File
@@ -6,9 +6,7 @@
#include <limits>
#include <vector>
namespace osrm
{
namespace util
namespace osrm::util
{
template <typename NodeID, typename Key, std::size_t MaxNumElements = (1u << 16u)>
@@ -78,7 +76,6 @@ class XORFastHashStorage
XORFastHash<MaxNumElements> fast_hasher;
unsigned current_timestamp;
};
} // namespace util
} // namespace osrm
#endif // XOR_FAST_HASH_STORAGE_HPP