Get the long longs out of the Thrift codebase
Summary: Replace with int64_t and don't worry about what architecture machine you're on, the typedefed int64_t will do the right thing.
Reviewed By: aditya, marc
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665123 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/concurrency/Monitor.cpp b/lib/cpp/src/concurrency/Monitor.cpp
index 8517c03..1c826c8 100644
--- a/lib/cpp/src/concurrency/Monitor.cpp
+++ b/lib/cpp/src/concurrency/Monitor.cpp
@@ -51,7 +51,7 @@
void unlock() const { pthread_mutex_unlock(&pthread_mutex_); }
- void wait(long long timeout) const {
+ void wait(int64_t timeout) const {
// XXX Need to assert that caller owns mutex
assert(timeout >= 0LL);
@@ -60,7 +60,7 @@
assert(iret == 0);
} else {
struct timespec abstime;
- long long now = Util::currentTime();
+ int64_t now = Util::currentTime();
Util::toTimespec(abstime, now + timeout);
int result = pthread_cond_timedwait(&pthread_cond_,
&pthread_mutex_,
@@ -114,7 +114,7 @@
void Monitor::unlock() const { impl_->unlock(); }
-void Monitor::wait(long long timeout) const { impl_->wait(timeout); }
+void Monitor::wait(int64_t timeout) const { impl_->wait(timeout); }
void Monitor::notify() const { impl_->notify(); }