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
53d58f22
Commit
53d58f22
authored
Dec 05, 2019
by
gabime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix warning C4996 under vs2015 about std::copy in fmt
parent
d5a72b1e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
include/spdlog/fmt/fmt.h
include/spdlog/fmt/fmt.h
+14
-1
src/fmt.cpp
src/fmt.cpp
+13
-0
No files found.
include/spdlog/fmt/fmt.h
View file @
53d58f22
...
...
@@ -14,7 +14,15 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wsign-conversion"
#endif
#endif // __GNUC__ || __clang__
// fix warning C4996 under vs2015 about std::copy in fmt
#if defined(_MSC_VER) && _MSC_VER <= 1900
#pragma warning( push )
#pragma warning( disable : 4996 )
#endif
#if !defined(SPDLOG_FMT_EXTERNAL)
#ifdef SPDLOG_HEADER_ONLY
...
...
@@ -32,6 +40,11 @@
#include <fmt/format.h>
#endif
// pop warnings supressions
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#if defined(_MSC_VER) && _MSC_VER <= 1900
#pragma warning( pop )
#endif
\ No newline at end of file
src/fmt.cpp
View file @
53d58f22
...
...
@@ -12,13 +12,26 @@
#pragma GCC diagnostic ignored "-Wsign-conversion"
#endif
// fix warning C4996 under vs2015 about std::copy in fmt
#if defined(_MSC_VER) && _MSC_VER <= 1900
#pragma warning( push )
#pragma warning( disable : 4996 )
#endif
#if !defined(SPDLOG_FMT_EXTERNAL)
#include "spdlog/fmt/bundled/format-inl.h"
// pop warnings supressions
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#if defined(_MSC_VER) && _MSC_VER <= 1900
#pragma warning( pop )
#endif
FMT_BEGIN_NAMESPACE
template
struct
FMT_API
internal
::
basic_data
<
void
>;
...
...
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