Prepare for boost 1.62

These changes are compatible with previous boost releases.

src/ripple/beast/asio/ssl_error.h

@@ -20,6 +20,11 @@
 #ifndef BEAST_ASIO_SSL_ERROR_H_INCLUDED
 #define BEAST_ASIO_SSL_ERROR_H_INCLUDED
 
+// The first two includes must come first to work around boost 1.62 asio header bugs
+#ifdef _MSC_VER
+#  include <winsock2.h>
+#endif
+#include <boost/asio/ssl/detail/openssl_types.hpp>
 #include <boost/asio.hpp>
 //#include <boost/asio/error.hpp> // Causes error with WinSock.h
 #include <boost/asio/ssl/error.hpp>

src/test/rpc/ServerInfo_test.cpp

@@ -22,6 +22,8 @@
 #include <ripple/test/jtx.h>
 #include <ripple/beast/unit_test.h>
 
+#include <boost/format.hpp>
+
 namespace ripple {
 
 namespace test {