mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-24 21:16:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify warning suppression

Browse Source
This commit is contained in:
Victor Zverovich 2020-04-11 06:17:31 -07:00
parent bbb6b357c7
commit 8cd8ef03eb
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/fmt/core.h
View File

@ -192,12 +192,7 @@
#endif #endif
#if !defined(FMT_HEADER_ONLY) && defined(_WIN32) #if !defined(FMT_HEADER_ONLY) && defined(_WIN32)
# if FMT_MSC_VER # define FMT_CLASS_API FMT_SUPPRESS_MSC_WARNING(4275)
# define FMT_NO_W4275 __pragma(warning(suppress : 4275))
# else
# define FMT_NO_W4275
# endif
# define FMT_CLASS_API FMT_NO_W4275
# ifdef FMT_EXPORT # ifdef FMT_EXPORT
# define FMT_API __declspec(dllexport) # define FMT_API __declspec(dllexport)
# define FMT_EXTERN_TEMPLATE_API FMT_API # define FMT_EXTERN_TEMPLATE_API FMT_API
@ -205,8 +200,7 @@
# define FMT_API __declspec(dllimport) # define FMT_API __declspec(dllimport)
# define FMT_EXTERN_TEMPLATE_API FMT_API # define FMT_EXTERN_TEMPLATE_API FMT_API
# endif # endif
#endif #else
#ifndef FMT_CLASS_API
# define FMT_CLASS_API # define FMT_CLASS_API
#endif #endif
#ifndef FMT_API #ifndef FMT_API

4
include/fmt/format.h
View File

@ -189,7 +189,7 @@ inline uint32_t clz(uint32_t x) {
// Static analysis complains about using uninitialized data // Static analysis complains about using uninitialized data
// "r", but the only way that can happen is if "x" is 0, // "r", but the only way that can happen is if "x" is 0,
// which the callers guarantee to not happen. // which the callers guarantee to not happen.
# pragma warning(suppress : 6102) FMT_SUPPRESS_MSC_WARNING(6102)
return 31 - r; return 31 - r;
} }
# define FMT_BUILTIN_CLZ(n) internal::clz(n) # define FMT_BUILTIN_CLZ(n) internal::clz(n)
@ -214,7 +214,7 @@ inline uint32_t clzll(uint64_t x) {
// Static analysis complains about using uninitialized data // Static analysis complains about using uninitialized data
// "r", but the only way that can happen is if "x" is 0, // "r", but the only way that can happen is if "x" is 0,
// which the callers guarantee to not happen. // which the callers guarantee to not happen.
# pragma warning(suppress : 6102) FMT_SUPPRESS_MSC_WARNING(6102)
return 63 - r; return 63 - r;
} }
# define FMT_BUILTIN_CLZLL(n) internal::clzll(n) # define FMT_BUILTIN_CLZLL(n) internal::clzll(n)