Commit d3b1bdf6 authored by Micha Mueller's avatar Micha Mueller
Browse files

De-virtualize SensorBase inheritance; it is no longer required

parent 3f8b1935
......@@ -14,7 +14,7 @@
#include "bacenum.h"
class BACnetSensorBase : virtual public SensorBase {
class BACnetSensorBase : public SensorBase {
public:
BACnetSensorBase(const std::string& name) :
SensorBase(name),
......
......@@ -16,7 +16,7 @@
#include <boost/regex.hpp>
#include <vector>
class IPMISensorBase: virtual public SensorBase {
class IPMISensorBase: public SensorBase {
public:
IPMISensorBase(const std::string& name) :
SensorBase(name),
......
......@@ -40,7 +40,7 @@ enum PORT_COUNTER_DATA {
uncorrectableErrors = 26
};
class OpaSensorBase : virtual public SensorBase {
class OpaSensorBase : public SensorBase {
public:
OpaSensorBase(const std::string& name) :
SensorBase(name),
......
......@@ -12,7 +12,7 @@
#include "PDUUnit.h"
class PDUSensorBase : virtual public SensorBase {
class PDUSensorBase : public SensorBase {
public:
PDUSensorBase(const std::string& name) :
SensorBase(name) {}
......
......@@ -6,13 +6,8 @@
*/
#include "PDUUnit.h"
#include "timestamp.h"
#include <iostream>
#include <sstream>
#include <boost/foreach.hpp>
#include <boost/property_tree/xml_parser.hpp>
#include <openssl/ssl.h>
#include <openssl/err.h>
......
......@@ -11,7 +11,7 @@
#include "../../includes/SensorBase.h"
#include <limits.h>
class PerfSensorBase : virtual public SensorBase {
class PerfSensorBase : public SensorBase {
public:
PerfSensorBase(const std::string& name) :
SensorBase(name),
......
......@@ -14,7 +14,7 @@
* The ProcfsSensorBase class does nothing right now, compared to SensorBase.
*
*/
class ProcfsSensorBase : virtual public SensorBase {
class ProcfsSensorBase : public SensorBase {
public:
// Constructor and destructor
......
......@@ -14,7 +14,7 @@
#include <net-snmp/net-snmp-includes.h>
#include "../../includes/SensorBase.h"
class SNMPSensorBase : virtual public SensorBase {
class SNMPSensorBase : public SensorBase {
public:
SNMPSensorBase(const std::string& name) :
SensorBase(name),
......
......@@ -12,7 +12,7 @@
#include <regex>
class SysfsSensorBase : virtual public SensorBase {
class SysfsSensorBase : public SensorBase {
public:
SysfsSensorBase(const std::string& name) :
SensorBase(name),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment