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
ab178057
Commit
ab178057
authored
Dec 10, 2019
by
gabime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed (maybe) #1348
parent
c44cf5a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
include/spdlog/fmt/fmt.h
include/spdlog/fmt/fmt.h
+3
-2
include/spdlog/fmt/ostr.h
include/spdlog/fmt/ostr.h
+4
-2
No files found.
include/spdlog/fmt/fmt.h
View file @
ab178057
...
@@ -26,8 +26,9 @@
...
@@ -26,8 +26,9 @@
#ifndef FMT_USE_WINDOWS_H
#ifndef FMT_USE_WINDOWS_H
#define FMT_USE_WINDOWS_H 0
#define FMT_USE_WINDOWS_H 0
#endif
#endif
#include "bundled/core.h"
#include "bundled/format.h"
#include <spdlog/fmt/bundled/core.h>
#include <spdlog/fmt/bundled/format.h>
#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
#include <fmt/core.h>
#include <fmt/core.h>
#include <fmt/format.h>
#include <fmt/format.h>
...
...
include/spdlog/fmt/ostr.h
View file @
ab178057
...
@@ -7,12 +7,14 @@
...
@@ -7,12 +7,14 @@
//
//
// include bundled or external copy of fmtlib's ostream support
// include bundled or external copy of fmtlib's ostream support
//
//
#if !defined(SPDLOG_FMT_EXTERNAL)
#if !defined(SPDLOG_FMT_EXTERNAL)
#ifdef SPDLOG_HEADER_ONLY
#ifndef FMT_HEADER_ONLY
#ifndef FMT_HEADER_ONLY
#define FMT_HEADER_ONLY
#define FMT_HEADER_ONLY
#endif
#endif
#
include "bundled/ostream.h"
#
endif
#include
"fmt.h"
#include
<spdlog/fmt/bundled/ostream.h>
#else
#else
#include <fmt/ostream.h>
#include <fmt/ostream.h>
#endif
#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