-- more assert fixes for thrift concurrency
Reviewed By: mcslee
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665074 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/concurrency/TimerManager.cpp b/lib/cpp/src/concurrency/TimerManager.cpp
index 6ab0e76..050885d 100644
--- a/lib/cpp/src/concurrency/TimerManager.cpp
+++ b/lib/cpp/src/concurrency/TimerManager.cpp
@@ -96,8 +96,7 @@
if (!manager_->taskMap_.empty()) {
timeout = manager_->taskMap_.begin()->first - now;
}
- bool ret = (timeout != 0 && manager_->taskCount_ > 0) || (timeout == 0 && manager_->taskCount_ == 0);
- assert(ret);
+ assert((timeout != 0 && manager_->taskCount_ > 0) || (timeout == 0 && manager_->taskCount_ == 0));
manager_->monitor_.wait(timeout);
now = Util::currentTime();
}
@@ -183,8 +182,7 @@
while (state_ == TimerManager::STARTING) {
monitor_.wait();
}
- bool ret = (state_ != TimerManager::STARTING);
- assert(ret);
+ assert(state_ != TimerManager::STARTING);
}
}