diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2024-09-03 11:49:29 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2024-09-03 11:49:29 -0400 |
| commit | c1afa8b8238c25591ca80d068477aa7d4ce05fc8 (patch) | |
| tree | 284a9f8b319de5783ff83ad004a9e390cb60fd0d /absl/log/internal/nullstream.h | |
| parent | 23778b53f420f54eebc195dd8430e79bda165e5b (diff) | |
| parent | 4447c7562e3bc702ade25105912dce503f0c4010 (diff) | |
| download | abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.tar.gz abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.tar.bz2 abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.zip | |
Merge new upstream LTS 20240722.0
Diffstat (limited to 'absl/log/internal/nullstream.h')
| -rw-r--r-- | absl/log/internal/nullstream.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/absl/log/internal/nullstream.h b/absl/log/internal/nullstream.h index 9266852e..973e91ab 100644 --- a/absl/log/internal/nullstream.h +++ b/absl/log/internal/nullstream.h @@ -117,16 +117,7 @@ class NullStreamMaybeFatal final : public NullStream { class NullStreamFatal final : public NullStream { public: NullStreamFatal() = default; - // ABSL_ATTRIBUTE_NORETURN doesn't seem to work on destructors with msvc, so - // disable msvc's warning about the d'tor never returning. -#if defined(_MSC_VER) && !defined(__clang__) -#pragma warning(push) -#pragma warning(disable : 4722) -#endif - ABSL_ATTRIBUTE_NORETURN ~NullStreamFatal() { _exit(1); } -#if defined(_MSC_VER) && !defined(__clang__) -#pragma warning(pop) -#endif + [[noreturn]] ~NullStreamFatal() { _exit(1); } }; } // namespace log_internal |