From 554bbe4d9829ff5a50fc7d7b8cc487d60746073e Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Fri, 6 Jul 2012 15:29:47 +0000
Subject: NO-JIRA: Fix previous TimerTask fix to workaround stupid windows.h
 symbol corruption

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1358265 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/sys/Timer.cpp | 4 ++--
 qpid/cpp/src/qpid/sys/Timer.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'qpid/cpp')

diff --git a/qpid/cpp/src/qpid/sys/Timer.cpp b/qpid/cpp/src/qpid/sys/Timer.cpp
index 0b3544e7b0..973c6bd8b7 100644
--- a/qpid/cpp/src/qpid/sys/Timer.cpp
+++ b/qpid/cpp/src/qpid/sys/Timer.cpp
@@ -55,7 +55,7 @@ bool TimerTask::readyToFire() const {
 bool TimerTask::prepareToFire() {
     Monitor::ScopedLock l(stateMonitor);
     if (state != CANCELLED) {
-        state = CALLBACK;
+        state = CALLING;
         return true;
     } else {
         return false;
@@ -90,7 +90,7 @@ void TimerTask::restart() {
 
 void TimerTask::cancel() {
     Monitor::ScopedLock l(stateMonitor);
-    while (state == CALLBACK) {
+    while (state == CALLING) {
         stateMonitor.wait();
     }
     state = CANCELLED;
diff --git a/qpid/cpp/src/qpid/sys/Timer.h b/qpid/cpp/src/qpid/sys/Timer.h
index af0b1b6803..5731b8d977 100644
--- a/qpid/cpp/src/qpid/sys/Timer.h
+++ b/qpid/cpp/src/qpid/sys/Timer.h
@@ -49,7 +49,7 @@ class TimerTask : public RefCounted {
     Duration period;
     AbsTime nextFireTime;
     qpid::sys::Monitor stateMonitor;
-    enum {WAITING, CALLBACK, CANCELLED} state;
+    enum {WAITING, CALLING, CANCELLED} state;
 
     bool prepareToFire();
     void finishFiring();
-- 
cgit v1.2.1