From 161280220efca01be1fa292b71222c63a2f680e9 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 6 Nov 2017 10:57:09 -0600 Subject: [PATCH] avoid std::min --- src/remote/pv/codec.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/remote/pv/codec.h b/src/remote/pv/codec.h index 78dcff4..67da706 100644 --- a/src/remote/pv/codec.h +++ b/src/remote/pv/codec.h @@ -363,7 +363,8 @@ public: } virtual epics::pvData::int8 getRevision() const OVERRIDE FINAL { - return std::min(PVA_PROTOCOL_REVISION, _remoteTransportRevision); + return PVA_PROTOCOL_REVISION < _remoteTransportRevision + ? PVA_PROTOCOL_REVISION : _remoteTransportRevision; }