X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Ftree-node-manipulator.h;h=eaea13efc85b132d73689e34d2571a029fea6b33;hp=ea37e62c16526a08724498e1e7a96cb99a721ffd;hb=47a1296daba415c63f5511eeeae61a78dc970ad3;hpb=e40f95b837ab8e9f1ce9094ebf4e6ac781e7bf6f diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.h b/dali-toolkit/internal/builder/tree-node-manipulator.h index ea37e62..eaea13e 100644 --- a/dali-toolkit/internal/builder/tree-node-manipulator.h +++ b/dali-toolkit/internal/builder/tree-node-manipulator.h @@ -1,8 +1,8 @@ -#ifndef __DALI_SCRIPT_TREE_NODE_MANIPULATOR_H__ -#define __DALI_SCRIPT_TREE_NODE_MANIPULATOR_H__ +#ifndef DALI_SCRIPT_TREE_NODE_MANIPULATOR_H +#define DALI_SCRIPT_TREE_NODE_MANIPULATOR_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -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); @@ -260,4 +260,4 @@ char *CopyString( const char *fromString, VectorCharIter& iter, const VectorChar } // namespace Dali -#endif // __DALI_SCRIPT_TREE_NODE_MANIPULATOR_H__ +#endif // DALI_SCRIPT_TREE_NODE_MANIPULATOR_H