From 6cf9fa22086490ddac38210c45a343fdadb88113 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 14 Jun 2017 13:22:06 +0200 Subject: [PATCH] fix "hides overloaded virtual function" warning --- src/factory/PVDataCreateFactory.cpp | 8 ++++++++ src/pv/pvData.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/factory/PVDataCreateFactory.cpp b/src/factory/PVDataCreateFactory.cpp index 6a899ad..209df54 100644 --- a/src/factory/PVDataCreateFactory.cpp +++ b/src/factory/PVDataCreateFactory.cpp @@ -98,6 +98,14 @@ PVString::PVString(ScalarConstPtr const & scalar) storage.maxLength = 0; } +/* mixing overrides (virtual functions) and overloads (different argument lists) is fun... + * we override all overloads to avoid the "hides overloaded virtual function" warning from clang. + * In this case we don't need/want to, so just delegate to the base class. + */ +void PVString::serialize(ByteBuffer *pbuffer, + SerializableControl *pflusher) const +{PVScalarValue::serialize(pbuffer, pflusher);} + void PVString::serialize(ByteBuffer *pbuffer, SerializableControl *pflusher, size_t offset, size_t count) const { diff --git a/src/pv/pvData.h b/src/pv/pvData.h index 3f12250..e5d9ead 100644 --- a/src/pv/pvData.h +++ b/src/pv/pvData.h @@ -553,6 +553,8 @@ public: */ virtual ~PVString() {} + virtual void serialize(ByteBuffer *pbuffer, + SerializableControl *pflusher) const OVERRIDE; virtual void serialize(ByteBuffer *pbuffer, SerializableControl *pflusher, size_t offset, size_t count) const OVERRIDE; protected: