From 0a47a9a78cb7e10184f78ec8191c08c07ca4576d Mon Sep 17 00:00:00 2001
From: Peter Thorson <github@zaphoyd.com>
Date: Mon, 8 Dec 2014 18:56:28 -0500
Subject: [PATCH] adjust example exception behavior to match latest spec

---
 examples/broadcast_server/broadcast_server.cpp     | 6 +-----
 examples/echo_server/echo_server.cpp               | 4 +---
 examples/iostream_server/iostream_server.cpp       | 6 +-----
 examples/sip_client/sip_client.cpp                 | 6 +-----
 examples/subprotocol_server/subprotocol_server.cpp | 6 +-----
 examples/testee_client/testee_client.cpp           | 6 +-----
 examples/testee_server/testee_server.cpp           | 6 +-----
 7 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/examples/broadcast_server/broadcast_server.cpp b/examples/broadcast_server/broadcast_server.cpp
index ad17cc5..92b59b4 100644
--- a/examples/broadcast_server/broadcast_server.cpp
+++ b/examples/broadcast_server/broadcast_server.cpp
@@ -67,10 +67,6 @@ public:
             m_server.run();
         } catch (const std::exception & e) {
             std::cout << e.what() << std::endl;
-        } catch (websocketpp::lib::error_code e) {
-            std::cout << e.message() << std::endl;
-        } catch (...) {
-            std::cout << "other exception" << std::endl;
         }
     }
 
@@ -154,7 +150,7 @@ int main() {
 
     t.join();
 
-    } catch (std::exception & e) {
+    } catch (websocketpp::exception const & e) {
         std::cout << e.what() << std::endl;
     }
 }
diff --git a/examples/echo_server/echo_server.cpp b/examples/echo_server/echo_server.cpp
index 59fc1fc..5ec576f 100644
--- a/examples/echo_server/echo_server.cpp
+++ b/examples/echo_server/echo_server.cpp
@@ -50,10 +50,8 @@ int main() {
 
         // Start the ASIO io_service run loop
         echo_server.run();
-    } catch (const std::exception & e) {
+    } catch (websocketpp::exception const & e) {
         std::cout << e.what() << std::endl;
-    } catch (websocketpp::lib::error_code e) {
-        std::cout << e.message() << std::endl;
     } catch (...) {
         std::cout << "other exception" << std::endl;
     }
diff --git a/examples/iostream_server/iostream_server.cpp b/examples/iostream_server/iostream_server.cpp
index 0114fbf..6843659 100644
--- a/examples/iostream_server/iostream_server.cpp
+++ b/examples/iostream_server/iostream_server.cpp
@@ -82,12 +82,8 @@ int main() {
             }
             con->eof();
         }
-    } catch (const std::exception & e) {
+    } catch (websocketpp::exception const & e) {
         std::cout << e.what() << std::endl;
-    } catch (websocketpp::lib::error_code e) {
-        std::cout << e.message() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
     }
     log.close();
 }
diff --git a/examples/sip_client/sip_client.cpp b/examples/sip_client/sip_client.cpp
index 0854955..66fa857 100644
--- a/examples/sip_client/sip_client.cpp
+++ b/examples/sip_client/sip_client.cpp
@@ -78,11 +78,7 @@ int main(int argc, char* argv[]) {
 
         std::cout << "done" << std::endl;
 
-    } catch (const std::exception & e) {
+    } catch (websocketpp::exception const & e) {
         std::cout << e.what() << std::endl;
-    } catch (websocketpp::lib::error_code e) {
-        std::cout << e.message() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
     }
 }
diff --git a/examples/subprotocol_server/subprotocol_server.cpp b/examples/subprotocol_server/subprotocol_server.cpp
index ecf8fec..9593c01 100644
--- a/examples/subprotocol_server/subprotocol_server.cpp
+++ b/examples/subprotocol_server/subprotocol_server.cpp
@@ -42,11 +42,7 @@ int main() {
         s.start_accept();
 
         s.run();
-    } catch (const std::exception & e) {
+    } catch (websocketpp::exception const & e) {
         std::cout << e.what() << std::endl;
-    } catch (websocketpp::lib::error_code e) {
-        std::cout << e.message() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
     }
 }
diff --git a/examples/testee_client/testee_client.cpp b/examples/testee_client/testee_client.cpp
index 57f5043..d191df5 100644
--- a/examples/testee_client/testee_client.cpp
+++ b/examples/testee_client/testee_client.cpp
@@ -74,11 +74,7 @@ int main(int argc, char* argv[]) {
 
         std::cout << "done" << std::endl;
 
-    } catch (const std::exception & e) {
+    } catch (websocketpp::exception const & e) {
         std::cout << e.what() << std::endl;
-    } catch (websocketpp::lib::error_code e) {
-        std::cout << e.message() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
     }
 }
diff --git a/examples/testee_server/testee_server.cpp b/examples/testee_server/testee_server.cpp
index 1c9910e..d44368c 100644
--- a/examples/testee_server/testee_server.cpp
+++ b/examples/testee_server/testee_server.cpp
@@ -132,11 +132,7 @@ int main(int argc, char * argv[]) {
             }
         }
 
-    } catch (const std::exception & e) {
+    } catch (websocketpp::exception const & e) {
         std::cout << "exception: " << e.what() << std::endl;
-    } catch (websocketpp::lib::error_code e) {
-        std::cout << "error code: " << e.message() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
     }
 }