diff options
author | Derek Mauro <dmauro@google.com> | 2024-01-02 13:26:37 -0800 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2024-01-02 13:27:33 -0800 |
commit | 4038192a57cb75f7ee671f81a3378ff4c74c4f8e (patch) | |
tree | 84e6f749939160da3038c9811fd36c3daa030834 /absl/flags/flag.h | |
parent | 9028b8126dde250ddc193a7088ceebbbb20bac92 (diff) |
Remove workaround for older versions MSVC that did not support
constexpr Flag construction. These versions of MSVC are no longer
supported.
PiperOrigin-RevId: 595195773
Change-Id: Iaf2f01a2255fb24f3aadc26f09600543fffa9da5
Diffstat (limited to 'absl/flags/flag.h')
-rw-r--r-- | absl/flags/flag.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/absl/flags/flag.h b/absl/flags/flag.h index b7f94be7..06ea6932 100644 --- a/absl/flags/flag.h +++ b/absl/flags/flag.h @@ -71,12 +71,9 @@ ABSL_NAMESPACE_BEGIN // For type support of Abseil Flags, see the marshalling.h header file, which // discusses supported standard types, optional flags, and additional Abseil // type support. -#if !defined(_MSC_VER) || defined(__clang__) + template <typename T> using Flag = flags_internal::Flag<T>; -#else -#include "absl/flags/internal/flag_msvc.inc" -#endif // GetFlag() // @@ -196,18 +193,12 @@ ABSL_NAMESPACE_END // ----------------------------------------------------------------------------- // ABSL_FLAG_IMPL macro definition conditional on ABSL_FLAGS_STRIP_NAMES -#if !defined(_MSC_VER) || defined(__clang__) #define ABSL_FLAG_IMPL_FLAG_PTR(flag) flag #define ABSL_FLAG_IMPL_HELP_ARG(name) \ absl::flags_internal::HelpArg<AbslFlagHelpGenFor##name>( \ FLAGS_help_storage_##name) #define ABSL_FLAG_IMPL_DEFAULT_ARG(Type, name) \ absl::flags_internal::DefaultArg<Type, AbslFlagDefaultGenFor##name>(0) -#else -#define ABSL_FLAG_IMPL_FLAG_PTR(flag) flag.GetImpl() -#define ABSL_FLAG_IMPL_HELP_ARG(name) &AbslFlagHelpGenFor##name::NonConst -#define ABSL_FLAG_IMPL_DEFAULT_ARG(Type, name) &AbslFlagDefaultGenFor##name::Gen -#endif #if ABSL_FLAGS_STRIP_NAMES #define ABSL_FLAG_IMPL_FLAGNAME(txt) "" |