epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fix for vxWorks 6.x - don't use std::min/max.

Browse Source
This commit is contained in:
Andrew Johnson
2008-09-30 15:29:57 +00:00
parent 80eca1fafa
commit d3eb8170ff
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libCom/osi/epicsThread.cpp
View File

@@ -14,13 +14,13 @@
#include <exception>
#include <typeinfo>
#include <algorithm>
#include <stdio.h>
#include <stddef.h>
#include <float.h>
#define epicsExportSharedSymbols
#include "epicsAlgorithm.h"
#include "epicsTime.h"
#include "epicsThread.h"
#include "epicsAssert.h"
@@ -154,13 +154,13 @@ bool epicsThread::exitWait ( const double delay ) throw ()
"epicsThread::exitWait(): Unexpected exception "
" \"%s\"\n",
except.what () );
epicsThreadSleep ( std :: min ( delay, 5.0 ) );
epicsThreadSleep ( epicsMin ( delay, 5.0 ) );
}
catch ( ... ) {
errlogPrintf (
"Non-standard unexpected exception in "
"epicsThread::exitWait()\n" );
epicsThreadSleep ( std :: min ( delay, 5.0 ) );
epicsThreadSleep ( epicsMin ( delay, 5.0 ) );
}
return this->terminated;
}