Fixed windows compilation issue.

This commit is contained in:
Steffen Schümann 2018-11-05 21:54:24 +01:00
parent 8e17597608
commit e57fd540b2

View File

@ -68,6 +68,7 @@
#include <wchar.h> #include <wchar.h>
#include <windows.h> #include <windows.h>
#include <winioctl.h> #include <winioctl.h>
#include <shellapi.h>
#else #else
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
@ -86,11 +87,11 @@
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include <chrono> #include <chrono>
#include <clocale>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <functional>
#include <fstream> #include <fstream>
#include <clocale> #include <functional>
#include <memory> #include <memory>
#include <stack> #include <stack>
#include <stdexcept> #include <stdexcept>
@ -920,9 +921,9 @@ public:
} }
bool valid() const bool valid() const
{ {
return _isvalid; return _isvalid;
} }
private: private:
int _argc; int _argc;
@ -1211,7 +1212,6 @@ inline void postprocess_path_with_format(path::string_type& p, path::format fmt)
} // namespace detail } // namespace detail
template <class Source, typename> template <class Source, typename>
inline path::path(const Source& source, format fmt) inline path::path(const Source& source, format fmt)
: _path(source) : _path(source)
@ -1658,7 +1658,6 @@ inline file_status status_ex(const path& p, std::error_code& ec, file_status* sl
} // namespace detail } // namespace detail
inline u8arguments::u8arguments(int& argc, char**& argv) inline u8arguments::u8arguments(int& argc, char**& argv)
: _argc(argc) : _argc(argc)
, _argv(argv) , _argv(argv)
@ -1680,7 +1679,7 @@ inline u8arguments::u8arguments(int& argc, char**& argv)
_isvalid = true; _isvalid = true;
#else #else
std::setlocale(LC_ALL, ""); std::setlocale(LC_ALL, "");
if(!detail::compare_no_case(::nl_langinfo(CODESET), "UTF-8")) { if (!detail::compare_no_case(::nl_langinfo(CODESET), "UTF-8")) {
_isvalid = true; _isvalid = true;
} }
#endif #endif