Changeset 7960 for code/branches/kicklib/src/libraries/util/Exception.cc

Timestamp:

Feb 25, 2011, 3:07:17 AM (14 years ago)

Author:

rgrieder

Message:

Applied C++ code changes to compile Orxonox with CEGUI 0.7 (does not run yet).

File:

• code/branches/kicklib/src/libraries/util/Exception.cc (modified) (1 diff)

code/branches/kicklib/src/libraries/util/Exception.cc

@@ -95 +95 @@
             throw;
         }
-        catch (const std::exception& ex)
-        {
-            return ex.what();
-        }
         catch (const CEGUI::Exception& ex)
         {
             return GeneralException(ex.getMessage().c_str(), ex.getLine(),
                 ex.getFileName().c_str(), ex.getName().c_str()).getDescription();
+        }
+        catch (const std::exception& ex)
+        {
+            return ex.what();
         }
         catch (...)