From 10bd2f237204063102d17e6711480025687e3eb4 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 8 Feb 2001 17:05:11 +0000
Subject: [PATCH] fixed minor compiler errors

---
 src/libCom/timer/epicsTimer.h      |  2 ++
 src/libCom/timer/epicsTimerQueue.h | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/libCom/timer/epicsTimer.h b/src/libCom/timer/epicsTimer.h
index e9a71289d..c1105ab18 100644
--- a/src/libCom/timer/epicsTimer.h
+++ b/src/libCom/timer/epicsTimer.h
@@ -28,6 +28,8 @@ public:
     virtual void expire() = 0;
 };
 
+class epicsTimerQueue;
+
 class epicsShareClass epicsTimer {
 public:
     epicsTimer(epicsTimerNotify &,epicsTimerQueue&);
diff --git a/src/libCom/timer/epicsTimerQueue.h b/src/libCom/timer/epicsTimerQueue.h
index 1dd8e0913..d38c74627 100644
--- a/src/libCom/timer/epicsTimerQueue.h
+++ b/src/libCom/timer/epicsTimerQueue.h
@@ -12,6 +12,7 @@ of this distribution.
 #define epicsTimerQueueH
 
 #include "epicsTimer.h"
+#include "epicsThread.h"
 
 #ifdef __cplusplus
 
@@ -19,7 +20,7 @@ of this distribution.
 
 class epicsTimerQueue {
 public:
-    epicsTimerQueue()
+    epicsTimerQueue();
     virtual ~epicsTimerQueue() = 0;
     epicsTime &getExpirationTime() const;
     double getExpirationDelay() const;
@@ -36,7 +37,7 @@ private:
 class epicsTimerQueueThreaded : public epicsTimerQueue {
 public:
     epicsTimerQueueThreaded(
-        int threadPriority = threadPriorityMin+10);
+        int threadPriority = epicsThreadPriorityMin+10);
     virtual ~epicsTimerQueueThreaded();
     int getPriority();
     virtual void show(int level) const;
@@ -44,15 +45,15 @@ private:
     class threadedImpl& threadPvt;
     friend class epicsTimer;
     //copy constructor and operator= not allowed
-    epicsTimerThreaded(const epicsTimerThreaded& rhs);
-    epicsTimerThreaded& operator=
-        (const epicsTimerThreaded& rhs);
+    epicsTimerQueueThreaded(const epicsTimerQueueThreaded& rhs);
+    epicsTimerQueueThreaded& operator=
+        (const epicsTimerQueueThreaded& rhs);
 };
 
 class epicsTimerQueueNonthreaded : public epicsTimerQueue{
 public:
     epicsTimerQueueNonthreaded();
-    virtual ~epicsTimerQueue();
+    virtual ~epicsTimerQueueNonthreaded();
     void process();
     virtual void show(int level) const;
 private: