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 (file)
--- 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);