Fixed the build error using gcc 13

- Change 'requires' variable to 'requires_dep'
- Remove unnecessary std::move call

Change-Id: Ic729513e31934da69f93cd7537a212f435bfbd5c
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/aul/app_control/resolve_info.cc b/aul/app_control/resolve_info.cc
index 48f5d4f..5efc46d 100644 (file)
--- a/aul/app_control/resolve_info.cc
+++ b/aul/app_control/resolve_info.cc
@@ -27,7 +27,7 @@
 namespace aul {
 
 ResolveInfo::Builder& ResolveInfo::Builder::SetPkgName(std::string pkg_name) {
-  pkg_name_ = std::move(pkg_name_);
+  pkg_name_ = std::move(pkg_name);
   return *this;
 }
 

diff --git a/parser/boot-sequencer/app_info.cc b/parser/boot-sequencer/app_info.cc
index db9327d..4f2140e 100644 (file)
--- a/parser/boot-sequencer/app_info.cc
+++ b/parser/boot-sequencer/app_info.cc
@@ -78,11 +78,11 @@ void AppInfo::SetBefore(std::string before) {
     before_ += "|" + std::move(before);
 }
 
-void AppInfo::SetRequires(std::string requires) {
+void AppInfo::SetRequires(std::string requires_dep) {
   if (requires_.empty())
-    requires_ = std::move(requires);
+    requires_ = std::move(requires_dep);
   else
-    requires_ += "|" + std::move(requires);
+    requires_ += "|" + std::move(requires_dep);
 }
 
 void AppInfo::SetConflicts(std::string conflicts) {

diff --git a/parser/boot-sequencer/app_info.hh b/parser/boot-sequencer/app_info.hh
index 191d2e2..7cdff4f 100644 (file)
--- a/parser/boot-sequencer/app_info.hh
+++ b/parser/boot-sequencer/app_info.hh
@@ -40,7 +40,7 @@ class AppInfo {
 
   void SetAfter(std::string after);
   void SetBefore(std::string before);
-  void SetRequires(std::string requires);
+  void SetRequires(std::string requires_dep);
   void SetConflicts(std::string conflicts);
   void SetArgs(std::string args);
   void SetVconf(std::string vconf);

diff --git a/parser/boot-sequencer/appsvc_db.cc b/parser/boot-sequencer/appsvc_db.cc
index a339763..3ade76a 100644 (file)
--- a/parser/boot-sequencer/appsvc_db.cc
+++ b/parser/boot-sequencer/appsvc_db.cc
@@ -61,16 +61,16 @@ std::vector<std::shared_ptr<AppInfo>> AppSvcDB::Select(
     idx = 0;
     auto appid = cursor->GetColumn(idx++);
     auto app_info = std::make_shared<AppInfo>(std::move(appid));
-    app_info->SetAfter(std::move(cursor->GetColumn(idx++)));
-    app_info->SetBefore(std::move(cursor->GetColumn(idx++)));
-    app_info->SetRequires(std::move(cursor->GetColumn(idx++)));
-    app_info->SetConflicts(std::move(cursor->GetColumn(idx++)));
-    app_info->SetVconf(std::move(cursor->GetColumn(idx++)));
-    app_info->SetPathExists(std::move(cursor->GetColumn(idx++)));
-    app_info->SetArgs(std::move(cursor->GetColumn(idx++)));
-    app_info->SetBackgroundLaunch(std::move(cursor->GetColumn(idx++)));
-    app_info->SetWaitUntilReady(std::move(cursor->GetColumn(idx++)));
-    app_info->SetTimeout(std::move(cursor->GetColumn(idx++)));
+    app_info->SetAfter(cursor->GetColumn(idx++));
+    app_info->SetBefore(cursor->GetColumn(idx++));
+    app_info->SetRequires(cursor->GetColumn(idx++));
+    app_info->SetConflicts(cursor->GetColumn(idx++));
+    app_info->SetVconf(cursor->GetColumn(idx++));
+    app_info->SetPathExists(cursor->GetColumn(idx++));
+    app_info->SetArgs(cursor->GetColumn(idx++));
+    app_info->SetBackgroundLaunch(cursor->GetColumn(idx++));
+    app_info->SetWaitUntilReady(cursor->GetColumn(idx++));
+    app_info->SetTimeout(cursor->GetColumn(idx++));
     app_infos.push_back(std::move(app_info));
     cursor->Next();
   }

diff --git a/parser/boot-sequencer/parser_plugin.cc b/parser/boot-sequencer/parser_plugin.cc
index 88fc6f7..d6149fa 100644 (file)
--- a/parser/boot-sequencer/parser_plugin.cc
+++ b/parser/boot-sequencer/parser_plugin.cc
@@ -301,9 +301,9 @@ void ParserPlugin::ParseBootSequence(xmlNode* node, AppInfo* app_info) {
       if (!before.empty())
         app_info->SetBefore(std::move(before));
 
-      auto requires = GetAttribute(child_node, "requires");
-      if (!requires.empty())
-        app_info->SetRequires(std::move(requires));
+      auto requires_dep = GetAttribute(child_node, "requires");
+      if (!requires_dep.empty())
+        app_info->SetRequires(std::move(requires_dep));
 
       auto conflicts = GetAttribute(child_node, "conflicts");
       if (!conflicts.empty())

diff --git a/server/api/aul_boot_sequence.cc b/server/api/aul_boot_sequence.cc
index 4141958..a518bcd 100644 (file)
--- a/server/api/aul_boot_sequence.cc
+++ b/server/api/aul_boot_sequence.cc
@@ -86,18 +86,16 @@ int GetBootSequence(uid_t uid,
               idx = 0;
               std::string appid = Database::ColumnText(stmt, idx++);
               auto info = std::make_shared<BootSequence>(std::move(appid));
-              info->SetAfter(std::move(Database::ColumnText(stmt, idx++)));
-              info->SetBefore(std::move(Database::ColumnText(stmt, idx++)));
-              info->SetRequires(std::move(Database::ColumnText(stmt, idx++)));
-              info->SetConflicts(std::move(Database::ColumnText(stmt, idx++)));
-              info->SetVconf(std::move(Database::ColumnText(stmt, idx++)));
-              info->SetPathExists(std::move(Database::ColumnText(stmt, idx++)));
-              info->SetArgs(std::move(Database::ColumnText(stmt, idx++)));
-              info->SetBackgroundLaunch(
-                  std::move(Database::ColumnText(stmt, idx++)));
-              info->SetWaitUntilReady(
-                  std::move(Database::ColumnText(stmt, idx++)));
-              info->SetTimeout(std::move(Database::ColumnText(stmt, idx++)));
+              info->SetAfter(Database::ColumnText(stmt, idx++));
+              info->SetBefore(Database::ColumnText(stmt, idx++));
+              info->SetRequires(Database::ColumnText(stmt, idx++));
+              info->SetConflicts(Database::ColumnText(stmt, idx++));
+              info->SetVconf(Database::ColumnText(stmt, idx++));
+              info->SetPathExists(Database::ColumnText(stmt, idx++));
+              info->SetArgs(Database::ColumnText(stmt, idx++));
+              info->SetBackgroundLaunch(Database::ColumnText(stmt, idx++));
+              info->SetWaitUntilReady(Database::ColumnText(stmt, idx++));
+              info->SetTimeout(Database::ColumnText(stmt, idx++));
               infos.push_back(std::move(info));
             }
 
@@ -176,14 +174,14 @@ extern "C" API int aul_boot_sequence_get_before(aul_boot_sequence_h handle,
 }
 
 extern "C" API int aul_boot_sequence_get_requires(aul_boot_sequence_h handle,
-    const char** requires) {
-  if (handle == nullptr || requires == nullptr) {
+    const char** requires_dep) {
+  if (handle == nullptr || requires_dep == nullptr) {
     _E("Invalid parameter");
     return AUL_ERROR_INVALID_PARAMETER;
   }
 
   auto* h = static_cast<BootSequence*>(handle);
-  *requires = h->GetRequires().c_str();
+  *requires_dep = h->GetRequires().c_str();
   return AUL_ERROR_NONE;
 }
 

diff --git a/server/api/aul_boot_sequence.h b/server/api/aul_boot_sequence.h
index 5324439..c8f9be3 100644 (file)
--- a/server/api/aul_boot_sequence.h
+++ b/server/api/aul_boot_sequence.h
@@ -39,7 +39,7 @@ int aul_boot_sequence_get_after(aul_boot_sequence_h handle, const char **after);
 
 int aul_boot_sequence_get_before(aul_boot_sequence_h handle, const char **before);
 
-int aul_boot_sequence_get_requires(aul_boot_sequence_h handle, const char **requires);
+int aul_boot_sequence_get_requires(aul_boot_sequence_h handle, const char **requires_dep);
 
 int aul_boot_sequence_get_conflicts(aul_boot_sequence_h handle, const char **conflicts);
 

diff --git a/server/boot_sequence.cc b/server/boot_sequence.cc
index 96d6b94..3a96380 100644 (file)
--- a/server/boot_sequence.cc
+++ b/server/boot_sequence.cc
@@ -72,8 +72,8 @@ void BootSequence::SetBefore(std::string before) {
   before_ = std::move(before);
 }
 
-void BootSequence::SetRequires(std::string requires) {
-  requires_ = std::move(requires);
+void BootSequence::SetRequires(std::string requires_dep) {
+  requires_ = std::move(requires_dep);
 }
 
 void BootSequence::SetConflicts(std::string conflicts) {

diff --git a/server/boot_sequence.hh b/server/boot_sequence.hh
index 6f8c37c..00f852a 100644 (file)
--- a/server/boot_sequence.hh
+++ b/server/boot_sequence.hh
@@ -39,7 +39,7 @@ class BootSequence {
 
   void SetAfter(std::string after);
   void SetBefore(std::string before);
-  void SetRequires(std::string requires);
+  void SetRequires(std::string requires_dep);
   void SetConflicts(std::string conflicts);
   void SetArgs(std::string args);
   void SetVconf(std::string vconf);

diff --git a/test/unit_tests/test_comp_context.cc b/test/unit_tests/test_comp_context.cc
index 5257dca..902fb29 100644 (file)
--- a/test/unit_tests/test_comp_context.cc
+++ b/test/unit_tests/test_comp_context.cc
@@ -59,7 +59,7 @@ class CompContextTest : public TestFixture {
     if (!aul_is_initialized())
       aul_launch_init(nullptr, nullptr);
 
-    auto pkt = MakePacket(std::move(MakeCompContextBundle()));
+    auto pkt = MakePacket(MakeCompContextBundle());
     EXPECT_NE(pkt, nullptr);
 
     EXPECT_CALL(GetMock<SocketMock>(), recv(_, _, _, _))
@@ -136,7 +136,7 @@ class CompContextTest : public TestFixture {
 TEST_F(CompContextTest, aul_comp_context_foreach_comp_context_P) {
   int cmd = -1;
   int opt = -1;
-  auto pkt = MakePacket(std::move(MakeCompContextBundle()));
+  auto pkt = MakePacket(MakeCompContextBundle());
   EXPECT_NE(pkt, nullptr);
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
@@ -199,7 +199,7 @@ TEST_F(CompContextTest, aul_comp_context_create_P) {
   int cmd = -1;
   int opt = -1;
   bundle* kb = nullptr;
-  auto pkt = MakePacket(std::move(MakeCompContextBundle()));
+  auto pkt = MakePacket(MakeCompContextBundle());
   EXPECT_NE(pkt, nullptr);
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))

diff --git a/test/unit_tests/test_comp_info.cc b/test/unit_tests/test_comp_info.cc
index df97189..6cfa4cd 100644 (file)
--- a/test/unit_tests/test_comp_info.cc
+++ b/test/unit_tests/test_comp_info.cc
@@ -65,7 +65,7 @@ class CompInfoTest : public TestFixture {
     if (!aul_is_initialized())
       aul_launch_init(nullptr, nullptr);
 
-    auto pkt = MakePacket(std::move(MakeCompInfoBundle()));
+    auto pkt = MakePacket(MakeCompInfoBundle());
     EXPECT_NE(pkt, nullptr);
 
     EXPECT_CALL(GetMock<SocketMock>(), recv(_, _, _, _))
@@ -149,7 +149,7 @@ TEST_F(CompInfoTest, aul_comp_info_create_P) {
   int cmd = -1;
   int opt = -1;
   bundle* kb = nullptr;
-  auto pkt = MakePacket(std::move(MakeCompInfoBundle()));
+  auto pkt = MakePacket(MakeCompInfoBundle());
   EXPECT_NE(pkt, nullptr);
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
@@ -418,7 +418,7 @@ TEST_F(CompInfoTest, aul_comp_info_get_localed_label_N) {
 TEST_F(CompInfoTest, aul_comp_info_foreach_comp_info_from_app_P) {
   int cmd = -1;
   int opt = -1;
-  auto pkt = MakePacket(std::move(MakeCompInfoBundle()));
+  auto pkt = MakePacket(MakeCompInfoBundle());
   EXPECT_NE(pkt, nullptr);
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
@@ -479,7 +479,7 @@ TEST_F(CompInfoTest, aul_comp_info_foreach_comp_info_from_app_N) {
 TEST_F(CompInfoTest, aul_comp_info_foreach_comp_info_P) {
   int cmd = -1;
   int opt = -1;
-  auto pkt = MakePacket(std::move(MakeCompInfoBundle()));
+  auto pkt = MakePacket(MakeCompInfoBundle());
   EXPECT_NE(pkt, nullptr);
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))

diff --git a/test/unit_tests/test_pkginfo.cc b/test/unit_tests/test_pkginfo.cc
index cec975f..c7beece 100644 (file)
--- a/test/unit_tests/test_pkginfo.cc
+++ b/test/unit_tests/test_pkginfo.cc
@@ -209,7 +209,7 @@ TEST_F(PkgInfoTest, aul_app_is_running_N) {
 TEST_F(PkgInfoTest, aul_app_get_running_app_info_P) {
   int cmd = -1;
   int opt = 0;
-  auto pkt = MakePacket(std::move(MakeAppInfoBundle()));
+  auto pkt = MakePacket(MakeAppInfoBundle());
   EXPECT_NE(pkt, nullptr);
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
@@ -259,7 +259,7 @@ TEST_F(PkgInfoTest, aul_app_get_running_app_info_N) {
 TEST_F(PkgInfoTest, aul_app_get_all_running_app_info_P) {
   int cmd = -1;
   int opt = 0;
-  auto pkt = MakePacket(std::move(MakeAppInfoBundle()));
+  auto pkt = MakePacket(MakeAppInfoBundle());
   EXPECT_NE(pkt, nullptr);
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
@@ -309,7 +309,7 @@ TEST_F(PkgInfoTest, aul_app_get_all_running_app_info_N) {
 TEST_F(PkgInfoTest, aul_app_get_running_app_instance_info_P) {
   int cmd = -1;
   int opt = 0;
-  auto pkt = MakePacket(std::move(MakeAppInfoBundle()));
+  auto pkt = MakePacket(MakeAppInfoBundle());
   EXPECT_NE(pkt, nullptr);
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))

diff --git a/tool/aulctl/boot_sequence/app_info.cc b/tool/aulctl/boot_sequence/app_info.cc
index 70354b8..fa188cc 100644 (file)
--- a/tool/aulctl/boot_sequence/app_info.cc
+++ b/tool/aulctl/boot_sequence/app_info.cc
@@ -192,7 +192,7 @@ AppInfo* AppInfo::Builder::Build() {
 
 AppInfo::AppInfo(std::string appid, uid_t uid, int priority,
     std::set<std::string> after, std::set<std::string> before,
-    std::set<std::string> requires, std::set<std::string> conflicts,
+    std::set<std::string> requires_dep, std::set<std::string> conflicts,
     std::vector<std::string> vconfs,
     tizen_base::Bundle args,
     std::string active_state, std::string sub_state,
@@ -205,7 +205,7 @@ AppInfo::AppInfo(std::string appid, uid_t uid, int priority,
       priority_(priority),
       after_(std::move(after)),
       before_(std::move(before)),
-      requires_(std::move(requires)),
+      requires_(std::move(requires_dep)),
       conflicts_(std::move(conflicts)),
       vconf_(std::move(vconfs)),
       args_(std::move(args)),

diff --git a/tool/aulctl/boot_sequence/app_info.hh b/tool/aulctl/boot_sequence/app_info.hh
index b77d4f9..465e01a 100644 (file)
--- a/tool/aulctl/boot_sequence/app_info.hh
+++ b/tool/aulctl/boot_sequence/app_info.hh
@@ -79,7 +79,7 @@ class AppInfo {
 
   AppInfo(std::string appid, uid_t uid, int priority,
           std::set<std::string> after, std::set<std::string> before,
-          std::set<std::string> requires, std::set<std::string> conflicts,
+          std::set<std::string> requires_dep, std::set<std::string> conflicts,
           std::vector<std::string> vconfs,
           tizen_base::Bundle args,
           std::string active_state, std::string sub_state,