From 9943796f7fb9d4f0d79802ec1252c9d111cb28da Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 8 Oct 2018 15:46:50 +0200 Subject: [PATCH] libCom/osi: fix recent epicsStdio.h change for gcc 2.x --- src/libCom/osi/epicsStdio.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libCom/osi/epicsStdio.h b/src/libCom/osi/epicsStdio.h index 2ad284042..9ef0b2239 100644 --- a/src/libCom/osi/epicsStdio.h +++ b/src/libCom/osi/epicsStdio.h @@ -91,6 +91,7 @@ epicsShareFunc int epicsShareAPI epicsStdoutPutchar(int c); } /* Also pull functions into the std namespace (see lp:1786927) */ +#if !defined(__GNUC__) || (__GNUC__ > 2) namespace std { using ::epicsGetStdin; using ::epicsGetStdout; @@ -99,6 +100,7 @@ using ::epicsStdoutPrintf; using ::epicsStdoutPuts; using ::epicsStdoutPutchar; } +#endif /* __GNUC__ > 2 */ #endif /* __cplusplus */