organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Replace CHECK() with GOOGLE_CHECK().

Browse source 
Fixes: https://github.com/google/protobuf/issues/1175
This commit is contained in:
Josh Haberman 2017-03-13 16:07:42 -07:00
parent f0a5c1033a
commit 874e382fde
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/google/protobuf/stubs/shared_ptr.h
View file

@ -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;
}
}