Clean C++ exception code to only throw exception types

 - Update C++ code to only throw types derived from
   C++ exception

 - Update C++ code to use one-shot constructors to
   create the exceptions

Fix bug ICE-7892

1 files changed, 2 insertions, 2 deletions

diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index 4f5f7503e08..cf4392736eb 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -333,9 +333,9 @@ Client::run(int argc, char* argv[])
             patcher->finish();
         }
     }
-    catch(const string& ex)
+    catch(const exception& ex)
     {
-        consoleErr << argv[0] << ": " << ex << endl;
+        consoleErr << argv[0] << ": " << ex.what() << endl;
         return EXIT_FAILURE;
     }