diff --git a/pvDataApp/factory/AbstractPVScalar.h b/pvDataApp/factory/AbstractPVScalar.h index 3f53f54..95c8bd8 100644 --- a/pvDataApp/factory/AbstractPVScalar.h +++ b/pvDataApp/factory/AbstractPVScalar.h @@ -13,7 +13,7 @@ namespace epics { namespace pvData { PVScalar::~PVScalar() {} - class AbstractPVScalar : public AbstractPVField, public PVScalar { + class AbstractPVScalar : public AbstractPVField{ public: AbstractPVScalar(PVStructure *parent,ScalarConstPtr scalar) : AbstractPVField(parent,scalar) {} diff --git a/pvDataApp/factory/BasePVDouble.h b/pvDataApp/factory/BasePVDouble.h index 109c81e..7dd7074 100644 --- a/pvDataApp/factory/BasePVDouble.h +++ b/pvDataApp/factory/BasePVDouble.h @@ -7,17 +7,16 @@ #include #include "pvData.h" #include "factory.h" -#include "AbstractPVField.h" +#include "AbstractPVScalar.h" namespace epics { namespace pvData { - PVScalar::~PVScalar() {} PVDouble::~PVDouble() {} - class BasePVDouble : public AbstractPVField, public PVDouble { + class BasePVDouble : public AbstractPVScalar, public PVDouble { public: BasePVDouble(PVStructure *parent,ScalarConstPtr scalar) - : AbstractPVField(parent,scalar),value(0.0) {} + : AbstractPVScalar(parent,scalar),value(0.0) {} virtual ~BasePVDouble() {} // from Requester virtual StringConstPtr getRequesterName() const{