Revision: 69051
http://sourceforge.net/p/brlcad/code/69051
Author: brlcad
Date: 2016-10-13 16:55:46 +0000 (Thu, 13 Oct 2016)
Log Message:
-----------
remove the other BU_ASSERT_* macros. bomb log should provide values at this
point.
Modified Paths:
--------------
brlcad/trunk/include/bu/defines.h
Modified: brlcad/trunk/include/bu/defines.h
===================================================================
--- brlcad/trunk/include/bu/defines.h 2016-10-13 15:22:49 UTC (rev 69050)
+++ brlcad/trunk/include/bu/defines.h 2016-10-13 16:55:46 UTC (rev 69051)
@@ -177,19 +177,6 @@
* Quick and easy macros to generate an informative error message and
* abort execution if the specified condition does not hold true.
*
- * @def BU_ASSERT_PTR(eqn)
- * Quick and easy macros to generate an informative error message and
- * abort execution if the specified condition does not hold true.
- *
- * @def BU_ASSERT_LONG(eqn)
- * Quick and easy macros to generate an informative error message and
- * abort execution if the specified condition does not hold true.
- *
- * @def BU_ASSERT_DOUBLE(eqn)
- * Quick and easy macros to generate an informative error message and
- * abort execution if the specified condition does not hold true.
- *
- * Example: BU_ASSERT_LONG(j+7, <, 42);
*/
#ifdef NO_BOMBING_MACROS
# define BU_ASSERT(_equation) (void)(_equation)
@@ -202,70 +189,7 @@
}
#endif
-#ifdef NO_BOMBING_MACROS
-# define BU_ASSERT_PTR(_lhs, _relation, _rhs) (void)(_lhs); (void)(_rhs)
-#else
-# define BU_ASSERT_PTR(_lhs, _relation, _rhs) \
- if (UNLIKELY(!((_lhs) _relation (_rhs)))) { \
- bu_log("BU_ASSERT_PTR(" #_lhs #_relation #_rhs ") failed, lhs=%p,
rhs=%p, file %s, line %d\n", \
- (void *)(_lhs), (void *)(_rhs), \
- __FILE__, __LINE__); \
- bu_bomb("BU_ASSERT_PTR failure\n"); \
- }
-#endif
-
-#ifdef NO_BOMBING_MACROS
-# define BU_ASSERT_LONG(_lhs, _relation, _rhs) (void)(_lhs); (void)(_rhs)
-#else
-# define BU_ASSERT_LONG(_lhs, _relation, _rhs) \
- if (UNLIKELY(!((_lhs) _relation (_rhs)))) { \
- bu_log("BU_ASSERT_LONG(" #_lhs #_relation #_rhs ") failed, lhs=%ld,
rhs=%ld, file %s, line %d\n", \
- (long)(_lhs), (long)(_rhs), \
- __FILE__, __LINE__); \
- bu_bomb("BU_ASSERT_LONG failure\n"); \
- }
-#endif
-
-
-#ifdef NO_BOMBING_MACROS
-# define BU_ASSERT_SIZE_T(_lhs, _relation, _rhs) (void)(_lhs); (void)(_rhs)
-#else
-# define BU_ASSERT_SIZE_T(_lhs, _relation, _rhs) \
- if (UNLIKELY(!((_lhs) _relation (_rhs)))) { \
- bu_log("BU_ASSERT_SIZE_T(" #_lhs #_relation #_rhs ") failed, lhs=%zd,
rhs=%zd, file %s, line %d\n", \
- (size_t)(_lhs), (size_t)(_rhs), \
- __FILE__, __LINE__); \
- bu_bomb("BU_ASSERT_SIZE_T failure\n"); \
- }
-#endif
-
-
-#ifdef NO_BOMBING_MACROS
-# define BU_ASSERT_SSIZE_T(_lhs, _relation, _rhs) (void)(_lhs); (void)(_rhs)
-#else
-# define BU_ASSERT_SSIZE_T(_lhs, _relation, _rhs) \
- if (UNLIKELY(!((_lhs) _relation (_rhs)))) { \
- bu_log("BU_ASSERT_SSIZE_T(" #_lhs #_relation #_rhs ") failed, lhs=%zd,
rhs=%zd, file %s, line %d\n", \
- (ssize_t)(_lhs), (ssize_t)(_rhs), \
- __FILE__, __LINE__); \
- bu_bomb("BU_ASSERT_SSIZE_T failure\n"); \
- }
-#endif
-
-
-#ifdef NO_BOMBING_MACROS
-# define BU_ASSERT_DOUBLE(_lhs, _relation, _rhs) (void)(_lhs); (void)(_rhs)
-#else
-# define BU_ASSERT_DOUBLE(_lhs, _relation, _rhs) \
- if (UNLIKELY(!((_lhs) _relation (_rhs)))) { \
- bu_log("BU_ASSERT_DOUBLE(" #_lhs #_relation #_rhs ") failed, lhs=%lf,
rhs=%lf, file %s, line %d\n", \
- (double)(_lhs), (double)(_rhs), \
- __FILE__, __LINE__); \
- bu_bomb("BU_ASSERT_DOUBLE failure\n"); \
- }
-#endif
-
/**
* fastf_t - Intended to be the fastest floating point data type on
* the current machine, with at least 64 bits of precision. On 16 and
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
