Changeset 80

Timestamp:

06/02/13 09:25:36 (12 years ago)

Author:

melon

Message:

Wrong THROW used in common.hh.
No message was returned with NV_THROW

Removed a single tab in logging [;

Location:

trunk/nv

Files:

• common.hh (modified) (2 diffs)
• logging.hh (modified) (1 diff)

trunk/nv/common.hh

@@ -119 +119 @@
 #define NV_ASSERT(cond, msg) assert( (cond) && msg )
 #define NV_THROW(eobj, ...) { \
-        NV_LOG( LOG_ERROR, __FILE__ " line " NV_STRINGIZE(__LINE__) " - exception thrown - " #eobj ); \
+        NV_LOG( nv::LOG_ERROR, __FILE__ " line " NV_STRINGIZE(__LINE__) " - exception thrown - " #eobj ); \
   throw eobj( __VA_ARGS__ ); \
 } 
@@ -179 +179 @@
 {
 #if NV_DEBUG
-        T* p = dynamic_cast<T*>(x);
-        if (p == 0) THROW( std::bad_cast, () );
-        return p;
+    T* p = dynamic_cast<T*>(x);
+    if (p == 0)
+    {
+        NV_THROW( std::bad_cast, "dynamic_cast returned NULL" );
+    }
+
+    return p;
 #else
-        return static_cast<T*>(x);
+    return static_cast<T*>(x);
 #endif
 }

trunk/nv/logging.hh

@@ -23 +23 @@
     enum log_level
     {
-                LOG_NONE     = 0,
+        LOG_NONE     = 0,
         LOG_FATAL    = 10,
         LOG_CRITICAL = 20,