From cd95b755639028acaa74f6f21b1da99338a1c1f4 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Wed, 27 Feb 2013 11:44:00 +0100 Subject: [PATCH] gcc 4.7+ compiler warnings removed --- configure/RELEASE | 3 ++- pvDataApp/factory/FieldCreateFactory.cpp | 4 ++-- pvDataApp/pv/pvIntrospect.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure/RELEASE b/configure/RELEASE index 1fa2eff..14b8f37 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -17,8 +17,9 @@ # EPICS V4 Developers: Do not edit the locations in this file! # # Create a file RELEASE.local pointing to your EPICS_BASE -# build directory, e.g. +# and PVCOMMON build directories, e.g. # EPICS_BASE = /home/install/epics/base +# PVCOMMON = /home/install/epicsV4/pvCommonCPP -include $(TOP)/configure/RELEASE.local -include $(TOP)/../RELEASE.local diff --git a/pvDataApp/factory/FieldCreateFactory.cpp b/pvDataApp/factory/FieldCreateFactory.cpp index c3eee33..7024cd7 100644 --- a/pvDataApp/factory/FieldCreateFactory.cpp +++ b/pvDataApp/factory/FieldCreateFactory.cpp @@ -94,7 +94,7 @@ String Scalar::getID() const return idScalarLUT[scalarType]; } -const int8 Scalar::getTypeCodeLUT() const +int8 Scalar::getTypeCodeLUT() const { static const int8 typeCodeLUT[] = { 0x00, // pvBoolean @@ -170,7 +170,7 @@ ScalarArray::ScalarArray(ScalarType elementType) ScalarArray::~ScalarArray() {} -const int8 ScalarArray::getTypeCodeLUT() const +int8 ScalarArray::getTypeCodeLUT() const { static const int8 typeCodeLUT[] = { 0x00, // pvBoolean diff --git a/pvDataApp/pv/pvIntrospect.h b/pvDataApp/pv/pvIntrospect.h index d70b5e6..defd954 100644 --- a/pvDataApp/pv/pvIntrospect.h +++ b/pvDataApp/pv/pvIntrospect.h @@ -283,7 +283,7 @@ public: protected: Scalar(ScalarType scalarType); private: - const int8 getTypeCodeLUT() const; + int8 getTypeCodeLUT() const; ScalarType scalarType; friend class FieldCreate; }; @@ -330,7 +330,7 @@ protected: */ virtual ~ScalarArray(); private: - const int8 getTypeCodeLUT() const; + int8 getTypeCodeLUT() const; const String getIDScalarArrayLUT() const; ScalarType elementType; friend class FieldCreate;