Changeset 88
- Timestamp:
- 06/02/13 19:12:35 (13 years ago)
- Location:
- trunk/nv
- Files:
-
- 2 edited
-
common.hh (modified) (2 diffs)
-
logging.hh (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/nv/common.hh
r80 r88 120 120 #define NV_THROW(eobj, ...) { \ 121 121 NV_LOG( nv::LOG_ERROR, __FILE__ " line " NV_STRINGIZE(__LINE__) " - exception thrown - " #eobj ); \ 122 throw eobj( __VA_ARGS__ ); \122 throw eobj( __VA_ARGS__ ); \ 123 123 } 124 124 … … 179 179 { 180 180 #if NV_DEBUG 181 T* p = dynamic_cast<T*>(x);182 if (p == 0)183 {184 NV_THROW( std::bad_cast, "dynamic_cast returned NULL" );185 }181 T* p = dynamic_cast<T*>(x); 182 if (p == 0) 183 { 184 NV_THROW( std::bad_cast, "dynamic_cast returned NULL" ); 185 } 186 186 187 return p;187 return p; 188 188 #else 189 return static_cast<T*>(x);189 return static_cast<T*>(x); 190 190 #endif 191 191 } -
trunk/nv/logging.hh
r80 r88 21 21 { 22 22 23 enum log_level24 {25 LOG_NONE = 0,26 LOG_FATAL = 10,27 LOG_CRITICAL = 20,28 LOG_ERROR = 30,29 LOG_WARNING = 40,30 LOG_NOTICE = 50,31 LOG_INFO = 60,32 LOG_DEBUG = 80,33 LOG_TRACE = 10034 };23 enum log_level 24 { 25 LOG_NONE = 0, 26 LOG_FATAL = 10, 27 LOG_CRITICAL = 20, 28 LOG_ERROR = 30, 29 LOG_WARNING = 40, 30 LOG_NOTICE = 50, 31 LOG_INFO = 60, 32 LOG_DEBUG = 80, 33 LOG_TRACE = 100 34 }; 35 35 36 36 class logger_base : public singleton< logger_base > … … 53 53 54 54 #define NV_LOG(level, message_stream) \ 55 if ( nv::logger_base::is_valid() && \55 if ( nv::logger_base::is_valid() && \ 56 56 (unsigned int)nv::logger_base::reference().get_level() >= level ) \ 57 { \58 std::stringstream ss; \59 ss << message_stream; \60 nv::logger_base::reference().log( level, ss.str() ); \61 }57 { \ 58 std::stringstream ss; \ 59 ss << message_stream; \ 60 nv::logger_base::reference().log( level, ss.str() ); \ 61 } 62 62 63 63 #if NV_DEBUG == 1
Note: See TracChangeset
for help on using the changeset viewer.
