Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yaml-cpp
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
yaml-cpp
Commits
04824635
Commit
04824635
authored
Apr 02, 2013
by
Jesse Beder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename clear() to reset(), and it now takes an optional node parameter.
parent
5dbcf7ee
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
include/yaml-cpp/node/impl.h
+3
-2
include/yaml-cpp/node/node.h
+1
-1
test/new-api/nodetests.cpp
+8
-3
No files found.
include/yaml-cpp/node/impl.h
View file @
04824635
...
...
@@ -168,9 +168,10 @@ namespace YAML
return
*
this
;
}
inline
void
Node
::
clear
(
)
inline
void
Node
::
reset
(
const
YAML
::
Node
&
rhs
)
{
m_pNode
=
NULL
;
m_pMemory
=
rhs
.
m_pMemory
;
m_pNode
=
rhs
.
m_pNode
;
}
template
<
typename
T
>
...
...
include/yaml-cpp/node/node.h
View file @
04824635
...
...
@@ -56,7 +56,7 @@ namespace YAML
bool
is
(
const
Node
&
rhs
)
const
;
template
<
typename
T
>
Node
&
operator
=
(
const
T
&
rhs
);
Node
&
operator
=
(
const
Node
&
rhs
);
void
clear
(
);
void
reset
(
const
Node
&
rhs
=
Node
()
);
// size/iterator
std
::
size_t
size
()
const
;
...
...
test/new-api/nodetests.cpp
View file @
04824635
...
...
@@ -444,12 +444,17 @@ namespace Test
return
true
;
}
TEST
Clear
Node
()
TEST
Reset
Node
()
{
YAML
::
Node
node
=
YAML
::
Load
(
"[1, 2, 3]"
);
YAML_ASSERT
(
!
node
.
IsNull
());
node
.
clear
();
YAML
::
Node
other
=
node
;
node
.
reset
();
YAML_ASSERT
(
node
.
IsNull
());
YAML_ASSERT
(
!
other
.
IsNull
());
node
.
reset
(
other
);
YAML_ASSERT
(
!
node
.
IsNull
());
YAML_ASSERT
(
other
==
node
);
return
true
;
}
}
...
...
@@ -510,7 +515,7 @@ namespace Test
RunNodeTest
(
&
Node
::
CloneMap
,
"clone map"
,
passed
,
total
);
RunNodeTest
(
&
Node
::
CloneAlias
,
"clone alias"
,
passed
,
total
);
RunNodeTest
(
&
Node
::
ForceInsertIntoMap
,
"force insert into map"
,
passed
,
total
);
RunNodeTest
(
&
Node
::
ClearNode
,
"clear
node"
,
passed
,
total
);
RunNodeTest
(
&
Node
::
ResetNode
,
"reset
node"
,
passed
,
total
);
std
::
cout
<<
"Node tests: "
<<
passed
<<
"/"
<<
total
<<
" passed
\n
"
;
return
passed
==
total
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment