Changeset 7174 for code/trunk/src/libraries/core/input

Timestamp:

Aug 18, 2010, 12:08:05 AM (14 years ago)

Author:

rgrieder

Message:

Only catch exceptions you actually expect. And rethrow unknown exceptions ("…" can also catch internal Microsoft exceptions like floating point exception).

Location:

code/trunk/src/libraries/core/input

Files:

• InputDevice.h (modified) (2 diffs)
• InputManager.cc (modified) (2 diffs)

code/trunk/src/libraries/core/input/InputDevice.h

@@ -40 +40 @@
 #include <vector>
 #include <ois/OISInputManager.h>
+#include <ois/OISException.h>
 
 #include "util/Clock.h"
@@ -144 +145 @@
                 oisInputManager_->destroyInputObject(oisDevice_);
             }
-            catch (...)
+            catch (const OIS::Exception& ex)
             {
-                COUT(1) << this->getClassName() << " destruction failed: " << Exception::handleMessage() << std::endl
+                COUT(1) << this->getClassName() << " destruction failed: " << ex.eText << std::endl
                         << "    Potential resource leak!" << std::endl;
             }

code/trunk/src/libraries/core/input/InputManager.cc

@@ -306 +306 @@
                 continue;
             const std::string& className = device->getClassName();
-            try
-            {
-                delete device;
-                device = 0;
-                CCOUT(4) << className << " destroyed." << std::endl;
-            }
-            catch (...)
-            {
-                COUT(1) << className << " destruction failed: " << Exception::handleMessage() << std::endl
-                        << "    Potential resource leak!" << std::endl;
-            }
+            delete device;
+            device = 0;
+            CCOUT(4) << className << " destroyed." << std::endl;
         }
         devices_.resize(InputDeviceEnumerator::FirstJoyStick);
@@ -325 +317 @@
             OIS::InputManager::destroyInputSystem(oisInputManager_);
         }
-        catch (...)
-        {
-            COUT(1) << "OIS::InputManager destruction failed" << Exception::handleMessage() << std::endl
+        catch (const OIS::Exception& ex)
+        {
+            COUT(1) << "OIS::InputManager destruction failed" << ex.eText << std::endl
                     << "    Potential resource leak!" << std::endl;
         }