Changeset 2662 for code/trunk/src/util/Exception.h

Timestamp:

Feb 14, 2009, 10:17:35 PM (16 years ago)

Author:

rgrieder

Message:

Merged presentation branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.h (modified) (3 diffs, 1 prop)

code/trunk/src/util/Exception.h

@@ -82 +82 @@
                   const char* filename, const char* functionName)                   \
                   : Exception(description, lineNumber, filename, functionName)      \
-        {                                                                           \
-            /* Let the catcher decide whether to display the message below level 4  \
-               Note: Don't place this code in Exception c'tor because getTypeName() \
-               is still pure virtual at that time. */                               \
-            COUT(4) << this->getFullDescription() << std::endl;                     \
-        }                                                                           \
+        { }                                                                         \
                                                                                     \
         ExceptionName##Exception(const std::string& description)                    \
                   : Exception(description)                                          \
-        { COUT(4) << this->getFullDescription() << std::endl; }                     \
+        { }                                                                         \
                                                                                     \
         ~ExceptionName##Exception() throw() { }                                     \
@@ -103 +98 @@
     CREATE_ORXONOX_EXCEPTION(FileNotFound);
     CREATE_ORXONOX_EXCEPTION(Argument);
+    CREATE_ORXONOX_EXCEPTION(PhysicsViolation);
+    CREATE_ORXONOX_EXCEPTION(ParseError);
     CREATE_ORXONOX_EXCEPTION(PluginsNotFound);
     CREATE_ORXONOX_EXCEPTION(InitialisationFailed);
@@ -111 +108 @@
 }
 
-#define ThrowException(Type, Description) \
-    throw Type##Exception(Description, __LINE__, __FILE__, __FUNCTIONNAME__)
+    /**
+    @brief
+        Helper function that creates an exception, displays the message, but doesn't throw it.
+    */
+    template <class T>
+    inline const T& InternalHandleException(const T& exception)
+    {
+        // let the catcher decide whether to display the message below level 4
+        COUT(4) << exception.getFullDescription() << std::endl;
+        return exception;
+    }
+
+#define ThrowException(type, description) \
+    throw InternalHandleException(type##Exception(description, __LINE__, __FILE__, __FUNCTIONNAME__))
 
     // define an assert macro that can display a message