Home Explore Help
Sign In
cpp
/
bx
mirror of https://github.com/bkaradzic/bx.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fixed assert when % is used in condition.

Бранимир Караџић 1 year ago
parent
0ec634e8fd
commit
ad2c097987
2 changed files with 4 additions and 4 deletions
Split View Show Diff Stats
  1. 2 2
      include/bx/macros.h
  2. 2 2
      tests/macros_test.cpp

+ 2 - 2
include/bx/macros.h
View File 

@@ -285,7 +285,7 @@
 
 #define _BX_ASSERT(_condition, _format, ...)                                                                   \
 
 	BX_MACRO_BLOCK_BEGIN                                                                                       \
 
 		if (!BX_IGNORE_C4127(_condition)                                                                       \
 
-		&&  bx::assertFunction(bx::Location::current(), "ASSERT " #_condition " -> " _format, ##__VA_ARGS__) ) \
 
+		&&  bx::assertFunction(bx::Location::current(), "ASSERT %s -> " _format, #_condition, ##__VA_ARGS__) ) \
 
 		{                                                                                                      \
 
 			bx::debugBreak();                                                                                  \
 
 		}                                                                                                      \
 
@@ -294,7 +294,7 @@
 
 #define _BX_ASSERT_LOC(_location, _condition, _format, ...)                                       \
 
 	BX_MACRO_BLOCK_BEGIN                                                                          \
 
 		if  (!BX_IGNORE_C4127(_condition)                                                         \
 
-		&&   bx::assertFunction(_location, "ASSERT " #_condition " -> " _format, ##__VA_ARGS__) ) \
 
+		&&   bx::assertFunction(_location, "ASSERT %s -> " _format, #_condition, ##__VA_ARGS__) ) \
 
 		{                                                                                         \
 
 			bx::debugBreak();                                                                     \
 
 		}                                                                                         \

+ 2 - 2
tests/macros_test.cpp
View File 

@@ -30,7 +30,7 @@ BX_NO_INLINE void unusedFunction()
 
 
 void testAssert()
 
 {
 
-	BX_ASSERT(false, "Assert works!");
 
+	BX_ASSERT(false % 1, "Assert works!");
 
 }
 
 
 TEST_CASE("Macros", "")
 
@@ -51,7 +51,7 @@ TEST_CASE("Macros", "")
 
 	REQUIRE(5 == BX_VA_ARGS_COUNT(1, 2, 3, 4, 5) );
 
 	REQUIRE(6 == BX_VA_ARGS_COUNT(1, 2, 3, 4, 5, 6) );
 
 
-	REQUIRE(0 == bx::strCmp(BX_STRINGIZE(TEST 1234 %^&*), "TEST 1234 %^&*") );
 
+	REQUIRE(0 == bx::strCmp(BX_STRINGIZE(TEST 1234 % 1 ^&*), "TEST 1234 % 1 ^&*") );
 
 
 	{
 
 		struct PodStruct { int32_t x, y, z; };