From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 7 Aug 2020 14:06:30 +0000 (+0000)
Subject: Merge "No longer using std::unary_function<>." into devel/master
X-Git-Tag: dali_1.9.25~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=f5061da0b7fc81c93a598fe1062e6efb44358f7e;hp=dea624eb348a4926d8761c8a1364f03f9f71acf5

Merge "No longer using std::unary_function<>." into devel/master
---

diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.h b/dali-toolkit/internal/builder/tree-node-manipulator.h
index 267c69e..eaea13e 100644
--- a/dali-toolkit/internal/builder/tree-node-manipulator.h
+++ b/dali-toolkit/internal/builder/tree-node-manipulator.h
@@ -198,14 +198,14 @@ private:
 /*
  * Collect nodes
  */
-struct CollectNodes : public std::unary_function<TreeNode*, void>
+struct CollectNodes
 {
   CollectNodes() {};
 
   /*
    * Call operator to add nodes to the list
    */
-  result_type operator()(argument_type& n)
+  void operator()(TreeNode*& n)
   {
     DALI_ASSERT_DEBUG(n && "Operation on NULL JSON node");
     nodes.push_back(n);