Merge pull request #1490 from evoskuil/master

Define TEMPLATE/CLASS in .hpp surrounding .ipp.
libbitcoin · Jul 4, 2024 · c0d0b85 · c0d0b85
2 parents 0a5bb97 + deb196d
commit c0d0b85
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 64 deletions.
diff --git a/include/bitcoin/system/hash/accumulator.hpp b/include/bitcoin/system/hash/accumulator.hpp
@@ -22,6 +22,7 @@
 #include <string>
 #include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
+#include <bitcoin/system/endian/endian.hpp>
 #include <bitcoin/system/hash/algorithms.hpp>
 #include <bitcoin/system/math/math.hpp>
 
@@ -170,6 +171,13 @@ extern template class accumulator<sha512>;
 } // namespace system
 } // namespace libbitcoin
 
+#define TEMPLATE template <typename Algorithm, bool Checked, \
+    if_base_of<algorithm_t, Algorithm> If>
+#define CLASS accumulator<Algorithm, Checked, If>
+
 #include <bitcoin/system/impl/hash/accumulator.ipp>
 
+#undef CLASS
+#undef TEMPLATE
+
 #endif
diff --git a/include/bitcoin/system/hash/hmac.hpp b/include/bitcoin/system/hash/hmac.hpp
@@ -65,6 +65,12 @@ class hmac
 } // namespace system
 } // namespace libbitcoin
 
+#define TEMPLATE template <typename Algorithm>
+#define CLASS hmac<Algorithm>
+
 #include <bitcoin/system/impl/hash/hmac.ipp>
 
+#undef CLASS
+#undef TEMPLATE
+
 #endif
diff --git a/include/bitcoin/system/hash/pbkd.hpp b/include/bitcoin/system/hash/pbkd.hpp
@@ -21,6 +21,8 @@
 
 #include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
+#include <bitcoin/system/endian/endian.hpp>
+#include <bitcoin/system/hash/hmac.hpp>
 #include <bitcoin/system/math/math.hpp>
 
 namespace libbitcoin {
@@ -61,6 +63,12 @@ struct pbkd
 } // namespace system
 } // namespace libbitcoin
 
+#define TEMPLATE template <typename Algorithm>
+#define CLASS pbkd<Algorithm>
+
 #include <bitcoin/system/impl/hash/pbkd.ipp>
 
+#undef CLASS
+#undef TEMPLATE
+
 #endif
diff --git a/include/bitcoin/system/hash/rmd/algorithm.hpp b/include/bitcoin/system/hash/rmd/algorithm.hpp
@@ -21,6 +21,7 @@
 
 #include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
+#include <bitcoin/system/endian/endian.hpp>
 #include <bitcoin/system/hash/algorithm.hpp>
 #include <bitcoin/system/math/math.hpp>
 
@@ -152,6 +153,12 @@ class algorithm
 } // namespace system
 } // namespace libbitcoin
 
+#define TEMPLATE template <typename RMD, if_same<typename RMD::T, rmdh_t> If>
+#define CLASS algorithm<RMD, If>
+
 #include <bitcoin/system/impl/hash/rmd/algorithm.ipp>
 
+#undef CLASS
+#undef TEMPLATE
+
 #endif
diff --git a/include/bitcoin/system/hash/scrypt.hpp b/include/bitcoin/system/hash/scrypt.hpp
@@ -22,8 +22,9 @@
 #include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
 #include <bitcoin/system/data/data.hpp>
-#include <bitcoin/system/hash/pbkd.hpp>
+#include <bitcoin/system/endian/endian.hpp>
 #include <bitcoin/system/hash/algorithms.hpp>
+#include <bitcoin/system/hash/pbkd.hpp>
 #include <bitcoin/system/math/math.hpp>
 
 namespace libbitcoin {
@@ -112,6 +113,15 @@ static_assert(scrypt<16384, 8, 8>::maximum_memory == 134'231'040_u64);
 } // namespace system
 } // namespace libbitcoin
 
+
+#define TEMPLATE \
+template<size_t W, size_t R, size_t P, bool Concurrent, \
+    bool_if<is_scrypt_args<W, R, P>> If>
+#define CLASS scrypt<W, R, P, Concurrent, If>
+
 #include <bitcoin/system/impl/hash/scrypt.ipp>
 
+#undef CLASS
+#undef TEMPLATE
+
 #endif
