Fix build error 40/268740/2
authorJunghyun Yeon <jungh.yeon@samsung.com>
Fri, 31 Dec 2021 01:53:41 +0000 (10:53 +0900)
committerJunghyun Yeon <jungh.yeon@samsung.com>
Fri, 31 Dec 2021 01:59:18 +0000 (10:59 +0900)
Fix build error caused by boost library upgrade.

Change-Id: If9f8f4ac384b12d39dfd14acb3fc62f17f0ac573
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
src/common/global_recovery_file.cc
src/common/installer/app_installer.h

index 5af5850..d6a6fe1 100644 (file)
@@ -8,7 +8,9 @@
 
 #include <manifest_parser/utils/logging.h>
 
+#include <algorithm>
 #include <string>
+#include <vector>
 
 #include "common/utils/file_util.h"
 #include "common/pkgmgr_interface.h"
index 086f579..af2275d 100644 (file)
@@ -8,7 +8,7 @@
 
 #include <manifest_parser/utils/logging.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <list>
 #include <memory>
@@ -69,7 +69,8 @@ class AppInstaller {
     std::unique_ptr<Step> step(
         new StepT(context_.get(), std::forward<Args>(args)...));
     step->on_error.connect(
-        boost::bind(&AppInstaller::HandleStepError, this, _1, _2));
+        boost::bind(&AppInstaller::HandleStepError, this,
+            boost::placeholders::_1, boost::placeholders::_2));
     steps_.emplace_back(std::move(step));
   }
 
@@ -108,7 +109,8 @@ class AppInstaller {
     std::unique_ptr<Step> step(
         new StepT(context_.get(), std::forward<Args>(args)...));
     step->on_error.connect(
-        boost::bind(&AppInstaller::HandleStepError, this, _1, _2));
+        boost::bind(&AppInstaller::HandleStepError, this,
+            boost::placeholders::_1, boost::placeholders::_2));
     std::list<std::unique_ptr<Step>> tmpList;
     tmpList.emplace_back(std::move(step));
     auto it = steps_.begin();
@@ -143,7 +145,8 @@ class AppInstaller {
     std::unique_ptr<Step> step(
         new StepT(context_.get(), std::forward<Args>(args)...));
     step->on_error.connect(
-        boost::bind(&AppInstaller::HandleStepError, this, _1, _2));
+        boost::bind(&AppInstaller::HandleStepError, this,
+            boost::placeholders::_1, boost::placeholders::_2));
     *it = std::move(step);
   }
 
@@ -174,7 +177,8 @@ class AppInstaller {
     std::unique_ptr<Step> step(
         new StepT(context_.get(), std::forward<Args>(args)...));
     step->on_error.connect(
-        boost::bind(&AppInstaller::HandleStepError, this, _1, _2));
+        boost::bind(&AppInstaller::HandleStepError, this,
+            boost::placeholders::_1, boost::placeholders::_2));
     steps_.insert(it, std::move(step));
   }
 
@@ -205,7 +209,8 @@ class AppInstaller {
     std::unique_ptr<Step> step(
         new StepT(context_.get(), std::forward<Args>(args)...));
     step->on_error.connect(
-        boost::bind(&AppInstaller::HandleStepError, this, _1, _2));
+        boost::bind(&AppInstaller::HandleStepError, this,
+            boost::placeholders::_1, boost::placeholders::_2));
     steps_.insert(++it, std::move(step));
   }