diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-08 21:17:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-08 21:17:33 +0100 |
commit | b9a553f99de109427fc8ac62f7f3de0ec708a1b8 (patch) | |
tree | 9c34bff6630785389209ed8d87fb05cf392024c8 /thirdparty/bullet/Bullet3Common/b3Logging.h | |
parent | 39b1ea50181d84c6fdfcd219a390deb4d522f603 (diff) | |
parent | 29e07dfa4e42b871ee30e398b1c35d1aea68cd57 (diff) |
Merge pull request #34921 from akien-mga/bullet-2.89
bullet: Sync with upstream 2.89
Diffstat (limited to 'thirdparty/bullet/Bullet3Common/b3Logging.h')
-rw-r--r-- | thirdparty/bullet/Bullet3Common/b3Logging.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/thirdparty/bullet/Bullet3Common/b3Logging.h b/thirdparty/bullet/Bullet3Common/b3Logging.h index 9c92b12ebb..f61149de77 100644 --- a/thirdparty/bullet/Bullet3Common/b3Logging.h +++ b/thirdparty/bullet/Bullet3Common/b3Logging.h @@ -14,20 +14,8 @@ extern "C" //#define b3Printf b3OutputPrintfVarArgsInternal //#define b3Printf(...) printf(__VA_ARGS__) //#define b3Printf(...) - -#define b3Warning(...) \ - do \ - { \ - b3OutputWarningMessageVarArgsInternal("b3Warning[%s,%d]:\n", __FILE__, __LINE__); \ - b3OutputWarningMessageVarArgsInternal(__VA_ARGS__); \ - } while (0) -#define b3Error(...) \ - do \ - { \ - b3OutputErrorMessageVarArgsInternal("b3Error[%s,%d]:\n", __FILE__, __LINE__); \ - b3OutputErrorMessageVarArgsInternal(__VA_ARGS__); \ - } while (0) - +#define b3Warning(...) do{ b3OutputWarningMessageVarArgsInternal("b3Warning[%s,%d]:\n", __FILE__, __LINE__);b3OutputWarningMessageVarArgsInternal(__VA_ARGS__);} while (0) +#define b3Error(...)do {b3OutputErrorMessageVarArgsInternal("b3Error[%s,%d]:\n", __FILE__, __LINE__);b3OutputErrorMessageVarArgsInternal(__VA_ARGS__);} while (0) #ifndef B3_NO_PROFILE void b3EnterProfileZone(const char* name); |