Merge pull request #16 from htaox/compile-in-windows

Remove tr1/ prefix if compiling in Windows
pgriess · Apr 14, 2014 · cbb9978 · cbb9978
2 parents 01c8862 + 06b78ac
commit cbb9978
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/deps/msgpack/msgpack/type/tr1/unordered_map.hpp b/deps/msgpack/msgpack/type/tr1/unordered_map.hpp
@@ -19,7 +19,11 @@
 #define MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP__
 
 #include "msgpack/object.hpp"
+#ifdef WIN32
+#include <unordered_map>
+#else
 #include <tr1/unordered_map>
+#endif
 
 namespace msgpack {
 

diff --git a/deps/msgpack/msgpack/type/tr1/unordered_set.hpp b/deps/msgpack/msgpack/type/tr1/unordered_set.hpp
@@ -19,7 +19,11 @@
 #define MSGPACK_TYPE_TR1_UNORDERED_SET_HPP__
 
 #include "msgpack/object.hpp"
+#ifdef WIN32
+#include <unordered_set>
+#else
 #include <tr1/unordered_set>
+#endif
 
 namespace msgpack {