Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Jayesh Badwaik
VTK-m
Commits
b8f5d582
Commit
b8f5d582
authored
May 14, 2019
by
Robert Maynard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream-diy' into support_clang-cl
* upstream-diy: diy 2019-05-14 (41fd7af6)
parents
bd626dac
58ad3ca3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/fmt/format.h
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/fmt/format.h
+6
-2
No files found.
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/fmt/format.h
View file @
b8f5d582
...
...
@@ -264,13 +264,17 @@ typedef __int64 intmax_t;
// makes the fmt::literals implementation easier. However, an explicit check
// for variadic templates is added here just in case.
// For Intel's compiler both it and the system gcc/msc must support UDLs.
# define FMT_USE_USER_DEFINED_LITERALS \
FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES && \
#if FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES && \
(FMT_HAS_FEATURE(cxx_user_literals) || \
(FMT_GCC_VERSION >= 407 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900) && \
(!defined(FMT_ICC_VERSION) || FMT_ICC_VERSION >= 1500)
#define FMT_USE_USER_DEFINED_LITERALS 1
#else
define
FMT_USE_USER_DEFINED_LITERALS
0
#endif
#endif
#ifndef FMT_USE_EXTERN_TEMPLATES
# define FMT_USE_EXTERN_TEMPLATES \
(FMT_CLANG_VERSION >= 209 || (FMT_GCC_VERSION >= 303 && FMT_HAS_GXX_CXX11))
...
...
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