Transforms osrm_exception to exception

include/engine/datafacade/datafacade_base.hpp

@@ -8,7 +8,7 @@
 #include "engine/phantom_node.hpp"
 #include "extractor/turn_instructions.hpp"
 #include "util/integer_range.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/string_util.hpp"
 #include "util/typedefs.hpp"
 

include/extractor/raster_source.hpp

@@ -1,7 +1,7 @@
 #ifndef RASTER_SOURCE_HPP
 #define RASTER_SOURCE_HPP
 
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>

include/storage/shared_datatype.hpp

@@ -1,7 +1,7 @@
 #ifndef SHARED_DATA_TYPE_HPP
 #define SHARED_DATA_TYPE_HPP
 
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 
 #include <cstdint>

include/storage/shared_memory.hpp

@@ -1,7 +1,7 @@
 #ifndef SHARED_MEMORY_HPP
 #define SHARED_MEMORY_HPP
 
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>

include/util/exception.hpp

@@ -1,5 +1,5 @@
-#ifndef OSRM_EXCEPTION_HPP
-#define OSRM_EXCEPTION_HPP
+#ifndef EXCEPTION_HPP
+#define EXCEPTION_HPP
 
 #include <exception>
 #include <string>
@@ -27,4 +27,4 @@ class exception final : public std::exception
 }
 }
 
-#endif /* OSRM_EXCEPTION_HPP */
+#endif /* EXCEPTION_HPP */

include/util/fingerprint_impl.hpp.in

@@ -1,4 +1,4 @@
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 
 #include <boost/uuid/name_generator.hpp>
 #include <boost/uuid/uuid_generators.hpp>

include/util/graph_loader.hpp

@@ -2,7 +2,7 @@
 #define GRAPH_LOADER_HPP
 
 #include "util/fingerprint.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "extractor/external_memory_node.hpp"
 #include "extractor/node_based_edge.hpp"

include/util/routed_options.hpp

@@ -3,7 +3,7 @@
 
 #include "util/ini_file.hpp"
 #include "util/version.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 
 #include <boost/any.hpp>

include/util/static_rtree.hpp

@@ -8,7 +8,7 @@
 
 #include "util/bearing.hpp"
 #include "util/integer_range.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/typedefs.hpp"
 
 #include "osrm/coordinate.hpp"

src/contractor/contractor.cpp

@@ -10,7 +10,7 @@
 #include "util/io.hpp"
 #include "util/integer_range.hpp"
 #include "util/lua_util.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/string_util.hpp"
 #include "util/timing_util.hpp"

src/extractor/edge_based_graph_factory.cpp

@@ -6,7 +6,7 @@
 #include "util/lua_util.hpp"
 #include "util/simple_logger.hpp"
 #include "util/timing_util.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 
 #include "util/debug_geometry.hpp"
 

src/extractor/extraction_containers.cpp

@@ -4,7 +4,7 @@
 #include "util/coordinate_calculation.hpp"
 #include "util/range_table.hpp"
 
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/timing_util.hpp"
 #include "util/fingerprint.hpp"

src/extractor/restriction_parser.cpp

@@ -3,7 +3,7 @@
 
 #include "extractor/external_memory_node.hpp"
 #include "util/lua_util.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 
 #include <boost/algorithm/string.hpp>

src/extractor/scripting_environment.cpp

@@ -7,7 +7,7 @@
 #include "extractor/external_memory_node.hpp"
 #include "extractor/raster_source.hpp"
 #include "util/lua_util.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/typedefs.hpp"
 

src/storage/storage.cpp

@@ -13,7 +13,7 @@
 #include "storage/shared_barriers.hpp"
 #include "storage/shared_memory.hpp"
 #include "util/fingerprint.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/typedefs.hpp"
 

src/tools/components.cpp

@@ -6,7 +6,7 @@
 #include "util/fingerprint.hpp"
 #include "util/graph_loader.hpp"
 #include "util/make_unique.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>

src/tools/io-benchmark.cpp

@@ -1,4 +1,4 @@
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/timing_util.hpp"
 

src/tools/store.cpp

@@ -1,5 +1,5 @@
 #include "storage/storage.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/typedefs.hpp"
 #include "util/ini_file.hpp"

src/util/exception.cpp

@@ -1,4 +1,4 @@
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 
 // This function exists to 'anchor' the class, and stop the compiler from
 // copying vtable and RTTI info into every object file that includes

unit_tests/extractor/raster_source.cpp

@@ -1,6 +1,6 @@
 #include "extractor/raster_source.hpp"
 #include "util/typedefs.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 
 #include <osrm/coordinate.hpp>