diff options
author | Abseil Team <absl-team@google.com> | 2018-08-21T18·31-0700 |
---|---|---|
committer | Derek Mauro <dmauro@google.com> | 2018-08-22T15·02-0400 |
commit | bed5bd6e185c7e0311f3a1f2dab4c96083dac636 (patch) | |
tree | 0a552d0018ff8dc508c3db1b31087d687abb5767 /absl/synchronization | |
parent | fefc83638fb69395d259ed245699310610429064 (diff) |
Export of internal Abseil changes.
-- f4bb8afa9376b4120f56f3beff7b07260da4a5c2 by CJ Johnson <johnsoncj@google.com>: Add user to Github list PiperOrigin-RevId: 209630262 GitOrigin-RevId: f4bb8afa9376b4120f56f3beff7b07260da4a5c2 Change-Id: I3fedf35011d805ee4a20b92e073b43523b47d15b
Diffstat (limited to 'absl/synchronization')
-rw-r--r-- | absl/synchronization/mutex.cc | 6 | ||||
-rw-r--r-- | absl/synchronization/mutex.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/absl/synchronization/mutex.cc b/absl/synchronization/mutex.cc index e6525046be83..af1a5e4e9728 100644 --- a/absl/synchronization/mutex.cc +++ b/absl/synchronization/mutex.cc @@ -298,7 +298,7 @@ static struct SynchEvent { // this is a trivial hash table for the events // set "bits" in the word there (waiting until lockbit is clear before doing // so), and return a refcounted reference that will remain valid until // UnrefSynchEvent() is called. If a new SynchEvent is allocated, -// the std::string name is copied into it. +// the string name is copied into it. // When used with a mutex, the caller should also ensure that kMuEvent // is set in the mutex word, and similarly for condition variables and kCVEvent. static SynchEvent *EnsureSynchEvent(std::atomic<intptr_t> *addr, @@ -1827,8 +1827,8 @@ bool Mutex::LockSlowWithDeadline(MuHow how, const Condition *cond, cond == nullptr || EvalConditionAnnotated(cond, this, true, how); } -// RAW_CHECK_FMT() takes a condition, a printf-style format std::string, and -// the printf-style argument list. The format std::string must be a literal. +// RAW_CHECK_FMT() takes a condition, a printf-style format string, and +// the printf-style argument list. The format string must be a literal. // Arguments after the first are not evaluated unless the condition is true. #define RAW_CHECK_FMT(cond, ...) \ do { \ diff --git a/absl/synchronization/mutex.h b/absl/synchronization/mutex.h index 83c214867ac5..a378190538e2 100644 --- a/absl/synchronization/mutex.h +++ b/absl/synchronization/mutex.h @@ -962,7 +962,7 @@ void RegisterMutexTracer(void (*fn)(const char *msg, const void *obj, // // The function pointer registered here will be called here on various CondVar // events. The callback is given an opaque handle to the CondVar object and -// a std::string identifying the event. This is thread-safe, but only a single +// a string identifying the event. This is thread-safe, but only a single // tracer can be registered. // // Events that can be sent are "Wait", "Unwait", "Signal wakeup", and |