From 8400e74606e8280016174f64ebf478eb6607c8f3 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 29 Jan 2013 18:02:51 -0600 Subject: [PATCH] Fix epicsRingPointerGetSize() Definition name didn't match declaration. Fixes lp:1109785 reported by Martin Konrad. --- src/libCom/ring/epicsRingPointer.cpp | 7 +++---- src/libCom/ring/epicsRingPointer.h | 8 +++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libCom/ring/epicsRingPointer.cpp b/src/libCom/ring/epicsRingPointer.cpp index 5118c9347..3a5cc8c72 100644 --- a/src/libCom/ring/epicsRingPointer.cpp +++ b/src/libCom/ring/epicsRingPointer.cpp @@ -3,9 +3,8 @@ * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. \*************************************************************************/ /*epicsRingPointer.cpp*/ /* Author: Marty Kraimer Date: 13OCT2000 */ @@ -63,7 +62,7 @@ epicsShareFunc int epicsShareAPI epicsRingPointerGetUsed(epicsRingPointerId id) return(pvoidPointer->getUsed()); } -epicsShareFunc int epicsShareAPI epicsRingPointerSize(epicsRingPointerId id) +epicsShareFunc int epicsShareAPI epicsRingPointerGetSize(epicsRingPointerId id) { voidPointer *pvoidPointer = reinterpret_cast(id); return(pvoidPointer->getSize()); diff --git a/src/libCom/ring/epicsRingPointer.h b/src/libCom/ring/epicsRingPointer.h index 57534586a..3332782a4 100644 --- a/src/libCom/ring/epicsRingPointer.h +++ b/src/libCom/ring/epicsRingPointer.h @@ -3,9 +3,8 @@ * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. \*************************************************************************/ /*epicsRingPointer.h */ @@ -67,6 +66,9 @@ epicsShareFunc int epicsShareAPI epicsRingPointerGetSize(epicsRingPointerId id) epicsShareFunc int epicsShareAPI epicsRingPointerIsEmpty(epicsRingPointerId id); epicsShareFunc int epicsShareAPI epicsRingPointerIsFull(epicsRingPointerId id); +/* This routine was incorrectly named in previous releases */ +#define epicsRingPointerSize epicsRingPointerGetSize + #ifdef __cplusplus } #endif