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
23807e12
Commit
23807e12
authored
Aug 19, 2019
by
gabime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed throw macros and includes
parent
87ec1ab9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
3 deletions
+6
-3
include/spdlog/details/file_helper-inl.h
include/spdlog/details/file_helper-inl.h
+1
-0
include/spdlog/details/os-inl.h
include/spdlog/details/os-inl.h
+1
-1
include/spdlog/sinks/android_sink.h
include/spdlog/sinks/android_sink.h
+1
-1
include/spdlog/sinks/daily_file_sink.h
include/spdlog/sinks/daily_file_sink.h
+2
-0
include/spdlog/sinks/wincolor_sink-inl.h
include/spdlog/sinks/wincolor_sink-inl.h
+1
-1
No files found.
include/spdlog/details/file_helper-inl.h
View file @
23807e12
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
#endif
#endif
#include "spdlog/details/os.h"
#include "spdlog/details/os.h"
#include "spdlog/common.h"
#include <cerrno>
#include <cerrno>
#include <chrono>
#include <chrono>
...
...
include/spdlog/details/os-inl.h
View file @
23807e12
...
@@ -122,7 +122,7 @@ SPDLOG_INLINE void prevent_child_fd(FILE *f)
...
@@ -122,7 +122,7 @@ SPDLOG_INLINE void prevent_child_fd(FILE *f)
#if !defined(__cplusplus_winrt)
#if !defined(__cplusplus_winrt)
auto
file_handle
=
reinterpret_cast
<
HANDLE
>
(
_get_osfhandle
(
_fileno
(
f
)));
auto
file_handle
=
reinterpret_cast
<
HANDLE
>
(
_get_osfhandle
(
_fileno
(
f
)));
if
(
!::
SetHandleInformation
(
file_handle
,
HANDLE_FLAG_INHERIT
,
0
))
if
(
!::
SetHandleInformation
(
file_handle
,
HANDLE_FLAG_INHERIT
,
0
))
SPDLOG_THROW
spdlog_ex
(
"SetHandleInformation failed"
,
errno
);
SPDLOG_THROW
(
spdlog_ex
(
"SetHandleInformation failed"
,
errno
)
);
#endif
#endif
#else
#else
auto
fd
=
fileno
(
f
);
auto
fd
=
fileno
(
f
);
...
...
include/spdlog/sinks/android_sink.h
View file @
23807e12
...
@@ -64,7 +64,7 @@ protected:
...
@@ -64,7 +64,7 @@ protected:
if
(
ret
<
0
)
if
(
ret
<
0
)
{
{
SPDLOG_THROW
spdlog_ex
(
"__android_log_write() failed"
,
ret
);
SPDLOG_THROW
(
spdlog_ex
(
"__android_log_write() failed"
,
ret
)
);
}
}
}
}
...
...
include/spdlog/sinks/daily_file_sink.h
View file @
23807e12
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
#pragma once
#pragma once
#include "spdlog/common.h"
#include "spdlog/details/file_helper.h"
#include "spdlog/details/file_helper.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/fmt/fmt.h"
#include "spdlog/fmt/fmt.h"
...
@@ -10,6 +11,7 @@
...
@@ -10,6 +11,7 @@
#include "spdlog/details/os.h"
#include "spdlog/details/os.h"
#include "spdlog/details/synchronous_factory.h"
#include "spdlog/details/synchronous_factory.h"
#include <chrono>
#include <chrono>
#include <cstdio>
#include <cstdio>
#include <ctime>
#include <ctime>
...
...
include/spdlog/sinks/wincolor_sink-inl.h
View file @
23807e12
...
@@ -153,7 +153,7 @@ void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::write_to_file_(const fmt::memory
...
@@ -153,7 +153,7 @@ void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::write_to_file_(const fmt::memory
bool
ok
=
::
WriteFile
(
out_handle_
,
formatted
.
data
()
+
total_written
,
size
-
total_written
,
&
bytes_written
,
nullptr
)
!=
0
;
bool
ok
=
::
WriteFile
(
out_handle_
,
formatted
.
data
()
+
total_written
,
size
-
total_written
,
&
bytes_written
,
nullptr
)
!=
0
;
if
(
!
ok
||
bytes_written
==
0
)
if
(
!
ok
||
bytes_written
==
0
)
{
{
SPDLOG_THROW
spdlog_ex
(
"wincolor_sink: write_to_file_ failed. GetLastError(): "
+
std
::
to_string
(
::
GetLastError
(
)));
SPDLOG_THROW
(
spdlog_ex
(
"wincolor_sink: write_to_file_ failed. GetLastError(): "
+
std
::
to_string
(
::
GetLastError
()
)));
}
}
total_written
+=
bytes_written
;
total_written
+=
bytes_written
;
}
while
(
total_written
<
size
);
}
while
(
total_written
<
size
);
...
...
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