restructure hash headers

yaito3014 · Aug 22, 2024 · 3a7a091 · 3a7a091
1 parent bf13cc1
commit 3a7a091
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/include/yk/hash.hpp b/include/yk/hash.hpp
@@ -0,0 +1,10 @@
+#ifndef YK_HASH_HPP
+#define YK_HASH_HPP
+
+#include "yk/hash/std.hpp"
+
+#if YK_UTIL_INCLUDE_BOOST
+#include "yk/hash/boost.hpp"
+#endif
+
+#endif  // YK_HASH_HPP
diff --git a/include/yk/util/hash/boost.hpp → include/yk/hash/boost.hpp b/include/yk/util/hash/boost.hpp → include/yk/hash/boost.hpp
@@ -1,7 +1,7 @@
-#ifndef YK_UTIL_HASH_BOOST_HPP
-#define YK_UTIL_HASH_BOOST_HPP
+#ifndef YK_HASH_BOOST_HPP
+#define YK_HASH_BOOST_HPP
 
-#include "yk/util/hash/hash.hpp"
+#include "yk/hash/hash.hpp"
 
 #include <boost/container_hash/hash_fwd.hpp>
 
@@ -16,4 +16,4 @@ template <class T>
 
 }  // namespace yk
 
-#endif  // YK_UTIL_HASH_BOOST_HPP
+#endif  // YK_HASH_BOOST_HPP
diff --git a/include/yk/util/hash/hash.hpp → include/yk/hash/hash.hpp b/include/yk/util/hash/hash.hpp → include/yk/hash/hash.hpp
diff --git a/include/yk/util/hash/hash_combine.hpp → include/yk/hash/hash_combine.hpp b/include/yk/util/hash/hash_combine.hpp → include/yk/hash/hash_combine.hpp
diff --git a/include/yk/util/hash/std.hpp → include/yk/hash/std.hpp b/include/yk/util/hash/std.hpp → include/yk/hash/std.hpp
@@ -1,7 +1,7 @@
-#ifndef YK_UTIL_HASH_STD_HPP
-#define YK_UTIL_HASH_STD_HPP
+#ifndef YK_HASH_STD_HPP
+#define YK_HASH_STD_HPP
 
-#include "yk/util/hash/hash.hpp"
+#include "yk/hash/hash.hpp"
 
 #include <functional>
 
@@ -23,4 +23,4 @@ template <class T>
 
 }  // namespace yk
 
-#endif  // YK_UTIL_HASH_STD_HPP
+#endif  // YK_HASH_STD_HPP
diff --git a/include/yk/util/hash.hpp b/include/yk/util/hash.hpp
diff --git a/test/test.cpp b/test/test.cpp
@@ -1,11 +1,11 @@
 #include "yk/allocator/default_init_allocator.hpp"
+#include "yk/hash.hpp"
+#include "yk/hash/boost.hpp"
+#include "yk/hash/hash_combine.hpp"
 #include "yk/maybe_mutex.hpp"
 #include "yk/par_for_each.hpp"
 #include "yk/stack.hpp"
 #include "yk/util/forward_like.hpp"
-#include "yk/util/hash.hpp"
-#include "yk/util/hash/boost.hpp"
-#include "yk/util/hash/hash_combine.hpp"
 #include "yk/util/pack_indexing.hpp"
 #include "yk/util/reverse.hpp"
 #include "yk/util/specialization_of.hpp"