diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2017-03-14 12:10:23 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-14 12:10:23 -0700 |
commit | 43f2db776c265a9b22500e7a67af583b2b4ce85f (patch) | |
tree | caa9cce9ff086d81356a3945cc55259c5b9e765b | |
parent | f0a5c1033a7a46b1405a1ce8526d4d9aa6d38375 (diff) | |
parent | 874e382fde23bb169a2a9cb0f28063c54f8eed4e (diff) | |
download | protobuf-43f2db776c265a9b22500e7a67af583b2b4ce85f.tar.gz protobuf-43f2db776c265a9b22500e7a67af583b2b4ce85f.tar.bz2 protobuf-43f2db776c265a9b22500e7a67af583b2b4ce85f.zip |
Merge pull request #2843 from haberman/check
Replace CHECK() with GOOGLE_CHECK().
-rw-r--r-- | src/google/protobuf/stubs/shared_ptr.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/google/protobuf/stubs/shared_ptr.h b/src/google/protobuf/stubs/shared_ptr.h index d250bf4d..7da114e9 100644 --- a/src/google/protobuf/stubs/shared_ptr.h +++ b/src/google/protobuf/stubs/shared_ptr.h @@ -428,11 +428,11 @@ class enable_shared_from_this { shared_ptr<T> shared_from_this() { // Behavior is undefined if the precondition isn't satisfied; we choose // to die with a CHECK failure. - CHECK(!weak_this_.expired()) << "No shared_ptr owns this object"; + GOOGLE_CHECK(!weak_this_.expired()) << "No shared_ptr owns this object"; return weak_this_.lock(); } shared_ptr<const T> shared_from_this() const { - CHECK(!weak_this_.expired()) << "No shared_ptr owns this object"; + GOOGLE_CHECK(!weak_this_.expired()) << "No shared_ptr owns this object"; return weak_this_.lock(); } @@ -456,7 +456,8 @@ class enable_shared_from_this { template<typename T> void shared_ptr<T>::MaybeSetupWeakThis(enable_shared_from_this<T>* ptr) { if (ptr) { - CHECK(ptr->weak_this_.expired()) << "Object already owned by a shared_ptr"; + GOOGLE_CHECK(ptr->weak_this_.expired()) + << "Object already owned by a shared_ptr"; ptr->weak_this_ = *this; } } |