diff options
Diffstat (limited to 'absl')
| -rw-r--r-- | absl/base/internal/exception_safety_testing.h | 4 | ||||
| -rw-r--r-- | absl/base/thread_annotations.h | 4 | ||||
| -rw-r--r-- | absl/strings/internal/ostringstream.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/absl/base/internal/exception_safety_testing.h b/absl/base/internal/exception_safety_testing.h index aca27a57..d2742456 100644 --- a/absl/base/internal/exception_safety_testing.h +++ b/absl/base/internal/exception_safety_testing.h @@ -1,7 +1,7 @@ // Utilities for testing exception-safety -#ifndef ABSL_BASE_INTERNAL_EXCEPTION_TESTING_H_ -#define ABSL_BASE_INTERNAL_EXCEPTION_TESTING_H_ +#ifndef ABSL_BASE_INTERNAL_EXCEPTION_SAFETY_TESTING_H_ +#define ABSL_BASE_INTERNAL_EXCEPTION_SAFETY_TESTING_H_ #include <cstddef> #include <cstdint> diff --git a/absl/base/thread_annotations.h b/absl/base/thread_annotations.h index 53816005..626b0578 100644 --- a/absl/base/thread_annotations.h +++ b/absl/base/thread_annotations.h @@ -52,7 +52,7 @@ // Mutex mu; // int p1 GUARDED_BY(mu); #define GUARDED_BY(x) THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x)) -#define GUARDED_VAR THREAD_ANNOTATION_ATTRIBUTE__(guarded) +#define GUARDED_VAR // no-op // PT_GUARDED_BY() // @@ -72,7 +72,7 @@ // // guarded by `mu2`: // int *q GUARDED_BY(mu1) PT_GUARDED_BY(mu2); #define PT_GUARDED_BY(x) THREAD_ANNOTATION_ATTRIBUTE__(pt_guarded_by(x)) -#define PT_GUARDED_VAR THREAD_ANNOTATION_ATTRIBUTE__(pt_guarded) +#define PT_GUARDED_VAR // no-op // ACQUIRED_AFTER() / ACQUIRED_BEFORE() // diff --git a/absl/strings/internal/ostringstream.h b/absl/strings/internal/ostringstream.h index 017632a9..01314659 100644 --- a/absl/strings/internal/ostringstream.h +++ b/absl/strings/internal/ostringstream.h @@ -75,7 +75,7 @@ class OStringStream : private std::basic_streambuf<char>, public std::ostream { private: using Buf = std::basic_streambuf<char>; - Buf::int_type overflow(int c = Buf::traits_type::eof()) override { + Buf::int_type overflow(int c) override { assert(s_); if (!Buf::traits_type::eq_int_type(c, Buf::traits_type::eof())) s_->push_back(static_cast<char>(c)); |