projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fixups following changes to actor traversal" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
builder
/
tree-node.cpp
diff --git
a/dali-toolkit/devel-api/builder/tree-node.cpp
b/dali-toolkit/devel-api/builder/tree-node.cpp
index
6b0f6b3
..
3d9eed7
100644
(file)
--- a/
dali-toolkit/devel-api/builder/tree-node.cpp
+++ b/
dali-toolkit/devel-api/builder/tree-node.cpp
@@
-23,7
+23,8
@@
#include "dali-toolkit/devel-api/builder/tree-node.h"
#include "dali-toolkit/internal/builder/tree-node-manipulator.h"
#include "dali-toolkit/devel-api/builder/tree-node.h"
#include "dali-toolkit/internal/builder/tree-node-manipulator.h"
-namespace
+
+namespace Dali
{
bool CaseInsensitiveCharacterCompare( unsigned char a, unsigned char b )
{
bool CaseInsensitiveCharacterCompare( unsigned char a, unsigned char b )
@@
-45,12
+46,6
@@
bool CaseInsensitiveStringCompare( const std::string& a, const std::string& b )
return result;
}
return result;
}
-} // anonymous namespace
-
-
-namespace Dali
-{
-
namespace Toolkit
{
namespace Toolkit
{