Use nested namespace

It's a mechanical change to modernize the code base

include/storage/block.hpp

@@ -7,9 +7,7 @@
 #include <string>
 #include <tuple>
 
-namespace osrm
-{
-namespace storage
+namespace osrm::storage
 {
 
 struct Block
@@ -37,7 +35,6 @@ template <typename T> Block make_block(uint64_t num_entries)
     static_assert(sizeof(T) % alignof(T) == 0, "aligned T* can't be used as an array pointer");
     return Block{num_entries, sizeof(T) * num_entries, 0};
 }
-} // namespace storage
 } // namespace osrm
 
 #endif

include/storage/io.hpp

@@ -21,11 +21,7 @@
 #include <tuple>
 #include <type_traits>
 
-namespace osrm
-{
-namespace storage
-{
-namespace io
+namespace osrm::storage::io
 {
 
 class FileReader
@@ -388,8 +384,6 @@ class BufferWriter
   private:
     std::ostringstream output_stream;
 };
-} // namespace io
-} // namespace storage
 } // namespace osrm
 
 #endif

include/storage/io_config.hpp

@@ -9,9 +9,7 @@
 #include <boost/filesystem/path.hpp>
 #include <string>
 
-namespace osrm
-{
-namespace storage
+namespace osrm::storage
 {
 struct IOConfig
 {
@@ -81,7 +79,6 @@ struct IOConfig
     std::vector<boost::filesystem::path> optional_input_files;
     std::vector<boost::filesystem::path> output_files;
 };
-} // namespace storage
 } // namespace osrm
 
 #endif

include/storage/io_fwd.hpp

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

include/storage/serialization.hpp

@@ -17,11 +17,7 @@
 #include <cstdint>
 #include <tuple>
 
-namespace osrm
-{
-namespace storage
-{
-namespace serialization
+namespace osrm::storage::serialization
 {
 
 namespace detail
@@ -268,8 +264,6 @@ inline void write(io::BufferWriter &writer, const BaseDataLayout &layout)
 {
     write(writer, layout.blocks);
 }
-} // namespace serialization
-} // namespace storage
 } // namespace osrm
 
 #endif

include/storage/shared_data_index.hpp

@@ -8,9 +8,7 @@
 #include <type_traits>
 #include <unordered_map>
 
-namespace osrm
-{
-namespace storage
+namespace osrm::storage
 {
 
 // This class wraps one or more shared memory regions with the associated data layout
@@ -95,7 +93,6 @@ class SharedDataIndex
     std::vector<AllocatedRegion> regions;
     std::unordered_map<std::string, std::uint32_t> block_to_region;
 };
-} // namespace storage
 } // namespace osrm
 
 #endif

include/storage/shared_datatype.hpp

@@ -15,9 +15,7 @@
 #include <numeric>
 #include <unordered_set>
 
-namespace osrm
-{
-namespace storage
+namespace osrm::storage
 {
 
 class BaseDataLayout;
@@ -298,7 +296,6 @@ struct SharedRegionRegister
     std::array<SharedRegion, MAX_SHARED_REGIONS> regions;
     std::array<bool, MAX_SHM_KEYS> shm_key_in_use;
 };
-} // namespace storage
 } // namespace osrm
 
 #endif /* SHARED_DATA_TYPE_HPP */

include/storage/shared_memory.hpp

@@ -27,9 +27,7 @@
 
 #include "storage/shared_memory_ownership.hpp"
 
-namespace osrm
-{
-namespace storage
+namespace osrm::storage
 {
 
 struct OSRMLockFile
@@ -311,7 +309,6 @@ std::unique_ptr<SharedMemory> makeSharedMemory(const IdentifierT &id, const uint
         throw util::exception(e.what() + SOURCE_REF);
     }
 }
-} // namespace storage
 } // namespace osrm
 
 #endif // SHARED_MEMORY_HPP

include/storage/shared_memory_ownership.hpp

@@ -1,9 +1,7 @@
 #ifndef SHARED_MEMORY_OWNERSHIP_HPP
 #define SHARED_MEMORY_OWNERSHIP_HPP
 
-namespace osrm
-{
-namespace storage
+namespace osrm::storage
 {
 
 enum class Ownership
@@ -12,7 +10,6 @@ enum class Ownership
     View,
     External
 };
-} // namespace storage
 } // namespace osrm
 
 #endif // SHARED_MEMORY_OWNERSHIP_HPP

include/storage/shared_monitor.hpp

@@ -16,9 +16,7 @@
 // #define USE_BOOST_INTERPROCESS_CONDITION 1
 #endif
 
-namespace osrm
-{
-namespace storage
+namespace osrm::storage
 {
 
 namespace
@@ -234,7 +232,6 @@ template <typename Data> struct SharedMonitor
     bi::shared_memory_object shmem;
     bi::mapped_region region;
 };
-} // namespace storage
 } // namespace osrm
 
 #undef USE_BOOST_INTERPROCESS_CONDITION

include/storage/storage.hpp

@@ -37,9 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-namespace osrm
-{
-namespace storage
+namespace osrm::storage
 {
 
 void populateLayoutFromFile(const boost::filesystem::path &path, storage::BaseDataLayout &layout);
@@ -61,7 +59,6 @@ class Storage
   private:
     StorageConfig config;
 };
-} // namespace storage
 } // namespace osrm
 
 #endif

include/storage/storage_config.hpp

@@ -32,9 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "storage/io_config.hpp"
 
-namespace osrm
-{
-namespace storage
+namespace osrm::storage
 {
 
 /**
@@ -75,7 +73,6 @@ struct StorageConfig final : IOConfig
     {
     }
 };
-} // namespace storage
 } // namespace osrm
 
 #endif

include/storage/tar.hpp

@@ -14,11 +14,7 @@ extern "C"
 #include "microtar.h"
 }
 
-namespace osrm
-{
-namespace storage
-{
-namespace tar
+namespace osrm::storage::tar
 {
 namespace detail
 {
@@ -312,8 +308,6 @@ class FileWriter
     boost::filesystem::path path;
     mtar_t handle;
 };
-} // namespace tar
-} // namespace storage
 } // namespace osrm
 
 #endif

include/storage/tar_fwd.hpp

@@ -1,18 +1,12 @@
 #ifndef OSRM_STORAGE_TAR_FWD_HPP_
 #define OSRM_STORAGE_TAR_FWD_HPP_
 
-namespace osrm
-{
-namespace storage
-{
-namespace tar
+namespace osrm::storage::tar
 {
 
 class FileReader;
 class FileWriter;
 
-} // namespace tar
-} // namespace storage
 } // namespace osrm
 
 #endif

include/storage/view_factory.hpp

@@ -36,9 +36,7 @@
 #include "util/vector_view.hpp"
 
 #include "util/filtered_graph.hpp"
-namespace osrm
-{
-namespace storage
+namespace osrm::storage
 {
 
 template <typename T>
@@ -364,7 +362,6 @@ inline auto make_filtered_graph_view(const SharedDataIndex &index,
 
     return util::FilteredGraphView<contractor::QueryGraphView>({node_list, edge_list}, edge_filter);
 }
-} // namespace storage
 } // namespace osrm
 
 #endif