Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
S
spdlog
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
spdlog
Commits
161e6fb8
Unverified
Commit
161e6fb8
authored
Jul 13, 2019
by
Gabi Melman
Committed by
GitHub
Jul 13, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1145 from k0zmo/v1.x
Fix compiler and linker errors
parents
521c5317
29fa474e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
10 deletions
+7
-10
async_logger-inl.h
include/spdlog/async_logger-inl.h
+0
-8
async_logger.h
include/spdlog/async_logger.h
+5
-1
base_sink.h
include/spdlog/sinks/base_sink.h
+1
-1
stdout_sinks-inl.h
include/spdlog/sinks/stdout_sinks-inl.h
+1
-0
No files found.
include/spdlog/async_logger-inl.h
View file @
161e6fb8
...
@@ -14,14 +14,6 @@
...
@@ -14,14 +14,6 @@
#include <memory>
#include <memory>
#include <string>
#include <string>
template
<
typename
It
>
SPDLOG_INLINE
spdlog
::
async_logger
::
async_logger
(
std
::
string
logger_name
,
It
begin
,
It
end
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
async_overflow_policy
overflow_policy
)
:
logger
(
std
::
move
(
logger_name
),
begin
,
end
)
,
thread_pool_
(
std
::
move
(
tp
))
,
overflow_policy_
(
overflow_policy
)
{}
SPDLOG_INLINE
spdlog
::
async_logger
::
async_logger
(
SPDLOG_INLINE
spdlog
::
async_logger
::
async_logger
(
std
::
string
logger_name
,
sinks_init_list
sinks_list
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
async_overflow_policy
overflow_policy
)
std
::
string
logger_name
,
sinks_init_list
sinks_list
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
async_overflow_policy
overflow_policy
)
:
async_logger
(
std
::
move
(
logger_name
),
sinks_list
.
begin
(),
sinks_list
.
end
(),
std
::
move
(
tp
),
overflow_policy
)
:
async_logger
(
std
::
move
(
logger_name
),
sinks_list
.
begin
(),
sinks_list
.
end
(),
std
::
move
(
tp
),
overflow_policy
)
...
...
include/spdlog/async_logger.h
View file @
161e6fb8
...
@@ -37,7 +37,11 @@ class async_logger final : public std::enable_shared_from_this<async_logger>, pu
...
@@ -37,7 +37,11 @@ class async_logger final : public std::enable_shared_from_this<async_logger>, pu
public
:
public
:
template
<
typename
It
>
template
<
typename
It
>
async_logger
(
std
::
string
logger_name
,
It
begin
,
It
end
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
async_logger
(
std
::
string
logger_name
,
It
begin
,
It
end
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
async_overflow_policy
overflow_policy
=
async_overflow_policy
::
block
);
async_overflow_policy
overflow_policy
=
async_overflow_policy
::
block
)
:
logger
(
std
::
move
(
logger_name
),
begin
,
end
)
,
thread_pool_
(
std
::
move
(
tp
))
,
overflow_policy_
(
overflow_policy
)
{}
async_logger
(
std
::
string
logger_name
,
sinks_init_list
sinks_list
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
async_logger
(
std
::
string
logger_name
,
sinks_init_list
sinks_list
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
async_overflow_policy
overflow_policy
=
async_overflow_policy
::
block
);
async_overflow_policy
overflow_policy
=
async_overflow_policy
::
block
);
...
...
include/spdlog/sinks/base_sink.h
View file @
161e6fb8
...
@@ -41,6 +41,6 @@ protected:
...
@@ -41,6 +41,6 @@ protected:
}
// namespace sinks
}
// namespace sinks
}
// namespace spdlog
}
// namespace spdlog
#if
ndef SPDLOG_COMPILED_LIB
#if
def SPDLOG_HEADER_ONLY
#include "base_sink-inl.h"
#include "base_sink-inl.h"
#endif
#endif
include/spdlog/sinks/stdout_sinks-inl.h
View file @
161e6fb8
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
#pragma once
#pragma once
#include "spdlog/details/console_globals.h"
#include "spdlog/details/console_globals.h"
#include "spdlog/details/pattern_formatter.h"
#include <memory>
#include <memory>
namespace
spdlog
{
namespace
spdlog
{
...
...
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