From 229b3d3f1a576eda21d7d6a45b5727c0e113a7b2 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Sat, 25 May 2019 16:39:03 +1000
Subject: [PATCH] cruft: use new debug header paths

---
 hash/blake2.cpp      | 2 +-
 hash/hmac.hpp        | 2 +-
 hash/md2.cpp         | 2 +-
 hash/md4.cpp         | 2 +-
 hash/md5.cpp         | 2 +-
 hash/ripemd.cpp      | 2 +-
 hash/sha1.cpp        | 2 +-
 hash/sha2.cpp        | 2 +-
 test/block/xxtea.cpp | 2 +-
 test/hash/hmac.cpp   | 1 -
 test/hash/hotp.cpp   | 1 -
 test/hash/sha1.cpp   | 2 +-
 test/stream/rc4.cpp  | 1 -
 tools/bench.cpp      | 6 ++++--
 14 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/hash/blake2.cpp b/hash/blake2.cpp
index eb6f899..1f4297b 100644
--- a/hash/blake2.cpp
+++ b/hash/blake2.cpp
@@ -9,7 +9,7 @@
 #include "blake2.hpp"
 
 #include <cruft/util/bitwise.hpp>
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 #include <cruft/util/endian.hpp>
 #include <cruft/util/types.hpp>
 
diff --git a/hash/hmac.hpp b/hash/hmac.hpp
index bdc41aa..57f587d 100644
--- a/hash/hmac.hpp
+++ b/hash/hmac.hpp
@@ -9,7 +9,7 @@
 #ifndef CRUFT_CRYPTO_HASH_HMAC_HPP
 #define CRUFT_CRYPTO_HASH_HMAC_HPP
 
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 #include <cruft/util/view.hpp>
 
 #include <algorithm>
diff --git a/hash/md2.cpp b/hash/md2.cpp
index 22a5c70..54b865a 100644
--- a/hash/md2.cpp
+++ b/hash/md2.cpp
@@ -9,7 +9,7 @@
 #include "md2.hpp"
 
 #include <cruft/util/std.hpp>
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 #include <cruft/util/types.hpp>
 
 #include <array>
diff --git a/hash/md4.cpp b/hash/md4.cpp
index 54e1b85..2c29487 100644
--- a/hash/md4.cpp
+++ b/hash/md4.cpp
@@ -10,7 +10,7 @@
 
 #include <cruft/util/std.hpp>
 #include <cruft/util/bitwise.hpp>
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 
 #include <cstring>
 
diff --git a/hash/md5.cpp b/hash/md5.cpp
index c121353..51261cf 100644
--- a/hash/md5.cpp
+++ b/hash/md5.cpp
@@ -11,7 +11,7 @@
 #include <cruft/util/std.hpp>
 #include <cruft/util/iterator/transform.hpp>
 #include <cruft/util/bitwise.hpp>
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 
 #include <cstring>
 
diff --git a/hash/ripemd.cpp b/hash/ripemd.cpp
index 3deaba1..3e764a7 100644
--- a/hash/ripemd.cpp
+++ b/hash/ripemd.cpp
@@ -10,7 +10,7 @@
 #include "ripemd.hpp"
 
 #include <cruft/util/std.hpp>
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 #include <cruft/util/bitwise.hpp>
 
 #include <cstring>
diff --git a/hash/sha1.cpp b/hash/sha1.cpp
index 8ad2f8c..e7b6946 100644
--- a/hash/sha1.cpp
+++ b/hash/sha1.cpp
@@ -10,7 +10,7 @@
 
 #include <cruft/util/bitwise.hpp>
 #include <cruft/util/cast.hpp>
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 #include <cruft/util/endian.hpp>
 #include <cruft/util/iterator/transform.hpp>
 
diff --git a/hash/sha2.cpp b/hash/sha2.cpp
index 50d4e2d..4f7b757 100644
--- a/hash/sha2.cpp
+++ b/hash/sha2.cpp
@@ -10,7 +10,7 @@
 #include "sha2.hpp"
 
 #include <cruft/util/bitwise.hpp>
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 #include <cruft/util/endian.hpp>
 
 #include <algorithm>
diff --git a/test/block/xxtea.cpp b/test/block/xxtea.cpp
index 9b8c88e..92d15d1 100644
--- a/test/block/xxtea.cpp
+++ b/test/block/xxtea.cpp
@@ -1,6 +1,6 @@
 #include "block/xxtea.hpp"
 
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 #include <cruft/util/tap.hpp>
 #include <cruft/util/types.hpp>
 
diff --git a/test/hash/hmac.cpp b/test/hash/hmac.cpp
index f7ba953..5bcc879 100644
--- a/test/hash/hmac.cpp
+++ b/test/hash/hmac.cpp
@@ -3,7 +3,6 @@
 #include "hash/md5.hpp"
 #include "hash/sha1.hpp"
 
-#include <cruft/util/debug.hpp>
 #include <cruft/util/tap.hpp>
 #include <cruft/util/types.hpp>
 
diff --git a/test/hash/hotp.cpp b/test/hash/hotp.cpp
index 6998c66..8538b05 100644
--- a/test/hash/hotp.cpp
+++ b/test/hash/hotp.cpp
@@ -1,6 +1,5 @@
 #include "hash/hotp.hpp"
 
-#include <cruft/util/debug.hpp>
 #include <cruft/util/tap.hpp>
 #include <cruft/util/types.hpp>
 
diff --git a/test/hash/sha1.cpp b/test/hash/sha1.cpp
index ee7ae40..56d26cf 100644
--- a/test/hash/sha1.cpp
+++ b/test/hash/sha1.cpp
@@ -1,6 +1,6 @@
 #include "hash/sha1.hpp"
 
-#include <cruft/util/debug.hpp>
+#include <cruft/util/debug/assert.hpp>
 #include <cruft/util/tap.hpp>
 #include <cruft/util/types.hpp>
 
diff --git a/test/stream/rc4.cpp b/test/stream/rc4.cpp
index d4d1409..5817a55 100644
--- a/test/stream/rc4.cpp
+++ b/test/stream/rc4.cpp
@@ -1,6 +1,5 @@
 #include "stream/rc4.hpp"
 
-#include <cruft/util/debug.hpp>
 #include <cruft/util/tap.hpp>
 #include <cruft/util/types.hpp>
 
diff --git a/tools/bench.cpp b/tools/bench.cpp
index 43d86e5..3057e95 100644
--- a/tools/bench.cpp
+++ b/tools/bench.cpp
@@ -13,11 +13,13 @@
 #include <cruft/util/random.hpp>
 #include <cruft/util/rand/pcg.hpp>
 #include <cruft/util/preprocessor.hpp>
+#include <cruft/util/debug/compiler.hpp>
 
-#include <vector>
-#include <random>
 #include <algorithm>
+#include <chrono>
 #include <iostream>
+#include <random>
+#include <vector>
 
 
 ///////////////////////////////////////////////////////////////////////////////