mirror of
https://github.com/fmtlib/fmt.git
synced 2024-11-06 23:30:29 +00:00
Workaround MSVC mess
This commit is contained in:
parent
8c6215f5de
commit
2435ea4113
@ -10,6 +10,13 @@
|
|||||||
|
|
||||||
#include "format.h"
|
#include "format.h"
|
||||||
|
|
||||||
|
// __declspec(deprecated) is broken in some MSVC versions.
|
||||||
|
#if FMT_MSC_VER
|
||||||
|
# define FMT_DEPRECATED_NONMSVC
|
||||||
|
#else
|
||||||
|
# define FMT_DEPRECATED_NONMSVC FMT_DEPRECATED
|
||||||
|
#endif
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
enum class color : uint32_t {
|
enum class color : uint32_t {
|
||||||
@ -260,11 +267,12 @@ class text_style {
|
|||||||
return lhs |= rhs;
|
return lhs |= rhs;
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_DEPRECATED FMT_CONSTEXPR text_style& operator&=(const text_style& rhs) {
|
FMT_DEPRECATED_NONMSVC FMT_CONSTEXPR text_style& operator&=(
|
||||||
|
const text_style& rhs) {
|
||||||
return and_assign(rhs);
|
return and_assign(rhs);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_DEPRECATED friend FMT_CONSTEXPR text_style
|
FMT_DEPRECATED_NONMSVC friend FMT_CONSTEXPR text_style
|
||||||
operator&(text_style lhs, const text_style& rhs) {
|
operator&(text_style lhs, const text_style& rhs) {
|
||||||
return lhs.and_assign(rhs);
|
return lhs.and_assign(rhs);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user