Experimental Physics and
Industrial Control System

On Tuesday 30 September 2008 01:23:00 Ernest Williams wrote:
>
> For EPICS R3.14.10-RC1
>
> I get the following error:
> ===========================
> ../../../src/libCom/osi/epicsThread.cpp
> ../../../src/libCom/osi/epicsThread.cpp: In member function 'bool
> epicsThread::exitWait(double)':
> ../../../src/libCom/osi/epicsThread.cpp:157: error: expected
> unqualified-id before '(' token
> ../../../src/libCom/osi/epicsThread.cpp:163: error: expected
> unqualified-id before '(' token
> make[1]: *** [epicsThread.o] Error 1
> =========================================

The patch attached should fix this.

Thanks,

- Andrew
-- 
Talk is cheap. Show me the code. -- Linus Torvalds

Index: epicsThread.cpp
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/libCom/osi/epicsThread.cpp,v
retrieving revision 1.16.2.19
diff -d -u -b -p -r1.16.2.19 epicsThread.cpp
--- epicsThread.cpp	24 Sep 2008 16:29:50 -0000	1.16.2.19
+++ epicsThread.cpp	30 Sep 2008 15:22:15 -0000
@@ -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 doubl
             "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;
 }

Replies:

RE: vxWorks 6.6 compile problem for EPICS R3.14.10-RC1 Williams Jr., Ernest L.

Navigate by Date:

Prev: Re: How to be warned when a record processing is ignored because already busy (PACT=1) Tim Mooney

Next: Re:Re: Question about a tutorial wiritten by Norum marco_hair

Index: 1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  <2008>  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  2020  2021  2022  2023  2024 

Navigate by Thread:

Prev: Re: Question about a tutorial wiritten by Norum Ben Franksen

Next: RE: vxWorks 6.6 compile problem for EPICS R3.14.10-RC1 Williams Jr., Ernest L.

Index: 1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  <2008>  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  2020  2021  2022  2023  2024