summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-12-09 23:15:53 +0000
committerAlan Conway <aconway@apache.org>2008-12-09 23:15:53 +0000
commit4d3003c3d7f3cc066c56acfa02d771d599cab194 (patch)
tree7b04cc4d537e9b9f65c4a8d588917e185a3cd55e
parenteeff4f55117ba22358f98f14de31e4fe2550460c (diff)
downloadqpid-python-4d3003c3d7f3cc066c56acfa02d771d599cab194.tar.gz
Fixes for 64bit.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@724927 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/sys/ActivityTimer.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/sys/ActivityTimer.h b/qpid/cpp/src/qpid/sys/ActivityTimer.h
index 446e372d2e..749750e821 100644
--- a/qpid/cpp/src/qpid/sys/ActivityTimer.h
+++ b/qpid/cpp/src/qpid/sys/ActivityTimer.h
@@ -94,7 +94,11 @@ class ActivityTimer
void report(const char* fn, const char* file, int line) {
uint64_t secs = (Duration(now())-data.start)/TIME_SEC;
- printf("[%lu]%s:%d: %s: rate=%llu/sec active=%llu inactive=%llu\n", Thread::current().id(), file, line, fn, data.active.count/secs, data.active.mean()/TIME_USEC, data.inactive.mean()/TIME_USEC);
+ printf("[%lu]%s:%d: %s: rate=%ld/sec active=%ld inactive=%ld\n",
+ Thread::current().id(), file, line, fn,
+ long(data.active.count/secs),
+ long(data.active.mean()/TIME_USEC),
+ long(data.inactive.mean()/TIME_USEC));
data.reset();
}
};
@@ -106,6 +110,6 @@ class ActivityTimer
*/
#define ACTIVITY_TIMER(REPORT_INTERVAL_SECS) \
static __thread ::qpid::sys::ActivityTimer::Data qpid__ActivityTimerData__ = { 0, 0, 0, { 0, 0 }, { 0, 0 } }; \
- ActivityTimer qpid__ActivityTimerInstance__(qpid__ActivityTimerData__, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__, 2*TIME_SEC)
+ ::qpid::sys::ActivityTimer qpid__ActivityTimerInstance__(qpid__ActivityTimerData__, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__, 2*::qpid::sys::TIME_SEC)
#endif /*!QPID_SYS_ACTIVITYTIMER_H*/