From e96545be2ebebee67791dff9afaed1c6f05462b2 Mon Sep 17 00:00:00 2001
From: Patrick Niklaus <patrick.niklaus@student.kit.edu>
Date: Tue, 11 Apr 2017 23:03:31 +0000
Subject: [PATCH] Disable is_integral check because it fails for
 strong-type-def

---
 .../engine/datafacade/contiguous_internalmem_datafacade.hpp    | 2 +-
 include/extractor/edge_based_graph_factory.hpp                 | 2 +-
 include/util/graph_loader.hpp                                  | 2 +-
 include/util/packed_vector.hpp                                 | 3 ++-
 include/util/serialization.hpp                                 | 3 ++-
 src/storage/storage.cpp                                        | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
index f95e41154..6f9147659 100644
--- a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
+++ b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
@@ -13,10 +13,10 @@
 #include "extractor/datasources.hpp"
 #include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/guidance/turn_lane_types.hpp"
+#include "extractor/packed_osm_ids.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/segment_data_container.hpp"
 #include "extractor/turn_data_container.hpp"
-#include "extractor/packed_osm_ids.hpp"
 
 #include "contractor/query_graph.hpp"
 
diff --git a/include/extractor/edge_based_graph_factory.hpp b/include/extractor/edge_based_graph_factory.hpp
index 842b84b10..d2b90389c 100644
--- a/include/extractor/edge_based_graph_factory.hpp
+++ b/include/extractor/edge_based_graph_factory.hpp
@@ -12,10 +12,10 @@
 #include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/nbg_to_ebg.hpp"
 #include "extractor/original_edge_data.hpp"
+#include "extractor/packed_osm_ids.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/restriction_map.hpp"
-#include "extractor/packed_osm_ids.hpp"
 
 #include "util/deallocating_vector.hpp"
 #include "util/guidance/bearing_class.hpp"
diff --git a/include/util/graph_loader.hpp b/include/util/graph_loader.hpp
index f570db717..0a1fbac31 100644
--- a/include/util/graph_loader.hpp
+++ b/include/util/graph_loader.hpp
@@ -3,9 +3,9 @@
 
 #include "extractor/external_memory_node.hpp"
 #include "extractor/node_based_edge.hpp"
+#include "extractor/packed_osm_ids.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/restriction.hpp"
-#include "extractor/packed_osm_ids.hpp"
 #include "storage/io.hpp"
 #include "util/exception.hpp"
 #include "util/fingerprint.hpp"
diff --git a/include/util/packed_vector.hpp b/include/util/packed_vector.hpp
index f7d46f5b4..2542de7ee 100644
--- a/include/util/packed_vector.hpp
+++ b/include/util/packed_vector.hpp
@@ -33,7 +33,8 @@ namespace detail
 {
 template <typename T, std::size_t Bits, storage::Ownership Ownership> class PackedVector
 {
-    static_assert(std::is_integral<T>, "T must be an integral type.");
+    // This fails for all strong typedef types
+    // static_assert(std::is_integral<T>::value, "T must be an integral type.");
     static_assert(sizeof(T) <= sizeof(std::uint64_t), "Maximum size of type T is 8 bytes");
     static_assert(Bits > 0, "Minimum number of bits is 0.");
     static_assert(Bits <= sizeof(std::uint64_t) * CHAR_BIT, "Maximum number of bits is 64.");
diff --git a/include/util/serialization.hpp b/include/util/serialization.hpp
index 95fba929a..d99e6604e 100644
--- a/include/util/serialization.hpp
+++ b/include/util/serialization.hpp
@@ -22,7 +22,8 @@ inline void read(storage::io::FileReader &reader, detail::PackedVector<T, Bits,
 }
 
 template <typename T, std::size_t Bits, storage::Ownership Ownership>
-inline void write(storage::io::FileWriter &writer, const detail::PackedVector<T, Bits, Ownership> &vec)
+inline void write(storage::io::FileWriter &writer,
+                  const detail::PackedVector<T, Bits, Ownership> &vec)
 {
     writer.WriteOne(vec.num_elements);
     storage::serialization::write(writer, vec.vec);
diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp
index b4c84fc44..0b1907133 100644
--- a/src/storage/storage.cpp
+++ b/src/storage/storage.cpp
@@ -16,10 +16,10 @@
 #include "extractor/files.hpp"
 #include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/original_edge_data.hpp"
+#include "extractor/packed_osm_ids.hpp"
 #include "extractor/profile_properties.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/travel_mode.hpp"
-#include "extractor/packed_osm_ids.hpp"
 
 #include "partition/cell_storage.hpp"
 #include "partition/edge_based_graph_reader.hpp"