From a6585880f4312f65cb0790c09a2606ffd1637c36 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 29 Jul 2008 20:12:09 +0000 Subject: [PATCH] Fixed C++ comments in header file used from C. --- src/libCom/osi/epicsMessageQueue.h | 6 +++--- src/libCom/timer/epicsTimer.h | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libCom/osi/epicsMessageQueue.h b/src/libCom/osi/epicsMessageQueue.h index 053cc60bd..6448485cb 100644 --- a/src/libCom/osi/epicsMessageQueue.h +++ b/src/libCom/osi/epicsMessageQueue.h @@ -44,8 +44,8 @@ public: void show ( unsigned int level = 0 ); unsigned int pending (); -private: // Prevent compiler-generated member functions - // default constructor, copy constructor, assignment operator +private: /* Prevent compiler-generated member functions */ + /* default constructor, copy constructor, assignment operator */ epicsMessageQueue(); epicsMessageQueue(const epicsMessageQueue &); epicsMessageQueue& operator=(const epicsMessageQueue &); @@ -95,7 +95,7 @@ epicsShareFunc void epicsShareAPI epicsMessageQueueShow( #ifdef __cplusplus } -#endif /*__cplusplus */ +#endif /* __cplusplus */ #include "osdMessageQueue.h" diff --git a/src/libCom/timer/epicsTimer.h b/src/libCom/timer/epicsTimer.h index ff79e0b16..4c59467e0 100644 --- a/src/libCom/timer/epicsTimer.h +++ b/src/libCom/timer/epicsTimer.h @@ -49,13 +49,14 @@ public: class epicsTimer { /* X aCC 655 */ public: - // calls cancel (see warning below) and then destroys the timer + /* calls cancel (see warning below) and then destroys the timer */ virtual void destroy () = 0; virtual void start ( epicsTimerNotify &, const epicsTime & ) = 0; virtual void start ( epicsTimerNotify &, double delaySeconds ) = 0; - // WARNING: A deadlock will occur if you hold a lock while - // calling this function that you also take within the timer - // expiration callback. + /* WARNING: A deadlock will occur if you hold a lock while + * calling this function that you also take within the timer + * expiration callback. + */ virtual void cancel () = 0; struct expireInfo { expireInfo ( bool active, const epicsTime & expireTime );