Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
spdlog
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
spdlog
Commits
84d3c90b
Commit
84d3c90b
authored
Feb 28, 2018
by
gabime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed g++ 4.9 warnings after the clang-tidy fixes
parent
2e973c8b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
23 deletions
+23
-23
include/spdlog/async_logger.h
include/spdlog/async_logger.h
+3
-3
include/spdlog/details/async_logger_impl.h
include/spdlog/details/async_logger_impl.h
+7
-7
include/spdlog/details/logger_impl.h
include/spdlog/details/logger_impl.h
+6
-6
include/spdlog/details/os.h
include/spdlog/details/os.h
+7
-7
No files found.
include/spdlog/async_logger.h
View file @
84d3c90b
...
...
@@ -35,7 +35,7 @@ class async_logger SPDLOG_FINAL : public logger
{
public:
template
<
class
It
>
async_logger
(
const
std
::
string
&
name
,
async_logger
(
const
std
::
string
&
logger_
name
,
const
It
&
begin
,
const
It
&
end
,
size_t
queue_size
,
...
...
@@ -44,7 +44,7 @@ public:
const
std
::
chrono
::
milliseconds
&
flush_interval_ms
=
std
::
chrono
::
milliseconds
::
zero
(),
const
std
::
function
<
void
()
>&
worker_teardown_cb
=
nullptr
);
async_logger
(
const
std
::
string
&
name
,
async_logger
(
const
std
::
string
&
logger_
name
,
sinks_init_list
sinks
,
size_t
queue_size
,
const
async_overflow_policy
overflow_policy
=
async_overflow_policy
::
block_retry
,
...
...
@@ -52,7 +52,7 @@ public:
const
std
::
chrono
::
milliseconds
&
flush_interval_ms
=
std
::
chrono
::
milliseconds
::
zero
(),
const
std
::
function
<
void
()
>&
worker_teardown_cb
=
nullptr
);
async_logger
(
const
std
::
string
&
name
,
async_logger
(
const
std
::
string
&
logger_
name
,
sink_ptr
single_sink
,
size_t
queue_size
,
const
async_overflow_policy
overflow_policy
=
async_overflow_policy
::
block_retry
,
...
...
include/spdlog/details/async_logger_impl.h
View file @
84d3c90b
...
...
@@ -17,7 +17,7 @@
#include <memory>
template
<
class
It
>
inline
spdlog
::
async_logger
::
async_logger
(
const
std
::
string
&
name
,
inline
spdlog
::
async_logger
::
async_logger
(
const
std
::
string
&
logger_
name
,
const
It
&
begin
,
const
It
&
end
,
size_t
queue_size
,
...
...
@@ -25,28 +25,28 @@ inline spdlog::async_logger::async_logger(const std::string& name,
const
std
::
function
<
void
()
>&
worker_warmup_cb
,
const
std
::
chrono
::
milliseconds
&
flush_interval_ms
,
const
std
::
function
<
void
()
>&
worker_teardown_cb
)
:
logger
(
name
,
begin
,
end
),
logger
(
logger_
name
,
begin
,
end
),
_async_log_helper
(
new
details
::
async_log_helper
(
_formatter
,
_sinks
,
queue_size
,
_err_handler
,
overflow_policy
,
worker_warmup_cb
,
flush_interval_ms
,
worker_teardown_cb
))
{
}
inline
spdlog
::
async_logger
::
async_logger
(
const
std
::
string
&
name
,
sinks_init_list
sinks
,
inline
spdlog
::
async_logger
::
async_logger
(
const
std
::
string
&
logger_
name
,
sinks_init_list
sinks
_list
,
size_t
queue_size
,
const
async_overflow_policy
overflow_policy
,
const
std
::
function
<
void
()
>&
worker_warmup_cb
,
const
std
::
chrono
::
milliseconds
&
flush_interval_ms
,
const
std
::
function
<
void
()
>&
worker_teardown_cb
)
:
async_logger
(
name
,
sinks
.
begin
(),
sinks
.
end
(),
queue_size
,
overflow_policy
,
worker_warmup_cb
,
flush_interval_ms
,
worker_teardown_cb
)
{}
async_logger
(
logger_name
,
sinks_list
.
begin
(),
sinks_list
.
end
(),
queue_size
,
overflow_policy
,
worker_warmup_cb
,
flush_interval_ms
,
worker_teardown_cb
)
{}
inline
spdlog
::
async_logger
::
async_logger
(
const
std
::
string
&
name
,
inline
spdlog
::
async_logger
::
async_logger
(
const
std
::
string
&
logger_
name
,
sink_ptr
single_sink
,
size_t
queue_size
,
const
async_overflow_policy
overflow_policy
,
const
std
::
function
<
void
()
>&
worker_warmup_cb
,
const
std
::
chrono
::
milliseconds
&
flush_interval_ms
,
const
std
::
function
<
void
()
>&
worker_teardown_cb
)
:
async_logger
(
name
,
async_logger
(
logger_
name
,
{
std
::
move
(
single_sink
)
},
queue_size
,
overflow_policy
,
worker_warmup_cb
,
flush_interval_ms
,
worker_teardown_cb
)
{}
...
...
include/spdlog/details/logger_impl.h
View file @
84d3c90b
...
...
@@ -14,8 +14,8 @@
// create logger with given name, sinks and the default pattern formatter
// all other ctors will call this one
template
<
class
It
>
inline
spdlog
::
logger
::
logger
(
std
::
string
name
,
const
It
&
begin
,
const
It
&
end
)
:
_name
(
std
::
move
(
name
)),
inline
spdlog
::
logger
::
logger
(
std
::
string
logger_
name
,
const
It
&
begin
,
const
It
&
end
)
:
_name
(
std
::
move
(
logger_
name
)),
_sinks
(
begin
,
end
),
_formatter
(
std
::
make_shared
<
pattern_formatter
>
(
"%+"
)),
_level
(
level
::
info
),
...
...
@@ -30,14 +30,14 @@ inline spdlog::logger::logger(std::string name, const It& begin, const It& end):
}
// ctor with sinks as init list
inline
spdlog
::
logger
::
logger
(
const
std
::
string
&
name
,
sinks_init_list
sinks
)
:
logger
(
name
,
sinks
.
begin
(),
sinks
.
end
())
inline
spdlog
::
logger
::
logger
(
const
std
::
string
&
logger_name
,
sinks_init_list
sinks_list
)
:
logger
(
logger_name
,
sinks_list
.
begin
(),
sinks_list
.
end
())
{}
// ctor with single sink
inline
spdlog
::
logger
::
logger
(
const
std
::
string
&
name
,
spdlog
::
sink_ptr
single_sink
)
:
logger
(
name
,
inline
spdlog
::
logger
::
logger
(
const
std
::
string
&
logger_
name
,
spdlog
::
sink_ptr
single_sink
)
:
logger
(
logger_
name
,
{
std
::
move
(
single_sink
)
})
...
...
include/spdlog/details/os.h
View file @
84d3c90b
...
...
@@ -81,10 +81,10 @@ inline std::tm localtime(const std::time_t &time_tt)
{
#ifdef _WIN32
std
::
tm
tm
{}
;
std
::
tm
tm
;
localtime_s
(
&
tm
,
&
time_tt
);
#else
std
::
tm
tm
{}
;
std
::
tm
tm
;
localtime_r
(
&
time_tt
,
&
tm
);
#endif
return
tm
;
...
...
@@ -100,10 +100,10 @@ inline std::tm gmtime(const std::time_t &time_tt)
{
#ifdef _WIN32
std
::
tm
tm
{}
;
std
::
tm
tm
;
gmtime_s
(
&
tm
,
&
time_tt
);
#else
std
::
tm
tm
{}
;
std
::
tm
tm
;
gmtime_r
(
&
time_tt
,
&
tm
);
#endif
return
tm
;
...
...
@@ -219,7 +219,7 @@ inline bool file_exists(const filename_t& filename)
#endif
return
(
attribs
!=
INVALID_FILE_ATTRIBUTES
&&
!
(
attribs
&
FILE_ATTRIBUTE_DIRECTORY
));
#else //common linux/unix all have the stat system call
struct
stat
buffer
{}
;
struct
stat
buffer
;
return
(
stat
(
filename
.
c_str
(),
&
buffer
)
==
0
);
#endif
}
...
...
@@ -249,11 +249,11 @@ inline size_t filesize(FILE *f)
int
fd
=
fileno
(
f
);
//64 bits(but not in osx or cygwin, where fstat64 is deprecated)
#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__)
struct
stat64
st
{}
;
struct
stat64
st
;
if
(
fstat64
(
fd
,
&
st
)
==
0
)
return
static_cast
<
size_t
>
(
st
.
st_size
);
#else // unix 32 bits or cygwin
struct
stat
st
{}
;
struct
stat
st
;
if
(
fstat
(
fd
,
&
st
)
==
0
)
return
static_cast
<
size_t
>
(
st
.
st_size
);
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment