From d3eb8170ff647252d951d1710127572deed30ec0 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 30 Sep 2008 15:29:57 +0000 Subject: [PATCH] Fix for vxWorks 6.x - don't use std::min/max. --- src/libCom/osi/epicsThread.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libCom/osi/epicsThread.cpp b/src/libCom/osi/epicsThread.cpp index c516826d5..05e1f8068 100644 --- a/src/libCom/osi/epicsThread.cpp +++ b/src/libCom/osi/epicsThread.cpp @@ -14,13 +14,13 @@ #include #include -#include #include #include #include #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; }