Fix compilation error on Windows

Author: flanglet

src/Global.cpp

@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+#include <algorithm>
 #include <stdexcept>
 #include "Global.hpp"
 
@@ -122,7 +123,7 @@ Global::Global()
        "COM7", "COM8", "COM9", "COM¹", "COM²", "COM³", "CON", "LPT0",
        "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8",
        "LPT9", "NUL", "PRN"
-    };  
+    };
 
     set<string> reserved_set(reserved, reserved + 27);
     WIN_RESERVED = reserved_set;
@@ -385,13 +386,13 @@ Global::DataType Global::detectSimpleType(int count, const uint freqs0[]) {
 }
 
 #if defined(WIN32) || defined(_WIN32) || defined(_WIN64)
-bool Global::isReservedName(const string& fileName)
+bool Global::isReservedName(string fileName)
 {
     transform(fileName.begin(), fileName.end(), fileName.begin(), ::toupper);
-    return WIN_RESERVED.find(fileName.begin) != WIN_RESERVED.end();
+    return WIN_RESERVED.find(fileName) != WIN_RESERVED.end();
 }
 #else
-bool Global::isReservedName(const string&)
+bool Global::isReservedName(string)
 {
     return false;
 }

src/Global.hpp

@@ -54,7 +54,7 @@ namespace kanzi {
 
        static DataType detectSimpleType(int count, const uint histo[]);
 
-       static bool isReservedName(const std::string& fileName);
+       static bool isReservedName(std::string fileName);
 
    private:
        Global();

src/io/IOUtil.hpp

@@ -78,7 +78,7 @@ namespace kanzi
             if (idx != std::string::npos) {
                _path = path.substr(0, idx + 1);
                _name = path.substr(idx + 1);
-            } 
+            }
             else {
                _path = "";
                _name = path;
@@ -100,7 +100,7 @@ namespace kanzi
    };
 
 
-   static inline void createFileList(std::string& target, std::vector<FileData>& files, const FileListConfig& cfg, 
+   static inline void createFileList(std::string& target, std::vector<FileData>& files, const FileListConfig& cfg,
                                      std::vector<std::string>& errors)
    {
        if (target.size() == 0)
@@ -152,7 +152,7 @@ namespace kanzi
        if (cfg._recursive) {
           if (target[target.size() - 1] != PATH_SEPARATOR)
              target += PATH_SEPARATOR;
-       } 
+       }
        else {
           target.resize(target.size() - 1);
        }
@@ -191,7 +191,7 @@ namespace kanzi
                      if ((idx != std::string::npos) && (idx < fullpath.length() - 1) && (fullpath[idx + 1] == '.'))
                         continue;
                   }
-                 
+
                   if ((cfg._ignoreLinks == false) || (buffer.st_mode & S_IFMT) != S_IFLNK)
    #if __cplusplus >= 201103L
                      files.emplace_back(fullpath, buffer.st_size, buffer.st_mtime);
@@ -203,10 +203,10 @@ namespace kanzi
                   if (cfg._ignoreDotFiles == true) {
                      size_t idx = fullpath.rfind(PATH_SEPARATOR);
 
-                     if ((idx != std::string::npos) && (idx < fullpath.length() - 1) && (fullpath[idx + 1] == '.')) 
+                     if ((idx != std::string::npos) && (idx < fullpath.length() - 1) && (fullpath[idx + 1] == '.'))
                         continue;
                   }
-                   
+
                   createFileList(fullpath, files, cfg, errors);
                }
            }
@@ -247,10 +247,14 @@ namespace kanzi
    }
 
 
-   static inline int mkdirAll(const std::string& path, mode_t mode = S_IRWXU | S_IRWXG | S_IROTH | S_IWOTH | S_IXOTH) {
-   #if defined(WIN32) || defined(_WIN32) || defined(_WIN64)
+#if defined(WIN32) || defined(_WIN32) || defined(_WIN64)
+   static inline int mkdirAll(const std::string& path)
+   {
       bool foundDrive = false;
-   #endif
+#else
+   static inline int mkdirAll(const std::string& path, mode_t mode = S_IRWXU | S_IRWXG | S_IROTH | S_IWOTH | S_IXOTH)
+   {
+#endif
 
       int res = 0;
       errno = 0;
@@ -264,34 +268,34 @@ namespace kanzi
               if (curPath.length() == 0)
                   continue;
 
-   #if defined(WIN32) || defined(_WIN32) || defined(_WIN64)
+#if defined(WIN32) || defined(_WIN32) || defined(_WIN64)
               //Skip if drive
               if ((foundDrive == false) && (curPath.length() == 2) && (curPath[1] == ':')) {
                   foundDrive = true;
                   continue;
               }
-   #endif
+#endif
 
-   #if defined(_MSC_VER)
+#if defined(_MSC_VER)
               res = _mkdir(curPath.c_str());
-   #elif defined(__MINGW32__)
+#elif defined(__MINGW32__)
               res = mkdir(curPath.c_str());
-   #else
+#else
               res = mkdir(curPath.c_str(), mode);
-   #endif
+#endif
               if ((res != 0) && (errno != EEXIST))
                   return errno;
           }
       }
       errno = 0;
 
-   #if defined(_MSC_VER)
+#if defined(_MSC_VER)
       res = _mkdir(path.c_str());
-   #elif defined(__MINGW32__)
+#elif defined(__MINGW32__)
       res = mkdir(path.c_str());
-   #else
+#else
       res = mkdir(path.c_str(), mode);
-   #endif
+#endif
 
       return (res == 0) ? 0 : errno;
    }