Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-09-30 10:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/gabime/spdlog

Browse Source
This commit is contained in:
gabime
2017-12-22 14:38:54 +02:00
parent 6d355fd602 dd0b7b2d13
commit 0ed3e4cf76
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/spdlog/details/file_helper.h
View File

@@ -118,17 +118,18 @@ public:
//
// "my_folder/.mylog" => ("my_folder/.mylog")
// "my_folder/.mylog.txt" => ("my_folder/.mylog", ".txt")
static std::tuple<filename_t, filename_t> split_by_extenstion(const filename_t& fname)
{
auto index = fname.rfind('.');
bool found_ext = index != filename_t::npos && index !=0 && fname[index - 1] != details::os::folder_sep;
if (found_ext)
return std::make_tuple(fname.substr(0, index), fname.substr(index));
else
return std::make_tuple(fname, filename_t());
if (index != filename_t::npos && index != fname.size() - 1 &&index !=0 && fname[index - 1] != details::os::folder_sep)
{
auto index2 = fname.find(details::os::folder_sep, index);
if (index2 == fname.npos) {
return std::make_tuple(fname.substr(0, index), fname.substr(index));
}
}
return std::make_tuple(fname, std::string());
}
private:
FILE* _fd;
filename_t _filename;

2
include/spdlog/spdlog.h
View File

@@ -7,7 +7,7 @@
#pragma once
#define SPDLOG_VERSION "0.14.0"
#define SPDLOG_VERSION "0.16.1"
#include "tweakme.h"
#include "common.h"