String -> std::string, toString methods removed
This commit is contained in:
@@ -45,12 +45,13 @@ private:
|
||||
double period;
|
||||
bool onList;
|
||||
friend class Timer;
|
||||
friend std::ostream& operator<<(std::ostream& o, Timer& timer);
|
||||
};
|
||||
|
||||
class epicsShareClass Timer : public Runnable {
|
||||
public:
|
||||
POINTER_DEFINITIONS(Timer);
|
||||
Timer(String threadName, ThreadPriority priority);
|
||||
Timer(std::string threadName, ThreadPriority priority);
|
||||
virtual ~Timer();
|
||||
virtual void run();
|
||||
void scheduleAfterDelay(
|
||||
@@ -62,7 +63,9 @@ public:
|
||||
double period);
|
||||
void cancel(TimerCallbackPtr const &timerCallback);
|
||||
bool isScheduled(TimerCallbackPtr const &timerCallback);
|
||||
void toString(StringBuilder builder);
|
||||
|
||||
friend std::ostream& operator<<(std::ostream& o, Timer& timer);
|
||||
|
||||
private:
|
||||
void addElement(TimerCallbackPtr const &timerCallback);
|
||||
TimerCallbackPtr head;
|
||||
@@ -73,5 +76,7 @@ private:
|
||||
Thread thread;
|
||||
};
|
||||
|
||||
epicsShareExtern std::ostream& operator<<(std::ostream& o, Timer& timer);
|
||||
|
||||
}}
|
||||
#endif /* TIMER_H */
|
||||
|
||||
Reference in New Issue
Block a user