mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-16 17:22:55 +00:00
Merge branch 'upstream-diy' into support_clang-cl
* upstream-diy: diy 2019-05-14 (41fd7af6)
This commit is contained in:
commit
b8f5d582d6
@ -264,12 +264,16 @@ typedef __int64 intmax_t;
|
|||||||
// makes the fmt::literals implementation easier. However, an explicit check
|
// makes the fmt::literals implementation easier. However, an explicit check
|
||||||
// for variadic templates is added here just in case.
|
// for variadic templates is added here just in case.
|
||||||
// For Intel's compiler both it and the system gcc/msc must support UDLs.
|
// For Intel's compiler both it and the system gcc/msc must support UDLs.
|
||||||
# define FMT_USE_USER_DEFINED_LITERALS \
|
#if FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES && \
|
||||||
FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES && \
|
|
||||||
(FMT_HAS_FEATURE(cxx_user_literals) || \
|
(FMT_HAS_FEATURE(cxx_user_literals) || \
|
||||||
(FMT_GCC_VERSION >= 407 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900) && \
|
(FMT_GCC_VERSION >= 407 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900) && \
|
||||||
(!defined(FMT_ICC_VERSION) || FMT_ICC_VERSION >= 1500)
|
(!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
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifndef FMT_USE_EXTERN_TEMPLATES
|
#ifndef FMT_USE_EXTERN_TEMPLATES
|
||||||
# define FMT_USE_EXTERN_TEMPLATES \
|
# define FMT_USE_EXTERN_TEMPLATES \
|
||||||
|
Loading…
Reference in New Issue
Block a user