From: György Straub Date: Thu, 6 Aug 2020 09:14:45 +0000 (+0100) Subject: No longer using std::unary_function<>. X-Git-Tag: dali_1.9.25~5^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47a1296daba415c63f5511eeeae61a78dc970ad3;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git No longer using std::unary_function<>. It is removed as of C++17. Change-Id: I1fa47528de13bb9d541cbb3b6b48addfb0fd5e79 Signed-off-by: György Straub --- 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 +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);