diff options
Diffstat (limited to 'parameter')
| -rw-r--r-- | parameter/Android.mk | 3 | ||||
| -rw-r--r-- | parameter/AreaConfiguration.h | 3 | ||||
| -rw-r--r-- | parameter/BackSynchronizer.h | 2 | ||||
| -rw-r--r-- | parameter/Mapper.h | 3 | ||||
| -rw-r--r-- | parameter/ParameterMgr.h | 2 | ||||
| -rw-r--r-- | parameter/SubsystemObjectCreator.h | 2 | ||||
| -rw-r--r-- | parameter/Syncer.h | 3 | ||||
| -rw-r--r-- | parameter/include/ParameterMgrPlatformConnector.h | 2 | ||||
| -rw-r--r-- | parameter/include/SelectionCriterionInterface.h | 3 | ||||
| -rw-r--r-- | parameter/include/SelectionCriterionTypeInterface.h | 3 |
10 files changed, 23 insertions, 3 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk index 02e1048..c4d57e0 100644 --- a/parameter/Android.mk +++ b/parameter/Android.mk @@ -100,8 +100,6 @@ COMMON_SRC_FILES := \ COMMON_MODULE := libparameter COMMON_MODULE_TAGS := optional -COMMON_CFLAGS := -Wno-non-virtual-dtor - COMMON_C_INCLUDES := \ $(LOCAL_PATH)/include/ \ $(LOCAL_PATH)/../utility/ \ @@ -110,7 +108,6 @@ COMMON_C_INCLUDES := \ COMMON_SHARED_LIBRARIES := libicuuc COMMON_STATIC_LIBRARIES := libxmlserializer libutility libxml2 - ############################# # Target build diff --git a/parameter/AreaConfiguration.h b/parameter/AreaConfiguration.h index bcf2229..bb1cc92 100644 --- a/parameter/AreaConfiguration.h +++ b/parameter/AreaConfiguration.h @@ -39,6 +39,9 @@ class CAreaConfiguration public: CAreaConfiguration(const CConfigurableElement* pConfigurableElement, const CSyncerSet* pSyncerSet); + /* FIXME this was missing and probably buggy*/ + virtual ~CAreaConfiguration() {} + // Save data from current void save(const CParameterBlackboard* pMainBlackboard); diff --git a/parameter/BackSynchronizer.h b/parameter/BackSynchronizer.h index 2c3cdac..793c687 100644 --- a/parameter/BackSynchronizer.h +++ b/parameter/BackSynchronizer.h @@ -38,10 +38,12 @@ public: // Back synchronization virtual void sync() = 0; + virtual ~CBackSynchronizer() {} protected: // Aggegate list list<const CConfigurableElement*> _needingBackSyncList; + private: // Aggegator CConfigurableElementAggregator _configurableElementAggregator; diff --git a/parameter/Mapper.h b/parameter/Mapper.h index 8bf7223..1d2dd22 100644 --- a/parameter/Mapper.h +++ b/parameter/Mapper.h @@ -35,4 +35,7 @@ class IMapper public: virtual bool mapBegin(CInstanceConfigurableElement* pInstanceConfigurableElement, bool& bKeepDiving, string& strError) = 0; virtual void mapEnd() = 0; + +protected: + virtual ~IMapper() {} }; diff --git a/parameter/ParameterMgr.h b/parameter/ParameterMgr.h index fa12128..0d7119d 100644 --- a/parameter/ParameterMgr.h +++ b/parameter/ParameterMgr.h @@ -92,6 +92,8 @@ public: { public: virtual void log(bool bIsWarning, const std::string& strLog) = 0; + protected: + virtual ~ILogger() {} }; // Construction diff --git a/parameter/SubsystemObjectCreator.h b/parameter/SubsystemObjectCreator.h index 0b55a57..98e4079 100644 --- a/parameter/SubsystemObjectCreator.h +++ b/parameter/SubsystemObjectCreator.h @@ -43,6 +43,8 @@ public: // Object creation virtual CSubsystemObject* objectCreate(const string& strMappingValue, CInstanceConfigurableElement* pInstanceConfigurableElement, const CMappingContext& context) const = 0; + virtual ~CSubsystemObjectCreator() {} + private: // Mapping key string _strMappingKey; diff --git a/parameter/Syncer.h b/parameter/Syncer.h index 0b830a8..b1632e8 100644 --- a/parameter/Syncer.h +++ b/parameter/Syncer.h @@ -34,4 +34,7 @@ class ISyncer { public: virtual bool sync(CParameterBlackboard& parameterBlackboard, bool bBack, string& strError) = 0; + +protected: + virtual ~ISyncer() {} }; diff --git a/parameter/include/ParameterMgrPlatformConnector.h b/parameter/include/ParameterMgrPlatformConnector.h index 64394e4..ae3e216 100644 --- a/parameter/include/ParameterMgrPlatformConnector.h +++ b/parameter/include/ParameterMgrPlatformConnector.h @@ -38,6 +38,8 @@ public: { public: virtual void log(bool bIsWarning, const std::string& strLog) = 0; + protected: + virtual ~ILogger() {} }; // Construction diff --git a/parameter/include/SelectionCriterionInterface.h b/parameter/include/SelectionCriterionInterface.h index 9162486..fe5301f 100644 --- a/parameter/include/SelectionCriterionInterface.h +++ b/parameter/include/SelectionCriterionInterface.h @@ -32,4 +32,7 @@ public: virtual int getCriterionState() const = 0; virtual std::string getCriterionName() const = 0; virtual const ISelectionCriterionTypeInterface* getCriterionType() const = 0; + +protected: + virtual ~ISelectionCriterionInterface() {} }; diff --git a/parameter/include/SelectionCriterionTypeInterface.h b/parameter/include/SelectionCriterionTypeInterface.h index 426d355..7d631d1 100644 --- a/parameter/include/SelectionCriterionTypeInterface.h +++ b/parameter/include/SelectionCriterionTypeInterface.h @@ -31,5 +31,8 @@ public: virtual bool getLiteralValue(int iValue, std::string& strValue) const = 0; virtual bool isTypeInclusive() const = 0; virtual std::string getFormattedState(int iValue) const = 0; + +protected: + virtual ~ISelectionCriterionTypeInterface() {} }; |