From 7567f77828ff9661f85eabe3b4cfb1876b307d42 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 19 Aug 2018 17:59:20 +0200
Subject: Remove old macros

---
 test/test_hilbert.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/test/test_hilbert.cpp b/test/test_hilbert.cpp
index ad99454..a217dc2 100644
--- a/test/test_hilbert.cpp
+++ b/test/test_hilbert.cpp
@@ -69,10 +69,11 @@ template <class T>
 mpz_class
 to_big_int(const T& vec)
 {
+	using Rack = typename T::Rack;
+
 	mpz_t ia;
 	mpz_init(ia);
-	mpz_import(
-	  ia, vec.num_racks(), -1, sizeof(chilbert::FBV_UINT), 0, 0, vec.data());
+	mpz_import(ia, vec.num_racks(), -1, sizeof(Rack), 0, 0, vec.data());
 	const mpz_class num(ia);
 	mpz_clear(ia);
 	return num;
@@ -83,15 +84,11 @@ template <class T, size_t M>
 T
 from_big_int(const mpz_class& num)
 {
+	using Rack = typename T::Rack;
+
 	T      vec   = make_zero_bitvec<T, M>();
 	size_t count = 0;
-	mpz_export(vec.data(),
-	           &count,
-	           -1,
-	           sizeof(chilbert::FBV_UINT),
-	           0,
-	           0,
-	           num.get_mpz_t());
+	mpz_export(vec.data(), &count, -1, sizeof(Rack), 0, 0, num.get_mpz_t());
 	assert(count <= static_cast<size_t>(vec.num_racks()));
 	return vec;
 }
@@ -100,7 +97,7 @@ template <class H, size_t M, size_t D>
 void
 test_standard(Context& ctx)
 {
-	static_assert(M < sizeof(chilbert::FBV_UINT) * CHAR_BIT, "");
+	static_assert(M < sizeof(typename H::Rack) * CHAR_BIT, "");
 
 	// Generate random point and its hilbert index
 	const auto pa = make_random_point<M, D>(ctx);
@@ -135,7 +132,7 @@ template <class T, size_t M, size_t D>
 void
 test_compact(Context& ctx)
 {
-	static_assert(M < sizeof(chilbert::FBV_UINT) * CHAR_BIT, "");
+	static_assert(M < sizeof(typename T::Rack) * CHAR_BIT, "");
 
 	// Generate random point and its hilbert index
 	const auto ms = make_random_precisions<D * M, D>(ctx);
-- 
cgit v1.2.1