diff --git a/include/util/ini_file.hpp b/include/util/ini_file.hpp index 1ccc302e8..64c793277 100644 --- a/include/util/ini_file.hpp +++ b/include/util/ini_file.hpp @@ -12,11 +12,8 @@ namespace osrm namespace util { -namespace -{ - // support old capitalized option names by down-casing them with a regex replace -std::string read_file_lower_content(const boost::filesystem::path &path) +inline std::string read_file_lower_content(const boost::filesystem::path &path) { boost::filesystem::fstream config_stream(path); std::string ini_file_content((std::istreambuf_iterator(config_stream)), @@ -27,6 +24,5 @@ std::string read_file_lower_content(const boost::filesystem::path &path) } } } -} #endif // INI_FILE_HPP diff --git a/include/util/std_hash.hpp b/include/util/std_hash.hpp index ff5ac187b..b456ab1ca 100644 --- a/include/util/std_hash.hpp +++ b/include/util/std_hash.hpp @@ -6,9 +6,6 @@ // this is largely inspired by boost's hash combine as can be found in // "The C++ Standard Library" 2nd Edition. Nicolai M. Josuttis. 2012. -namespace -{ - template void hash_combine(std::size_t &seed, const T &val) { seed ^= std::hash()(val) + 0x9e3779b9 + (seed << 6) + (seed >> 2); @@ -29,7 +26,6 @@ template std::size_t hash_val(const Types &... args) hash_val(seed, args...); return seed; } -} namespace std {