diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-09-07 15:09:02 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 15:09:02 -0300 |
| commit | ec4b8e4a5a96457ef5f88f87205363b86b7c7615 (patch) | |
| tree | 7a984cec670365b967671afdccb4de41aaad4c5b /thirdparty/bullet/BulletInverseDynamics/IDErrorMessages.hpp | |
| parent | 6ce9951d9e487cfacec40ea27e2a2be241d9da77 (diff) | |
| parent | 6142448417f4e15bf0bc0c94df7d1862a790e3c7 (diff) | |
Merge pull request #21836 from AndreaCatania/bulletUpdate
Update bullet to Master 12409f1118a7c7a266f9071350c70789dfe73bb9
Diffstat (limited to 'thirdparty/bullet/BulletInverseDynamics/IDErrorMessages.hpp')
| -rw-r--r-- | thirdparty/bullet/BulletInverseDynamics/IDErrorMessages.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/thirdparty/bullet/BulletInverseDynamics/IDErrorMessages.hpp b/thirdparty/bullet/BulletInverseDynamics/IDErrorMessages.hpp index 1dc22f860a..1b3fd268a0 100644 --- a/thirdparty/bullet/BulletInverseDynamics/IDErrorMessages.hpp +++ b/thirdparty/bullet/BulletInverseDynamics/IDErrorMessages.hpp @@ -7,19 +7,19 @@ #if !defined(BT_ID_WO_BULLET) && !defined(BT_USE_INVERSE_DYNAMICS_WITH_BULLET2) #include "Bullet3Common/b3Logging.h" -#define error_message(...) b3Error(__VA_ARGS__) -#define warning_message(...) b3Warning(__VA_ARGS__) +#define bt_id_error_message(...) b3Error(__VA_ARGS__) +#define bt_id_warning_message(...) b3Warning(__VA_ARGS__) #define id_printf(...) b3Printf(__VA_ARGS__) #else // BT_ID_WO_BULLET #include <cstdio> /// print error message with file/line information -#define error_message(...) \ +#define bt_id_error_message(...) \ do { \ fprintf(stderr, "[Error:%s:%d] ", __INVDYN_FILE_WO_DIR__, __LINE__); \ fprintf(stderr, __VA_ARGS__); \ } while (0) /// print warning message with file/line information -#define warning_message(...) \ +#define bt_id_warning_message(...) \ do { \ fprintf(stderr, "[Warning:%s:%d] ", __INVDYN_FILE_WO_DIR__, __LINE__); \ fprintf(stderr, __VA_ARGS__); \ |