Small define/include fixes for compiling on windows

13 years ago · f6a80bfc95
parent 5f72199419
commit f6a80bfc95
2 changed files with 5 additions and 1 deletions
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@ -1,7 +1,11 @@
 #ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 #define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP

+#ifdef _WIN32
+#include <boost/tr1/tr1/unordered_map>
+#else
 #include <tr1/unordered_map>
+#endif

 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
--- a/components/files/fixedpath.hpp
+++ b/components/files/fixedpath.hpp
@ -30,7 +30,7 @@
    #include <components/files/linuxpath.hpp>
    namespace Files { typedef LinuxPath TargetPathType; }

-#elif defined(__WIN32) || defined(__WINDOWS__)
+#elif defined(__WIN32) || defined(__WINDOWS__) || defined(_WIN32)
    #include <components/files/windowspath.hpp>
    namespace Files { typedef WindowsPath TargetPathType; }