From 824f272432b51fee59e9061f6118e4f0aa2f4e47 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Thu, 11 Mar 2021 01:04:39 +0100
Subject: [PATCH] no virtual inhertience for now
---
datapool/PoolDataSetIF.h | 4 ++--
datapool/SharedDataSetIF.h | 3 +--
unittest/tests/datapoollocal/DataSetTest.cpp | 12 ++++++------
unittest/tests/datapoollocal/LocalPoolOwnerBase.h | 10 ++++++++--
4 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/datapool/PoolDataSetIF.h b/datapool/PoolDataSetIF.h
index 9151f2f8e..f905cc4d7 100644
--- a/datapool/PoolDataSetIF.h
+++ b/datapool/PoolDataSetIF.h
@@ -9,8 +9,8 @@
* and unlock a data pool and read/commit semantics.
*/
class PoolDataSetIF:
- public DataSetIF,
- public ReadCommitIF {
+ virtual public DataSetIF,
+ virtual public ReadCommitIF {
public:
virtual~ PoolDataSetIF() {};
diff --git a/datapool/SharedDataSetIF.h b/datapool/SharedDataSetIF.h
index da21f9cfc..4d23f87f5 100644
--- a/datapool/SharedDataSetIF.h
+++ b/datapool/SharedDataSetIF.h
@@ -3,8 +3,7 @@
#include "PoolDataSetIF.h"
-class SharedDataSetIF:
- public PoolDataSetIF {
+class SharedDataSetIF {
public:
virtual ~SharedDataSetIF() {};
diff --git a/unittest/tests/datapoollocal/DataSetTest.cpp b/unittest/tests/datapoollocal/DataSetTest.cpp
index ecc1921f1..06964d266 100644
--- a/unittest/tests/datapoollocal/DataSetTest.cpp
+++ b/unittest/tests/datapoollocal/DataSetTest.cpp
@@ -254,12 +254,12 @@ TEST_CASE("DataSetTest" , "[DataSetTest]") {
}
SECTION("SharedDataSet") {
-// object_id_t sharedSetId = objects::SHARED_SET_ID;
-// SharedLocalDataSet sharedSet(sharedSetId, poolOwner, 2, 5);
-// CHECK(sharedSet.initialize() == retval::CATCH_OK);
-// CHECK(sharedSet.lockDataset() == retval::CATCH_OK);
-//
-// CHECK(sharedSet.unlockDataset() == retval::CATCH_OK);
+ object_id_t sharedSetId = objects::SHARED_SET_ID;
+ SharedLocalDataSet sharedSet(sharedSetId, poolOwner, 2, 5);
+ CHECK(sharedSet.initialize() == retval::CATCH_OK);
+ CHECK(sharedSet.lockDataset() == retval::CATCH_OK);
+
+ CHECK(sharedSet.unlockDataset() == retval::CATCH_OK);
}
/* we need to reset the subscription list because the pool owner
diff --git a/unittest/tests/datapoollocal/LocalPoolOwnerBase.h b/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
index 9a7639f84..f08b9eb94 100644
--- a/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
+++ b/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
@@ -36,7 +36,8 @@ static const gp_id_t uint64Vec2Id = gp_id_t(objects::TEST_LOCAL_POOL_OWNER_BASE,
class LocalPoolStaticTestDataSet: public StaticLocalDataSet<3> {
public:
LocalPoolStaticTestDataSet():
- StaticLocalDataSet(lpool::testSid) {
+ StaticLocalDataSet(lpool::testSid) {
+
}
LocalPoolStaticTestDataSet(HasLocalDataPoolIF* owner, uint32_t setId):
@@ -53,7 +54,12 @@ private:
class LocalPoolTestDataSet: public LocalDataSet {
public:
LocalPoolTestDataSet():
- LocalDataSet(lpool::testSid, lpool::dataSetMaxVariables) {
+ LocalDataSet(lpool::testSid, lpool::dataSetMaxVariables),
+ localPoolVarUint8(lpool::uint8VarGpid, this),
+ localPoolVarFloat(lpool::floatVarGpid, this),
+ localPoolUint16Vec(lpool::uint16Vec3Gpid, this)
+
+ {
}
LocalPoolTestDataSet(HasLocalDataPoolIF* owner, uint32_t setId):