From e20243e9d40fa7b8de168274ae4a69d465218741 Mon Sep 17 00:00:00 2001
From: Hans Dembinski <hans.dembinski@gmail.com>
Date: Tue, 30 Oct 2018 23:21:05 +0100
Subject: [PATCH] preliminary fix

---
 include/boost/histogram/serialization.hpp    | 12 ++++++------
 test/adaptive_storage_serialization_test.cpp |  3 +--
 test/speed_cpp.cpp                           | 18 +++++++++---------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/include/boost/histogram/serialization.hpp b/include/boost/histogram/serialization.hpp
index 9a37c34a..21e2f95b 100644
--- a/include/boost/histogram/serialization.hpp
+++ b/include/boost/histogram/serialization.hpp
@@ -16,9 +16,9 @@
 #include <boost/histogram/axis/variant.hpp>
 #include <boost/histogram/detail/buffer.hpp>
 #include <boost/histogram/histogram.hpp>
-#include <boost/histogram/storage/adaptive_storage.hpp>
-#include <boost/histogram/storage/array_storage.hpp>
-#include <boost/histogram/storage/weight_counter.hpp>
+#include <boost/histogram/adaptive_storage.hpp>
+#include <boost/histogram/storage_adaptor.hpp>
+#include <boost/histogram/weight_counter.hpp>
 #include <boost/mp11/tuple.hpp>
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/string.hpp>
@@ -48,9 +48,9 @@ void weight_counter<RealType>::serialize(Archive& ar, unsigned /* version */) {
   ar& w2;
 }
 
-template <class Archive, typename T, typename A>
-void serialize(Archive& ar, array_storage<T, A>& s, unsigned /* version */) {
-  ar& s.buffer;
+template <class Archive, typename T>
+void serialize(Archive& ar, storage_adaptor<T>& s, unsigned /* version */) {
+  // TODO
 }
 
 namespace detail {
diff --git a/test/adaptive_storage_serialization_test.cpp b/test/adaptive_storage_serialization_test.cpp
index d0140131..caa98802 100644
--- a/test/adaptive_storage_serialization_test.cpp
+++ b/test/adaptive_storage_serialization_test.cpp
@@ -9,8 +9,7 @@
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/histogram/serialization.hpp>
 #include <boost/histogram/histogram_fwd.hpp>
-#include <boost/histogram/storage/adaptive_storage.hpp>
-#include <boost/histogram/storage/operators.hpp>
+#include <boost/histogram/adaptive_storage.hpp>
 #include <memory>
 #include <sstream>
 
diff --git a/test/speed_cpp.cpp b/test/speed_cpp.cpp
index 6543b812..edf43282 100644
--- a/test/speed_cpp.cpp
+++ b/test/speed_cpp.cpp
@@ -12,7 +12,7 @@
 #include <limits>
 #include <memory>
 #include <random>
-#include "utility_histgram.hpp"
+#include "utility_histogram.hpp"
 
 using namespace boost::histogram;
 using boost::mp11::mp_list;
@@ -132,9 +132,9 @@ int main() {
       printf("uniform distribution\n");
     else
       printf("normal distribution\n");
-    printf("hs_ss %.3f\n", compare_1d<static_tag, array_storage<int>>(nfill, itype));
+    printf("hs_ss %.3f\n", compare_1d<static_tag, std::vector<int>>(nfill, itype));
     printf("hs_sd %.3f\n", compare_1d<static_tag, adaptive_storage<>>(nfill, itype));
-    printf("hd_ss %.3f\n", compare_1d<dynamic_tag, array_storage<int>>(nfill, itype));
+    printf("hd_ss %.3f\n", compare_1d<dynamic_tag, std::vector<int>>(nfill, itype));
     printf("hd_sd %.3f\n", compare_1d<dynamic_tag, adaptive_storage<>>(nfill, itype));
   }
 
@@ -144,9 +144,9 @@ int main() {
       printf("uniform distribution\n");
     else
       printf("normal distribution\n");
-    printf("hs_ss %.3f\n", compare_2d<static_tag, array_storage<int>>(nfill, itype));
+    printf("hs_ss %.3f\n", compare_2d<static_tag, std::vector<int>>(nfill, itype));
     printf("hs_sd %.3f\n", compare_2d<static_tag, adaptive_storage<>>(nfill, itype));
-    printf("hd_ss %.3f\n", compare_2d<dynamic_tag, array_storage<int>>(nfill, itype));
+    printf("hd_ss %.3f\n", compare_2d<dynamic_tag, std::vector<int>>(nfill, itype));
     printf("hd_sd %.3f\n", compare_2d<dynamic_tag, adaptive_storage<>>(nfill, itype));
   }
 
@@ -156,9 +156,9 @@ int main() {
       printf("uniform distribution\n");
     else
       printf("normal distribution\n");
-    printf("hs_ss %.3f\n", compare_3d<static_tag, array_storage<int>>(nfill, itype));
+    printf("hs_ss %.3f\n", compare_3d<static_tag, std::vector<int>>(nfill, itype));
     printf("hs_sd %.3f\n", compare_3d<static_tag, adaptive_storage<>>(nfill, itype));
-    printf("hd_ss %.3f\n", compare_3d<dynamic_tag, array_storage<int>>(nfill, itype));
+    printf("hd_ss %.3f\n", compare_3d<dynamic_tag, std::vector<int>>(nfill, itype));
     printf("hd_sd %.3f\n", compare_3d<dynamic_tag, adaptive_storage<>>(nfill, itype));
   }
 
@@ -168,9 +168,9 @@ int main() {
       printf("uniform distribution\n");
     else
       printf("normal distribution\n");
-    printf("hs_ss %.3f\n", compare_6d<static_tag, array_storage<int>>(nfill, itype));
+    printf("hs_ss %.3f\n", compare_6d<static_tag, std::vector<int>>(nfill, itype));
     printf("hs_sd %.3f\n", compare_6d<static_tag, adaptive_storage<>>(nfill, itype));
-    printf("hd_ss %.3f\n", compare_6d<dynamic_tag, array_storage<int>>(nfill, itype));
+    printf("hd_ss %.3f\n", compare_6d<dynamic_tag, std::vector<int>>(nfill, itype));
     printf("hd_sd %.3f\n", compare_6d<dynamic_tag, adaptive_storage<>>(nfill, itype));
   }
 }