Upgrade formatting to clang-format 10 (#5895)

* Update formatting tools to clang-format-10

* Reformat using clang-format-10.0.09

include/storage/block.hpp

@@ -36,7 +36,7 @@ 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

@@ -388,8 +388,8 @@ class BufferWriter
   private:
     std::ostringstream output_stream;
 };
-} // ns io
-} // ns storage
-} // ns osrm
+} // namespace io
+} // namespace storage
+} // namespace osrm
 
 #endif

include/storage/io_config.hpp

@@ -79,7 +79,7 @@ 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

@@ -11,8 +11,8 @@ namespace io
 class FileReader;
 class FileWriter;
 
-} // ns io
-} // ns storage
-} // ns osrm
+} // namespace io
+} // namespace storage
+} // namespace osrm
 
 #endif

include/storage/serialization.hpp

@@ -104,7 +104,7 @@ void writeBoolVector(tar::FileWriter &writer, const std::string &name, const Vec
         boost::make_function_input_iterator(encode_function, boost::infinite()),
         number_of_blocks);
 }
-}
+} // namespace detail
 
 /* All vector formats here use the same on-disk format.
  * This is important because we want to be able to write from a vector
@@ -268,8 +268,8 @@ 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

@@ -95,7 +95,7 @@ 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_memory_ownership.hpp

@@ -13,6 +13,6 @@ enum class Ownership
     External
 };
 }
-}
+} // namespace osrm
 
 #endif // SHARED_MEMORY_OWNERSHIP_HPP

include/storage/storage.hpp

@@ -61,7 +61,7 @@ class Storage
   private:
     StorageConfig config;
 };
-}
-}
+} // namespace storage
+} // namespace osrm
 
 #endif

include/storage/storage_config.hpp

@@ -75,7 +75,7 @@ struct StorageConfig final : IOConfig
     {
     }
 };
-}
-}
+} // namespace storage
+} // namespace osrm
 
 #endif

include/storage/tar.hpp

@@ -9,7 +9,8 @@
 
 #include <boost/filesystem/path.hpp>
 
-extern "C" {
+extern "C"
+{
 #include "microtar.h"
 }
 
@@ -70,7 +71,7 @@ checkMTarError(int error_code, const boost::filesystem::path &filepath, const st
         throw util::exception(filepath.string() + " : " + name + ":" + mtar_strerror(error_code));
     }
 }
-}
+} // namespace detail
 
 class FileReader
 {
@@ -311,8 +312,8 @@ class FileWriter
     boost::filesystem::path path;
     mtar_t handle;
 };
-}
-}
-}
+} // namespace tar
+} // namespace storage
+} // namespace osrm
 
 #endif

include/storage/tar_fwd.hpp

@@ -11,8 +11,8 @@ namespace tar
 class FileReader;
 class FileWriter;
 
-} // ns io
-} // ns storage
-} // ns osrm
+} // namespace tar
+} // namespace storage
+} // namespace osrm
 
 #endif

include/storage/view_factory.hpp

@@ -379,7 +379,7 @@ 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