Fixing compilation error from merge.

stgates · stgates · commit 57c01d697499 · 2014-11-06T16:24:53.000-08:00
diff --git a/Release/include/cpprest/ws_msg.h b/Release/include/cpprest/ws_msg.h
@@ -232,7 +232,7 @@ class websocket_incoming_message
     /// <returns>websocket_message_type</returns>
     websocket_message_type message_type() const
     {
-        return _m_impl->message_type();
+        return m_msg_type;
     }
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ class websocket_incoming_message`
`232`	`232`	`/// <returns>websocket_message_type</returns>`
`233`	`233`	`websocket_message_type message_type() const`
`234`	`234`	`{`
`235`		`- return _m_impl->message_type();`
	`235`	`+ return m_msg_type;`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`private:`