From c4bf450fc6f4f476cda1cfb6f9acf5336257c427 Mon Sep 17 00:00:00 2001
From: Michael Krasnyk <michael.krasnyk@gmail.com>
Date: Mon, 9 Apr 2018 12:45:53 +0200
Subject: [PATCH] Restore storage constructors with one arguments

---
 include/util/query_heap.hpp            | 20 +++++++-------------
 include/util/xor_fast_hash_storage.hpp |  4 +---
 unit_tests/engine/offline_facade.cpp   |  4 ++--
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/include/util/query_heap.hpp b/include/util/query_heap.hpp
index 9b1152c4f..e547ac973 100644
--- a/include/util/query_heap.hpp
+++ b/include/util/query_heap.hpp
@@ -20,7 +20,7 @@ template <typename NodeID, typename Key> class GenerationArrayStorage
     using GenerationCounter = std::uint16_t;
 
   public:
-    explicit GenerationArrayStorage(std::size_t size, std::size_t)
+    explicit GenerationArrayStorage(std::size_t size)
         : positions(size, 0), generation(1), generations(size, 0)
     {
     }
@@ -60,7 +60,7 @@ template <typename NodeID, typename Key> class GenerationArrayStorage
 template <typename NodeID, typename Key> class ArrayStorage
 {
   public:
-    explicit ArrayStorage(std::size_t size, std::size_t) : positions(size, 0) {}
+    explicit ArrayStorage(std::size_t size) : positions(size, 0) {}
 
     ~ArrayStorage() {}
 
@@ -77,7 +77,7 @@ template <typename NodeID, typename Key> class ArrayStorage
 template <typename NodeID, typename Key> class MapStorage
 {
   public:
-    explicit MapStorage(std::size_t, std::size_t) {}
+    explicit MapStorage(std::size_t) {}
 
     Key &operator[](NodeID node) { return nodes[node]; }
 
@@ -100,7 +100,7 @@ template <typename NodeID, typename Key> class MapStorage
 template <typename NodeID, typename Key> class UnorderedMapStorage
 {
   public:
-    explicit UnorderedMapStorage(std::size_t, std::size_t) { nodes.rehash(1000); }
+    explicit UnorderedMapStorage(std::size_t) { nodes.rehash(1000); }
 
     Key &operator[](const NodeID node) { return nodes[node]; }
 
@@ -134,8 +134,8 @@ class TwoLevelStorage
 {
   public:
     explicit TwoLevelStorage(std::size_t number_of_nodes, std::size_t number_of_overlay_nodes)
-        : number_of_overlay_nodes(number_of_overlay_nodes), base(number_of_nodes, number_of_nodes),
-          overlay(number_of_overlay_nodes, number_of_overlay_nodes)
+        : number_of_overlay_nodes(number_of_overlay_nodes), base(number_of_nodes),
+          overlay(number_of_overlay_nodes)
     {
     }
 
@@ -198,17 +198,11 @@ class QueryHeap
     using WeightType = Weight;
     using DataType = Data;
 
-    explicit QueryHeap(std::size_t number_of_elements, std::size_t number_of_overlay_nodes)
-        : node_index(number_of_elements, number_of_overlay_nodes)
+    template <typename... StorageArgs> explicit QueryHeap(StorageArgs... args) : node_index(args...)
     {
         Clear();
     }
 
-    explicit QueryHeap(std::size_t number_of_elements)
-        : QueryHeap(number_of_elements, number_of_elements)
-    {
-    }
-
     void Clear()
     {
         heap.clear();
diff --git a/include/util/xor_fast_hash_storage.hpp b/include/util/xor_fast_hash_storage.hpp
index dc2519537..6d2d76baa 100644
--- a/include/util/xor_fast_hash_storage.hpp
+++ b/include/util/xor_fast_hash_storage.hpp
@@ -31,9 +31,7 @@ class XORFastHashStorage
         void operator=(const Key key_to_insert) { key = key_to_insert; }
     };
 
-    explicit XORFastHashStorage(size_t, size_t) : positions(MaxNumElements), current_timestamp{0u}
-    {
-    }
+    explicit XORFastHashStorage(size_t) : positions(MaxNumElements), current_timestamp{0u} {}
 
     HashCell &operator[](const NodeID node)
     {
diff --git a/unit_tests/engine/offline_facade.cpp b/unit_tests/engine/offline_facade.cpp
index d11997a29..d72c68d94 100644
--- a/unit_tests/engine/offline_facade.cpp
+++ b/unit_tests/engine/offline_facade.cpp
@@ -40,7 +40,7 @@ template <> struct SearchEngineData<routing_algorithms::offline::Algorithm>
         }
         else
         {
-            forward_heap_1.reset(new QueryHeap(number_of_nodes));
+            forward_heap_1.reset(new QueryHeap(number_of_nodes, 0));
         }
 
         if (reverse_heap_1.get())
@@ -49,7 +49,7 @@ template <> struct SearchEngineData<routing_algorithms::offline::Algorithm>
         }
         else
         {
-            reverse_heap_1.reset(new QueryHeap(number_of_nodes));
+            reverse_heap_1.reset(new QueryHeap(number_of_nodes, 0));
         }
     }
 };