diff options
| author |  Abseil Team <absl-team@google.com> | 2018-04-23 15:50:21 -0700 |
|---|---|---|
| committer |  Derek Mauro <dmauro@google.com> | 2018-04-24 10:09:46 -0400 |
| commit | 19b3c95727316cef3b0b40eaf37f6645a876f8d2 (patch) | |
| tree | 093012eb09e5d01e98c941607a884dd79d0db55b /absl/types/variant_test.cc | |
| parent | af7882601aad93ada881486eeaabc562f1733961 (diff) | |
- 3a9532fb2d6ae45c3cba44c9bb0dbdfc1558b7d3 Fix the description of Span::subspan(). by Abseil Team <absl-team@google.com>
- bae1a1c21924bd31fa7315eff05ea6158d9e7947 Port the symbolizer to Windows. by Derek Mauro <dmauro@google.com>
- 2253c04c1a4f39d9581772f1dc4491878aa3831f Support absl::Hex() and absl::Dec() as arguments to absl:... by Jorg Brown <jorg@google.com>
- 552c3ac259e9c254fda9244755487f3423d2fe4b Internal change by Jorg Brown <jorg@google.com>
GitOrigin-RevId: 3a9532fb2d6ae45c3cba44c9bb0dbdfc1558b7d3
Change-Id: I448133c9bb6d837037c12b45a9a16a7945049453
Diffstat (limited to 'absl/types/variant_test.cc')
| -rw-r--r-- | absl/types/variant_test.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/absl/types/variant_test.cc b/absl/types/variant_test.cc index c4676c1..262bd94 100644 --- a/absl/types/variant_test.cc +++ b/absl/types/variant_test.cc @@ -119,19 +119,9 @@ struct ConversionException {}; template <class T> struct ExceptionOnConversion { - // Suppress MSVC 2017 warning "noreturn function has a non-void return type". -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4646) -#endif // _MSC_VER - - [[noreturn]] operator T() const { // NOLINT(runtime/explicit) + operator T() const { // NOLINT(runtime/explicit) throw ConversionException(); } - -#ifdef _MSC_VER -#pragma warning(pop) -#endif // _MSC_VER }; // Forces a variant into the valueless by exception state. |