diff --git a/test/transport/asio/base.cpp b/test/transport/asio/base.cpp index bf5560f1d9..33052cacd3 100644 --- a/test/transport/asio/base.cpp +++ b/test/transport/asio/base.cpp @@ -40,10 +40,10 @@ BOOST_AUTO_TEST_CASE( blank_error ) { BOOST_AUTO_TEST_CASE( asio_error ) { using websocketpp::transport::asio::error::make_error_code; - using websocketpp::transport::asio::error::generic; + using websocketpp::transport::asio::error::general; - websocketpp::lib::error_code ec = make_error_code(generic); + websocketpp::lib::error_code ec = make_error_code(general); - BOOST_CHECK( ec == generic ); + BOOST_CHECK( ec == general ); BOOST_CHECK( ec.value() == 1 ); } \ No newline at end of file diff --git a/websocketpp/error.hpp b/websocketpp/error.hpp index dbb1924156..01f7146ba2 100644 --- a/websocketpp/error.hpp +++ b/websocketpp/error.hpp @@ -37,7 +37,7 @@ namespace websocketpp { namespace error { enum value { /// Catch-all library error - generic = 1, + general = 1, /// send attempted when endpoint write queue was full send_queue_full, @@ -90,7 +90,7 @@ public: std::string message(int value) const { switch(value) { - case error::generic: + case error::general: return "Generic error"; case error::send_queue_full: return "send queue full"; @@ -146,7 +146,7 @@ namespace websocketpp { class exception : public std::exception { public: exception(const std::string& msg, - error::value code = error::generic) + error::value code = error::general) : m_msg(msg),m_code(code) {} ~exception() throw() {} diff --git a/websocketpp/extensions/extension.hpp b/websocketpp/extensions/extension.hpp index d41d001d48..7e2c020bd0 100644 --- a/websocketpp/extensions/extension.hpp +++ b/websocketpp/extensions/extension.hpp @@ -52,7 +52,7 @@ namespace extensions { namespace error { enum value { /// Catch all - generic = 1, + general = 1, /// Extension disabled disabled @@ -68,7 +68,7 @@ public: std::string message(int value) const { switch(value) { - case generic: + case general: return "Generic extension error"; case disabled: return "Use of methods from disabled extension"; diff --git a/websocketpp/extensions/permessage_compress/enabled.hpp b/websocketpp/extensions/permessage_compress/enabled.hpp index 5e3afaf16b..386085b6fa 100644 --- a/websocketpp/extensions/permessage_compress/enabled.hpp +++ b/websocketpp/extensions/permessage_compress/enabled.hpp @@ -46,7 +46,7 @@ namespace permessage_compress { namespace error { enum value { /// Catch all - generic = 1, + general = 1, /// Invalid extension parameters invalid_parameters, @@ -77,7 +77,7 @@ public: std::string message(int value) const { switch(value) { - case generic: + case general: return "Generic permessage-compress error"; case invalid_parameters: return "Invalid extension parameters"; diff --git a/websocketpp/processors/base.hpp b/websocketpp/processors/base.hpp index ffc308d990..7f665e3e85 100644 --- a/websocketpp/processors/base.hpp +++ b/websocketpp/processors/base.hpp @@ -77,7 +77,7 @@ namespace error { enum processor_errors { /// Catch-all error for processor policy errors that don't fit in other /// categories - generic = 1, + general = 1, /// Error was the result of improperly formatted user input bad_request, @@ -168,7 +168,7 @@ public: std::string message(int value) const { switch(value) { - case error::generic: + case error::general: return "Generic processor error"; case error::bad_request: return "invalid user input"; diff --git a/websocketpp/processors/hybi13.hpp b/websocketpp/processors/hybi13.hpp index 071229f2e8..2263cba6d8 100644 --- a/websocketpp/processors/hybi13.hpp +++ b/websocketpp/processors/hybi13.hpp @@ -355,7 +355,7 @@ public: } } else { // shouldn't be here - ec = make_error_code(error::generic); + ec = make_error_code(error::general); return 0; } } diff --git a/websocketpp/transport/asio/base.hpp b/websocketpp/transport/asio/base.hpp index acead2508a..d1802a3663 100644 --- a/websocketpp/transport/asio/base.hpp +++ b/websocketpp/transport/asio/base.hpp @@ -50,7 +50,7 @@ namespace error { enum value { /// Catch-all error for transport policy errors that don't fit in other /// categories - generic = 1, + general = 1, /// async_read_at_least call requested more bytes than buffer can store invalid_num_bytes, @@ -67,7 +67,7 @@ public: std::string message(int value) const { switch(value) { - case error::generic: + case error::general: return "Generic asio transport policy error"; case error::invalid_num_bytes: return "async_read_at_least call requested more bytes than buffer can store"; diff --git a/websocketpp/transport/base/connection.hpp b/websocketpp/transport/base/connection.hpp index 09ef4a5e7a..74a14838ac 100644 --- a/websocketpp/transport/base/connection.hpp +++ b/websocketpp/transport/base/connection.hpp @@ -85,7 +85,7 @@ namespace error { enum value { /// Catch-all error for transport policy errors that don't fit in other /// categories - generic = 1, + general = 1, /// underlying transport pass through pass_through, @@ -113,7 +113,7 @@ class category : public lib::error_category { std::string message(int value) const { switch(value) { - case generic: + case general: return "Generic transport policy error"; case pass_through: return "Underlying Transport Error"; diff --git a/websocketpp/transport/iostream/base.hpp b/websocketpp/transport/iostream/base.hpp index aead9b51bd..392a4455bd 100644 --- a/websocketpp/transport/iostream/base.hpp +++ b/websocketpp/transport/iostream/base.hpp @@ -41,7 +41,7 @@ namespace error { enum value { /// Catch-all error for transport policy errors that don't fit in other /// categories - generic = 1, + general = 1, /// async_read_at_least call requested more bytes than buffer can store invalid_num_bytes, @@ -67,7 +67,7 @@ class category : public lib::error_category { std::string message(int value) const { switch(value) { - case generic: + case general: return "Generic iostream transport policy error"; case invalid_num_bytes: return "async_read_at_least call requested more bytes than buffer can store";