Fix compilation problems

[Bug/Feature]   Code does not build using older gcc
[Cause]         N/A
[Solution]      N/A
[Verification]  Build

Change-Id: Ifd7dd7bce080ac16983a23d30585ace08a522f05

diff --git a/common/lxc/domain.cpp b/common/lxc/domain.cpp
index 57228c0..bc2e74b 100644 (file)
--- a/common/lxc/domain.cpp
+++ b/common/lxc/domain.cpp
@@ -195,7 +195,7 @@ bool LxcDomain::unfreeze()
 
 bool LxcDomain::setRunLevel(int runLevel)
 {
-    auto callback = [](void* param) {
+    auto callback = [](void* param) -> int {
         utils::RunLevel runLevel = *reinterpret_cast<utils::RunLevel*>(param);
         return utils::setRunLevel(runLevel) ? 0 : 1;
     };

diff --git a/tests/unit_tests/client/ut-client.cpp b/tests/unit_tests/client/ut-client.cpp
index 9847a92..6e0aab0 100644 (file)
--- a/tests/unit_tests/client/ut-client.cpp
+++ b/tests/unit_tests/client/ut-client.cpp
@@ -56,14 +56,19 @@ struct Loop {
 
 struct Fixture {
     Loop loop;
-    utils::ScopedDir mContainersPathGuard = CONTAINERS_PATH;
-    utils::ScopedDir mRun1Guard = utils::ScopedDir("/tmp/ut-run1");
-    utils::ScopedDir mRun2Guard = utils::ScopedDir("/tmp/ut-run2");
-    utils::ScopedDir mRun3Guard = utils::ScopedDir("/tmp/ut-run3");
+    utils::ScopedDir mContainersPathGuard;
+    utils::ScopedDir mRun1Guard;
+    utils::ScopedDir mRun2Guard;
+    utils::ScopedDir mRun3Guard;
 
     ContainersManager cm;
 
-    Fixture(): cm(TEST_DBUS_CONFIG_PATH)
+    Fixture()
+        : mContainersPathGuard(CONTAINERS_PATH)
+        , mRun1Guard("/tmp/ut-run1")
+        , mRun2Guard("/tmp/ut-run2")
+        , mRun3Guard("/tmp/ut-run3")
+        , cm(TEST_DBUS_CONFIG_PATH)
     {
         cm.startAll();
     }

diff --git a/tests/unit_tests/lxc/ut-domain.cpp b/tests/unit_tests/lxc/ut-domain.cpp
index 206d2c7..aa6c3a9 100644 (file)
--- a/tests/unit_tests/lxc/ut-domain.cpp
+++ b/tests/unit_tests/lxc/ut-domain.cpp
@@ -44,9 +44,10 @@ const std::string DOMAIN_NAME = "ut-domain";
 const std::string TEMPLATE = SC_TEST_LXC_TEMPLATES_INSTALL_DIR "/minimal.sh";
 
 struct Fixture {
-    utils::ScopedDir mLxcDirGuard = LXC_PATH;
+    utils::ScopedDir mLxcDirGuard;
 
     Fixture()
+        : mLxcDirGuard(LXC_PATH)
     {
         cleanup();
     }

diff --git a/tests/unit_tests/server/ut-container-admin.cpp b/tests/unit_tests/server/ut-container-admin.cpp
index 6d2ba6c..ae00abf 100644 (file)
--- a/tests/unit_tests/server/ut-container-admin.cpp
+++ b/tests/unit_tests/server/ut-container-admin.cpp
@@ -46,10 +46,14 @@ const std::string LXC_TEMPLATES_PATH = SC_TEST_LXC_TEMPLATES_INSTALL_DIR;
 
 struct Fixture {
     utils::ScopedGlibLoop mLoop;
-    utils::ScopedDir mContainersPathGuard = CONTAINERS_PATH;
+    utils::ScopedDir mContainersPathGuard;
 
     ContainerConfig mConfig;
 
+    Fixture()
+        : mContainersPathGuard(CONTAINERS_PATH)
+    {}
+
     std::unique_ptr<ContainerAdmin> create(const std::string& configPath)
     {
         config::loadFromFile(configPath, mConfig);

diff --git a/tests/unit_tests/server/ut-container.cpp b/tests/unit_tests/server/ut-container.cpp
index fe5aa64..c42b80d 100644 (file)
--- a/tests/unit_tests/server/ut-container.cpp
+++ b/tests/unit_tests/server/ut-container.cpp
@@ -54,9 +54,13 @@ const std::string LXC_TEMPLATES_PATH = SC_TEST_LXC_TEMPLATES_INSTALL_DIR;
 
 struct Fixture {
     utils::ScopedGlibLoop mLoop;
-    utils::ScopedDir mContainersPathGuard = CONTAINERS_PATH;
+    utils::ScopedDir mContainersPathGuard;
     utils::ScopedDir mRunGuard;
 
+    Fixture()
+        : mContainersPathGuard(CONTAINERS_PATH)
+    {}
+
     std::unique_ptr<Container> create(const std::string& configPath)
     {
         return std::unique_ptr<Container>(new Container(CONTAINERS_PATH,

diff --git a/tests/unit_tests/server/ut-containers-manager.cpp b/tests/unit_tests/server/ut-containers-manager.cpp
index 317981d..399cd12 100644 (file)
--- a/tests/unit_tests/server/ut-containers-manager.cpp
+++ b/tests/unit_tests/server/ut-containers-manager.cpp
@@ -379,10 +379,17 @@ private:
 struct Fixture {
     security_containers::utils::ScopedGlibLoop mLoop;
 
-    utils::ScopedDir mContainersPathGuard = CONTAINERS_PATH;
-    utils::ScopedDir mRun1Guard = utils::ScopedDir("/tmp/ut-run1");
-    utils::ScopedDir mRun2Guard = utils::ScopedDir("/tmp/ut-run2");
-    utils::ScopedDir mRun3Guard = utils::ScopedDir("/tmp/ut-run3");
+    utils::ScopedDir mContainersPathGuard;
+    utils::ScopedDir mRun1Guard;
+    utils::ScopedDir mRun2Guard;
+    utils::ScopedDir mRun3Guard;
+
+    Fixture()
+        : mContainersPathGuard(CONTAINERS_PATH)
+        , mRun1Guard("/tmp/ut-run1")
+        , mRun2Guard("/tmp/ut-run2")
+        , mRun3Guard("/tmp/ut-run3")
+    {}
 };
 
 } // namespace

diff --git a/tests/unit_tests/server/ut-server.cpp b/tests/unit_tests/server/ut-server.cpp
index 2dbfabc..1c3c46b 100644 (file)
--- a/tests/unit_tests/server/ut-server.cpp
+++ b/tests/unit_tests/server/ut-server.cpp
@@ -38,7 +38,11 @@ namespace {
 const std::string CONTAINERS_PATH = "/tmp/ut-containers"; // the same as in daemon.conf
 
 struct Fixture {
-    security_containers::utils::ScopedDir mContainersPathGuard = CONTAINERS_PATH;
+    security_containers::utils::ScopedDir mContainersPathGuard;
+
+    Fixture()
+        : mContainersPathGuard(CONTAINERS_PATH)
+    {}
 };
 } // namespace