diff --git a/include/bitcoin/system/hash/sha/algorithm.hpp b/include/bitcoin/system/hash/sha/algorithm.hpp
@@ -21,6 +21,7 @@
 
 #include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
+#include <bitcoin/system/endian/endian.hpp>
 #include <bitcoin/system/hash/algorithm.hpp>
 #include <bitcoin/system/intrinsics/intrinsics.hpp>
 #include <bitcoin/system/math/math.hpp>

diff --git a/include/bitcoin/system/impl/hash/accumulator.ipp b/include/bitcoin/system/impl/hash/accumulator.ipp
@@ -21,18 +21,10 @@
 
 #include <algorithm>
 #include <string>
-#include <bitcoin/system/define.hpp>
-#include <bitcoin/system/data/data.hpp>
-#include <bitcoin/system/endian/endian.hpp>
-#include <bitcoin/system/math/math.hpp>
 
 namespace libbitcoin {
 namespace system {
 
-#define TEMPLATE template <typename Algorithm, bool Checked, \
-    if_base_of<algorithm_t, Algorithm> If>
-#define CLASS accumulator<Algorithm, Checked, If>
-
 // Copy and array index are guarded.
 BC_PUSH_WARNING(NO_UNSAFE_COPY_N)
 BC_PUSH_WARNING(NO_ARRAY_INDEXING)
@@ -660,9 +652,6 @@ BC_POP_WARNING()
 BC_POP_WARNING()
 BC_POP_WARNING()
 
-#undef CLASS
-#undef TEMPLATE
-
 } // namespace system
 } // namespace libbitcoin
 

diff --git a/include/bitcoin/system/impl/hash/hmac.ipp b/include/bitcoin/system/impl/hash/hmac.ipp
@@ -19,20 +19,13 @@
 #ifndef LIBBITCOIN_SYSTEM_HASH_HMAC_IPP
 #define LIBBITCOIN_SYSTEM_HASH_HMAC_IPP
 
-#include <bitcoin/system/data/data.hpp>
-#include <bitcoin/system/define.hpp>
-#include <bitcoin/system/hash/accumulator.hpp>
-
 // Based on:
 // datatracker.ietf.org/doc/html/rfc2104
 // [Krawczyk, Bellare, Canetti]
 
 namespace libbitcoin {
 namespace system {
 
-#define TEMPLATE template <typename Algorithm>
-#define CLASS hmac<Algorithm>
-
 // hmac accumulator
 // ---------------------------------------------------------------------------
 
@@ -167,9 +160,6 @@ code(const data_slice& data, const data_slice& key) NOEXCEPT
     return buffer.flush();
 }
 
-#undef CLASS
-#undef TEMPLATE
-
 } // namespace system
 } // namespace libbitcoin
 

diff --git a/include/bitcoin/system/impl/hash/pbkd.ipp b/include/bitcoin/system/impl/hash/pbkd.ipp
@@ -20,21 +20,13 @@
 #define LIBBITCOIN_SYSTEM_HASH_PBKD_IPP
 
 #include <algorithm>
-#include <bitcoin/system/data/data.hpp>
-#include <bitcoin/system/define.hpp>
-#include <bitcoin/system/hash/hmac.hpp>
-#include <bitcoin/system/endian/endian.hpp>
-#include <bitcoin/system/math/math.hpp>
 
 // based on:
 // datatracker.ietf.org/doc/html/rfc8018
 // [Moriarty, Kaliski, Rusch]
 
 namespace libbitcoin {
 namespace system {
-
-#define TEMPLATE template <typename Algorithm>
-#define CLASS pbkd<Algorithm>
 
 // Bugus use constexpr warning with consteval.
 BC_PUSH_WARNING(USE_CONSTEXPR_FOR_FUNCTION)
@@ -148,9 +140,6 @@ key(const data_slice& password, const data_slice& salt,
     return dk;
 }
 
-#undef CLASS
-#undef TEMPLATE
-
 } // namespace system
 } // namespace libbitcoin
 

diff --git a/include/bitcoin/system/impl/hash/rmd/algorithm.ipp b/include/bitcoin/system/impl/hash/rmd/algorithm.ipp
@@ -21,9 +21,6 @@
 
 #include <bit>
 #include <iostream>
