Move to forward declare header

include/extractor/segment_data_container.hpp

@@ -4,6 +4,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <boost/filesystem/path.hpp>
@@ -17,15 +18,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace extractor
 {
 

include/extractor/turn_data_container.hpp

@@ -4,7 +4,9 @@
 #include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
 
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
+
 #include "util/guidance/turn_bearing.hpp"
 #include "util/vector_view.hpp"
 
@@ -12,16 +14,6 @@
 
 namespace osrm
 {
-
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace extractor
 {
 namespace detail

include/partition/cell_storage.hpp

@@ -9,7 +9,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
-#include "storage/io.hpp"
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <boost/iterator/iterator_facade.hpp>
@@ -23,15 +23,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace partition
 {
 namespace detail

include/partition/multi_level_graph.hpp

@@ -4,6 +4,7 @@
 #include "partition/multi_level_partition.hpp"
 
 #include "storage/shared_memory_ownership.hpp"
+#include "storage/io_fwd.hpp"
 
 #include "util/static_graph.hpp"
 #include "util/vector_view.hpp"
@@ -15,14 +16,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
 
 namespace partition
 {

include/partition/multi_level_partition.hpp

@@ -7,7 +7,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
-#include "storage/io.hpp"
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <algorithm>
@@ -22,14 +22,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
 namespace partition
 {
 namespace detail

include/storage/io_fwd.hpp

@@ -0,0 +1,18 @@
+#ifndef OSRM_STORAGE_IO_FWD_HPP_
+#define OSRM_STORAGE_IO_FWD_HPP_
+
+namespace osrm
+{
+namespace storage
+{
+namespace io
+{
+
+class FileReader;
+class FileWriter;
+
+} // ns io
+} // ns storage
+} // ns osrm
+
+#endif

include/util/dynamic_graph.hpp

@@ -5,6 +5,8 @@
 #include "util/integer_range.hpp"
 #include "util/typedefs.hpp"
 
+#include "storage/io_fwd.hpp"
+
 #include <boost/assert.hpp>
 
 #include <cstdint>
@@ -17,15 +19,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace util
 {
 template <typename EdgeDataT> class DynamicGraph;

include/util/packed_vector.hpp

@@ -4,7 +4,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
-#include "storage/io.hpp"
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <cmath>

include/util/static_graph.hpp

@@ -7,6 +7,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <boost/assert.hpp>
@@ -19,16 +20,6 @@
 
 namespace osrm
 {
-
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace util
 {
 template <typename EdgeDataT, storage::Ownership Ownership> class StaticGraph;