changes generic to general because generic is a reserved word in visual studio

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 );
 }

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() {}
     

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";

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";

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";

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;
 			}
 		}

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";

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";

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";