-#include <bitcoin/system/define.hpp>
-#include <bitcoin/system/endian/endian.hpp>
-#include <bitcoin/system/math/math.hpp>
 
 // Based on:
 // homes.esat.kuleuven.be/~bosselae/ripemd160/pdf/AB-9601/AB-9601.pdf
@@ -33,9 +30,6 @@ namespace libbitcoin {
 namespace system {
 namespace rmd {
 
-#define TEMPLATE template <typename RMD, if_same<typename RMD::T, rmdh_t> If>
-#define CLASS algorithm<RMD, If>
-
 // Bogus warning suggests constexpr when declared consteval.
 BC_PUSH_WARNING(USE_CONSTEXPR_FOR_FUNCTION)
 BC_PUSH_WARNING(NO_UNGUARDED_POINTERS)
@@ -652,9 +646,6 @@ BC_POP_WARNING()
 BC_POP_WARNING()
 BC_POP_WARNING()
 
-#undef CLASS
-#undef TEMPLATE
-
 } // namespace rmd
 } // namespace system
 } // namespace libbitcoin

diff --git a/include/bitcoin/system/impl/hash/scrypt.ipp b/include/bitcoin/system/impl/hash/scrypt.ipp
@@ -23,11 +23,6 @@
 #include <algorithm>
 #include <bit>
 #include <memory>
-#include <bitcoin/system/data/data.hpp>
-#include <bitcoin/system/define.hpp>
-#include <bitcoin/system/endian/endian.hpp>
-#include <bitcoin/system/hash/pbkd.hpp>
-#include <bitcoin/system/math/math.hpp>
 
 // Based on:
 // tools.ietf.org/html/rfc7914
@@ -37,11 +32,6 @@
 namespace libbitcoin {
 namespace system {
 
-#define TEMPLATE \
-template<size_t W, size_t R, size_t P, bool Concurrent, \
-    bool_if<is_scrypt_args<W, R, P>> If>
-#define CLASS scrypt<W, R, P, Concurrent, If>
-
 BC_PUSH_WARNING(NO_DYNAMIC_ARRAY_INDEXING)
 BC_PUSH_WARNING(NO_POINTER_ARITHMETIC)
 BC_PUSH_WARNING(NO_UNGUARDED_POINTERS)
@@ -536,9 +526,6 @@ BC_POP_WARNING()
 BC_POP_WARNING()
 BC_POP_WARNING()
 
-#undef CLASS
-#undef TEMPLATE
-
 } // namespace system
 } // namespace libbitcoin
 

diff --git a/include/bitcoin/system/impl/hash/sha/algorithm.ipp b/include/bitcoin/system/impl/hash/sha/algorithm.ipp
@@ -20,9 +20,6 @@
 #define LIBBITCOIN_SYSTEM_HASH_SHA_ALGORITHM_IPP
 
 #include <utility>
-#include <bitcoin/system/define.hpp>
-#include <bitcoin/system/endian/endian.hpp>
-#include <bitcoin/system/math/math.hpp>
 
 // Based on:
 // FIPS PUB 180-4 [Secure Hash Standard (SHS)].

diff --git a/include/bitcoin/system/impl/hash/sha/algorithm_compression.ipp b/include/bitcoin/system/impl/hash/sha/algorithm_compression.ipp
@@ -19,9 +19,6 @@
 #ifndef LIBBITCOIN_SYSTEM_HASH_SHA_ALGORITHM_COMPRESSION_IPP
 #define LIBBITCOIN_SYSTEM_HASH_SHA_ALGORITHM_COMPRESSION_IPP
 
-#include <bitcoin/system/define.hpp>
-#include <bitcoin/system/intrinsics/intrinsics.hpp>
-
 namespace libbitcoin {
 namespace system {
 namespace sha {

diff --git a/include/bitcoin/system/impl/hash/sha/algorithm_vectorization.ipp b/include/bitcoin/system/impl/hash/sha/algorithm_vectorization.ipp
@@ -19,9 +19,6 @@
 #ifndef LIBBITCOIN_SYSTEM_HASH_SHA_ALGORITHM_VECTORIZATION_IPP
 #define LIBBITCOIN_SYSTEM_HASH_SHA_ALGORITHM_VECTORIZATION_IPP
 
-#include <bitcoin/system/define.hpp>
-#include <bitcoin/system/intrinsics/intrinsics.hpp>
-
 namespace libbitcoin {
 namespace system {
 namespace sha {