Browse Source

Allow using JPH_ASSERT outside of the JPH namespace

Jorrit Rouwe 1 year ago
parent
commit
ff4ce177f4
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Jolt/Core/IssueReporting.h

+ 1 - 1
Jolt/Core/IssueReporting.h

@@ -26,7 +26,7 @@ JPH_EXPORT extern TraceFunction Trace;
 	inline bool AssertFailedParamHelper(const char *inExpression, const char *inFile, uint inLine, const char *inMessage, AssertLastParam) { return AssertFailed(inExpression, inMessage, inFile, inLine); }
 	inline bool AssertFailedParamHelper(const char *inExpression, const char *inFile, uint inLine, const char *inMessage, AssertLastParam) { return AssertFailed(inExpression, inMessage, inFile, inLine); }
 
 
 	/// Main assert macro, usage: JPH_ASSERT(condition, message) or JPH_ASSERT(condition)
 	/// Main assert macro, usage: JPH_ASSERT(condition, message) or JPH_ASSERT(condition)
-	#define JPH_ASSERT(inExpression, ...)	do { if (!(inExpression) && AssertFailedParamHelper(#inExpression, __FILE__, uint(__LINE__), ##__VA_ARGS__, AssertLastParam())) JPH_BREAKPOINT; } while (false)
+	#define JPH_ASSERT(inExpression, ...)	do { if (!(inExpression) && AssertFailedParamHelper(#inExpression, __FILE__, JPH::uint(__LINE__), ##__VA_ARGS__, JPH::AssertLastParam())) JPH_BREAKPOINT; } while (false)
 
 
 	#define JPH_IF_ENABLE_ASSERTS(...)		__VA_ARGS__
 	#define JPH_IF_ENABLE_ASSERTS(...)		__VA_ARGS__
 #else
 #else