Changeset 2305

Timestamp:

Dec 2, 2008, 4:53:34 PM (16 years ago)

Author:

rgrieder

Message:

• Exported Exception displaying to an inline function instead of the exception constructor. This will make things easier with the SpecificExceptions. Going to do that when merging with OH2.
• Added abort() statement to the global exception "try" in RootGameState
• Changed global exception "try" to be activated always except when using the msvc debugger.

Location:

code/branches/physics/src

Files:

• core/RootGameState.cc (modified) (3 diffs)
• util/Exception.h (modified) (3 diffs)

code/branches/physics/src/core/RootGameState.cc

@@ -130 +130 @@
     void RootGameState::start()
     {
-#ifdef NDEBUG
+        // Don't catch errors when having a debugger in msvc
+#if ORXONOX_COMPILER != ORXONOX_COMPILER_MSVC || defined(NDEBUG)
         try
         {
@@ -156 +157 @@
 
             this->deactivate();
-#ifdef NDEBUG
+#if ORXONOX_COMPILER != ORXONOX_COMPILER_MSVC || defined(NDEBUG)
         }
         // Note: These are all unhandled exceptions that should not have made its way here!
@@ -162 +163 @@
         catch (std::exception& ex)
         {
-            COUT(1) << ex.what() << std::endl;
-            COUT(1) << "Program aborted." << std::endl;
+            COUT(0) << ex.what() << std::endl;
+            COUT(0) << "Program aborted." << std::endl;
+            abort();
         }
         // anything that doesn't inherit from std::exception
         catch (...)
         {
-            COUT(1) << "An unidentifiable exception has occured. Program aborted." << std::endl;
+            COUT(0) << "An unidentifiable exception has occured. Program aborted." << std::endl;
+            abort();
         }
 #endif

code/branches/physics/src/util/Exception.h

@@ -103 +103 @@
                   : Exception(description, lineNumber, filename, functionName)
         {
-            // let the catcher decide whether to display the message below level 4
-            COUT(4) << this->getFullDescription() << std::endl;
         }
 
@@ -110 +108 @@
             : Exception(description)
         {
-            // let the catcher decide whether to display the message below level 4
-            COUT(4) << this->getFullDescription() << std::endl;
         }
 
@@ -148 +144 @@
     CREATE_ORXONOX_EXCEPTION(GameState);
 
+    /**
+    @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 SpecificException<Exception::type>(description, __LINE__, __FILE__, __FUNCTIONNAME__)
+    throw InternalHandleException(SpecificException<Exception::type>(description, __LINE__, __FILE__, __FUNCTIONNAME__))
 
     // define an assert macro that can display a message