Fix portability

Author: seekstar

conanfile.py

@@ -3,7 +3,7 @@
 
 class rusty_cppRecipe(ConanFile):
     name = "rusty-cpp"
-    version = "0.1.11"
+    version = "0.1.12"
 
     # Optional metadata
     license = "dual licensed under the Apache License v2.0 and the MIT License"

include/rusty/macro.h

@@ -25,41 +25,30 @@
 	} \
 } while (0)
 
-#define __rusty_first_arg(a, ...) a
-#define __rusty_drop_first_arg_with_prepended_comma(a, ...) , ## __VA_ARGS__
-
-#define rusty_assert_eq(l, r, ...) do { \
+#define __rusty_assert_eq(l, r, fmt, ...) do { \
 	auto left= (l); \
 	auto right= (r); \
-	if (sizeof(#__VA_ARGS__) == 1) { \
-		rusty_assert( \
-			left == right, "left = %s, right = %s", \
-			std::to_string(left).c_str(), std::to_string(right).c_str() \
-		); \
-	} else { \
-		rusty_assert( \
-			left == right, "left = %s, right = %s. " __rusty_first_arg(__VA_ARGS__), \
-			std::to_string(left).c_str(), std::to_string(right).c_str() \
-			__rusty_drop_first_arg_with_prepended_comma(__VA_ARGS__) \
-		); \
-	} \
+	rusty_assert( \
+		left == right, "left = %s, right = %s. " fmt, \
+		std::to_string(left).c_str(), std::to_string(right).c_str() \
+		, ## __VA_ARGS__ \
+	); \
 } while (0)
 
-#define rusty_assert_ne(l, r, ...) do { \
+#define rusty_assert_eq(l, r, ...) \
+	__rusty_assert_eq(l, r, "" __VA_ARGS__)
+
+#define __rusty_assert_ne(l, r, fmt, ...) do { \
 	auto left= (l); \
 	auto right= (r); \
-	if (sizeof(#__VA_ARGS__) == 1) { \
-		rusty_assert( \
-			left != right, "left = %s, right = %s", \
-			std::to_string(left).c_str(), std::to_string(right).c_str() \
-		); \
-	} else { \
-		rusty_assert( \
-			left != right, "left = %s, right = %s. " __rusty_first_arg(__VA_ARGS__), \
-			std::to_string(left).c_str(), std::to_string(right).c_str() \
-			__rusty_drop_first_arg_with_prepended_comma(__VA_ARGS__) \
-		); \
-	} \
+	rusty_assert( \
+		left != right, "left = %s, right = %s. " fmt, \
+		std::to_string(left).c_str(), std::to_string(right).c_str() \
+		, ## __VA_ARGS__ \
+	); \
 } while (0)
 
+#define rusty_assert_ne(l, r, ...) \
+	__rusty_assert_ne(l, r, "" __VA_ARGS__)
+
 #endif // RUSTY_MACRO_H_

test_package/CMakeLists.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.15)
+project(test_package LANGUAGES CXX)
+
+find_package(rusty-cpp REQUIRED CONFIG)
+
+add_executable(${PROJECT_NAME} test_package.cpp)
+target_link_libraries(${PROJECT_NAME} PRIVATE rusty-cpp)

test_package/conanfile.py

@@ -0,0 +1,25 @@
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import cmake_layout, CMake
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "CMakeDeps", "CMakeToolchain"
+
+    def layout(self):
+        cmake_layout(self)
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if can_run(self):
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
+            self.run(bin_path, env="conanrun")

test_package/test_package.cpp

@@ -0,0 +1,12 @@
+#include <iostream>
+#include <rusty/macro.h>
+#include <rusty/primitive.h>
+
+int main(void) {
+  rusty_assert(1);
+  rusty_assert_eq(rusty::next_power_of_two((size_t)42), 64,
+                  "Math doesn't exist anymore");
+  rusty_assert_eq(rusty::next_power_of_two((size_t)233), 256);
+
+  return EXIT_SUCCESS;
+}