diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-03-04 18:44:13 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-03-04 18:46:18 +0100 |
| commit | b8db320bf14e327bcd12279871b914d8635ef122 (patch) | |
| tree | f9e1018ff8f1b4423264a4c11e087c296f36864b /src/common/Debugging/Errors.h | |
| parent | 61829e269e31d58161614e745a24c12972ec8e97 (diff) | |
Core/Misc: Prefix all preprocessor defines from CompilerDefs with TRINITY_ to avoid conflicts (PLATFORM_WINDOWS is used/defined by CascLib)
Diffstat (limited to 'src/common/Debugging/Errors.h')
| -rw-r--r-- | src/common/Debugging/Errors.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/Debugging/Errors.h b/src/common/Debugging/Errors.h index bf06d77d303..c21972af906 100644 --- a/src/common/Debugging/Errors.h +++ b/src/common/Debugging/Errors.h @@ -38,7 +38,7 @@ namespace Trinity } // namespace Trinity -#if COMPILER == COMPILER_MICROSOFT +#if TRINITY_COMPILER == TRINITY_COMPILER_MICROSOFT #define ASSERT_BEGIN __pragma(warning(push)) __pragma(warning(disable: 4127)) #define ASSERT_END __pragma(warning(pop)) #else |