merged

f61f402f · Davis King · 55a74bba · 35b3e65b · f61f402f · f61f402f
Commit f61f402f authored Sep 28, 2016 by Davis King
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

assert.h dlib/assert.h +2 -2

sockets_kernel_1.cpp dlib/sockets/sockets_kernel_1.cpp +2 -1

No files found.
--- a/dlib/assert.h
+++ b/dlib/assert.h
@@ -37,11 +37,11 @@
 #elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && defined(__GXX_EXPERIMENTAL_CXX0X__) 
 #   define DLIB_HAS_RVALUE_REFERENCES
 #   define DLIB_HAS_INITIALIZER_LISTS
-#elif defined(_MSC_VER) && _MSC_VER >= 1600
-#   define DLIB_HAS_RVALUE_REFERENCES
 #elif defined(_MSC_VER) && _MSC_VER >= 1800
 #   define DLIB_HAS_INITIALIZER_LISTS
 #   define DLIB_HAS_RVALUE_REFERENCES
+#elif defined(_MSC_VER) && _MSC_VER >= 1600
+#   define DLIB_HAS_RVALUE_REFERENCES
 #elif defined(__INTEL_COMPILER) && defined(BOOST_INTEL_STDCXX0X)
 #   define DLIB_HAS_RVALUE_REFERENCES
 #   define DLIB_HAS_INITIALIZER_LISTS

--- a/dlib/sockets/sockets_kernel_1.cpp
+++ b/dlib/sockets/sockets_kernel_1.cpp
@@ -6,6 +6,8 @@

 #ifdef WIN32

+#include <winsock2.h>
+
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_   /* Prevent inclusion of winsock.h in windows.h */
 #endif
@@ -15,7 +17,6 @@
 #include "sockets_kernel_1.h"

 #include <windows.h>
-#include <winsock2.h>

 #ifndef NI_MAXHOST
 #define NI_MAXHOST 1025