Merge branch 'pr/608' into develop

# Conflicts:
#	changelog.md

changelog.md

@@ -20,6 +20,7 @@ HEAD
 - Compatibility: Update `telemetry_client` to use a slightly more cross platform
   method of sleeping. Should work on windows now. Thank you Meir Yanovich for
   reporting.
+<<<<<<< HEAD
 - Compatibility: Updated permessage-deflate support to reflect that the zlib
   library does not actually support a sliding window size of 256 bits. 
   WebSocket++ will no longer negotiate 256 bit deflate windows. If the user
@@ -42,6 +43,11 @@ HEAD
 - Compatibility: Add 1014 close code and adds missing descriptions for codes
   1012 and 1013. #589 Thank you jbwdevries and ronneke1996 for reporting and
   patches.
+=======
+- Compatibility: Add hooks to support `mingw-std-threads` C++11 thread and mutex
+  polyfill library as an alternative to Boost. #608 Thank you Peter Taylor for
+  reporting and an initial patch.
+>>>>>>> pr/608
 - Bug: Store loggers in shared pointers to avoid crashes related to connections
   trying to write logs entries after their respective endpoint has been
   deallocated. Thank you Thalhammer for reporting and Jupp Müller for the 

docs/faq.dox

@@ -72,12 +72,14 @@ To specify the type of an outgoing message, use the frame opcode values listed a
 ## Dependency Management
 
 ### Can WebSocket++ be used without Boost?
-Yes. WebSocket++ only uses Boost features as polyfills for C++11 language features and libraries. If you have a C++11 compiler and standard library you can use WebSocket++ without Boost. In most cases setting your build environment to use the C++11 (or later) language dialect is sufficient to enable this mode of use. 
+Yes. WebSocket++ only uses Boost features as polyfills for C++11 language features and libraries. If you have a C++11 compiler and standard library you can use WebSocket++ without Boost. In most cases setting your build environment to use the C++11 (or later) language dialect is sufficient to enable this mode of use.
 
 With less common compilers (and sometimes very recently release compilers) there may be specific issues with certain libraries that aren't automatically detected by the library. For these situations there are additional defines available to fine tune which C++11 libraries and features are used. TODO: more details about them.
 
 For the iostream/raw transport the C++11 standard library is sufficient. For the Asio based transports, there is no C++11 library that provides the networking capabilaties that Asio does. As such even with a C++11 build system, you will need a standalone copy of Asio to use if Boost Asio is not available.
 
+MinGW users who want to avoid Boost should also consult the nearby question about MinGW compatibility.
+
 ### Can WebSocket++ be used with standalone Asio
 Yes. The process is the same as used with standalone Asio itself. Define `ASIO_STANDALONE` before including Asio or WebSocket++ headers. You will need to download a copy of the Asio headers separately (http://www.think-async.com) and make sure they are in your build system's include path.
 
@@ -91,6 +93,9 @@ The `<websocketpp/config/asio.hpp>` and `<websocketpp/config/asio_client.hpp>` h
 ### Build issues with TLS on recent versions of OS X
 Mac OS X ships a severely outdated version of the OpenSSL library. To securely use TLS with WebSocket++ on OS X you will need to install a modern version of OpenSSL via homebrew or compiling from source.
 
+### Can WebSocket++ be used with MinGW
+Generally, yes. Note that in C++11 mode MinGW does not currently support the C++11 STL `<thread>` library. WebSocket++ requires a thread/mutex library. Options include Boost thread (the default when a compatible C++11 `<thread>` can't be found) or `mingw-std-threads` (https://github.com/meganz/mingw-std-threads) by including those headers and defining `_WEBSOCKETPP_MINGW_THREAD_`.
+
 ## Compression
 
 ### How do I use permessage-deflate in version 0.6.0-permessagedeflate and 0.7.0?

websocketpp/common/thread.hpp

@@ -51,7 +51,11 @@
     #endif
 #endif
 
-#ifdef _WEBSOCKETPP_CPP11_THREAD_
+#ifdef defined(_WEBSOCKETPP_MINGW_THREAD_)
+    #include <mingw-threads/mingw.thread.h>
+    #include <mingw-threads/mingw.mutex.h>
+    #include <mingw-threads/mingw.condition_variable.h>
+#elif _WEBSOCKETPP_CPP11_THREAD_
     #include <thread>
     #include <mutex>
     #include <condition_variable>
@@ -64,7 +68,7 @@
 namespace websocketpp {
 namespace lib {
 
-#ifdef _WEBSOCKETPP_CPP11_THREAD_
+#if defined(_WEBSOCKETPP_CPP11_THREAD_) || defined(_WEBSOCKETPP_MINGW_THREAD_)
     using std::mutex;
     using std::lock_guard;
     using std::thread;