Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fmt
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
fmt
Commits
9c995a6b
Commit
9c995a6b
authored
Jun 21, 2014
by
Victor Zverovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use undefined _MSC_VER.
parent
5be9a8de
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
4 deletions
+10
-4
format.h
format.h
+10
-4
No files found.
format.h
View file @
9c995a6b
...
@@ -71,13 +71,19 @@
...
@@ -71,13 +71,19 @@
# define FMT_HAS_BUILTIN(x) 0
# define FMT_HAS_BUILTIN(x) 0
#endif
#endif
#ifdef _MSC_VER
# define FMT_MSC_VER _MSC_VER
#else
# define FMT_MSC_VER 0
#endif
#ifndef FMT_USE_VARIADIC_TEMPLATES
#ifndef FMT_USE_VARIADIC_TEMPLATES
// Variadic templates are available in GCC since version 4.4
// Variadic templates are available in GCC since version 4.4
// (http://gcc.gnu.org/projects/cxx0x.html) and in Visual C++
// (http://gcc.gnu.org/projects/cxx0x.html) and in Visual C++
// since version 2013.
// since version 2013.
# define FMT_USE_VARIADIC_TEMPLATES \
# define FMT_USE_VARIADIC_TEMPLATES \
(FMT_HAS_FEATURE(cxx_variadic_templates) || \
(FMT_HAS_FEATURE(cxx_variadic_templates) || \
(FMT_GCC_VERSION >= 404 && __cplusplus >= 201103) || _MSC_VER >= 1800)
(FMT_GCC_VERSION >= 404 && __cplusplus >= 201103) ||
FMT
_MSC_VER >= 1800)
#endif
#endif
#ifndef FMT_USE_RVALUE_REFERENCES
#ifndef FMT_USE_RVALUE_REFERENCES
...
@@ -88,7 +94,7 @@
...
@@ -88,7 +94,7 @@
# else
# else
# define FMT_USE_RVALUE_REFERENCES \
# define FMT_USE_RVALUE_REFERENCES \
(FMT_HAS_FEATURE(cxx_rvalue_references) || \
(FMT_HAS_FEATURE(cxx_rvalue_references) || \
(FMT_GCC_VERSION >= 403 && __cplusplus >= 201103) || _MSC_VER >= 1600)
(FMT_GCC_VERSION >= 403 && __cplusplus >= 201103) ||
FMT
_MSC_VER >= 1600)
# endif
# endif
#endif
#endif
...
@@ -110,7 +116,7 @@
...
@@ -110,7 +116,7 @@
TypeName(const TypeName&); \
TypeName(const TypeName&); \
void operator=(const TypeName&)
void operator=(const TypeName&)
#if _MSC_VER
#if
FMT
_MSC_VER
# pragma warning(push)
# pragma warning(push)
# pragma warning(disable: 4521) // 'class' : multiple copy constructors specified
# pragma warning(disable: 4521) // 'class' : multiple copy constructors specified
#endif
#endif
...
@@ -2052,7 +2058,7 @@ inline void FormatDec(char *&buffer, T value) {
...
@@ -2052,7 +2058,7 @@ inline void FormatDec(char *&buffer, T value) {
// Restore warnings.
// Restore warnings.
#if FMT_GCC_VERSION >= 406
#if FMT_GCC_VERSION >= 406
# pragma GCC diagnostic pop
# pragma GCC diagnostic pop
#elif _MSC_VER
#elif
FMT
_MSC_VER
# pragma warning(pop)
# pragma warning(pop)
#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