Changeset 2398 for box/trunk/lib/common/Box.h

Timestamp:

05/12/2008 20:32:09 (3 years ago)

Author:

chris

Message:

Reformat ASSERT macro for readability.

Reformat THROW_EXCEPTION macro to avoid overlong lines.

Add THROW_EXCEPTION_MESSAGE macro to allow throwing an exception with
a message, such as the file name that caused the exception.

File:

• box/trunk/lib/common/Box.h (modified) (2 diffs)

box/trunk/lib/common/Box.h

@@ -43 +43 @@
         #define ASSERT_FAILS_TO_SYSLOG_ON {AssertFailuresToSyslog = true;}
         void BoxDebugAssertFailed(const char *cond, const char *file, int line);
-        #define ASSERT(cond) {if(!(cond)) {BoxDebugAssertFailed(#cond, __FILE__, __LINE__); THROW_EXCEPTION(CommonException, AssertFailed)}}
+        #define ASSERT(cond) \
+        { \
+                if(!(cond)) \
+                { \
+                        BoxDebugAssertFailed(#cond, __FILE__, __LINE__); \
+                        THROW_EXCEPTION_MESSAGE(CommonException, \
+                                AssertFailed, #cond); \
+                } \
+        }
 
         // Note that syslog tracing is independent of BoxDebugTraceOn,
@@ -97 +105 @@
         { \
                 OPTIONAL_DO_BACKTRACE \
-                BOX_WARNING("Exception thrown: " #type "(" #subtype ") at " \
-                        __FILE__ "(" << __LINE__ << ")") \
+                BOX_WARNING("Exception thrown: " #type "(" #subtype ") " \
+                        "at " __FILE__ "(" << __LINE__ << ")") \
                 throw type(type::subtype); \
         }
 
+#define THROW_EXCEPTION_MESSAGE(type, subtype, message) \
+        { \
+                OPTIONAL_DO_BACKTRACE \
+                BOX_WARNING("Exception thrown: " #type "(" #subtype ") " \
+                        " (" message ") at " \
+                        __FILE__ "(" << __LINE__ << ")") \
+                throw type(type::subtype, message); \
+        }
+
 // extra macros for converting to network byte order
-
 #ifdef HAVE_NETINET_IN_H
         #include <netinet/in.h>