Commit e9d42e05 authored by gabime's avatar gabime

// support forward slash in windows

parent a8f72424
......@@ -489,13 +489,12 @@ SPDLOG_INLINE bool create_dir(filename_t path)
std::basic_istringstream<char_type> istream(path);
filename_t token;
filename_t cur_dir;
char_type sep = '/';
#ifdef _WIN32
// support forward slash in windows
std::replace(path.begin(), path.end(), char_type('\\'), sep);
std::replace(path.begin(), path.end(), '/', folder_sep);
#endif
while (std::getline(istream, token, sep))
while (std::getline(istream, token, folder_sep))
{
if (!token.empty())
{
......@@ -505,7 +504,7 @@ SPDLOG_INLINE bool create_dir(filename_t path)
return false;
}
}
cur_dir += sep;
cur_dir += folder_sep;
}
return true;
......@@ -518,14 +517,11 @@ SPDLOG_INLINE bool create_dir(filename_t path)
// "abc///" => "abc//"
SPDLOG_INLINE filename_t dir_name(filename_t path)
{
using char_type = filename_t::value_type;
char_type sep = '/';
#ifdef _WIN32
// support forward slash in windows
std::replace(path.begin(), path.end(), char_type('\\'), sep);
std::replace(path.begin(), path.end(), '/', folder_sep);
#endif
auto pos = path.find_last_of(sep);
auto pos = path.find_last_of(folder_sep);
return pos != filename_t::npos ? path.substr(0, pos) : filename_t{};
}
......
......@@ -33,7 +33,7 @@ SPDLOG_CONSTEXPR static const char *default_eol = SPDLOG_EOL;
// folder separator
#ifdef _WIN32
const char folder_sep = '\\';
static const char folder_sep = '\\';
#else
SPDLOG_CONSTEXPR static const char folder_sep = '/';
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment