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
3dca8668
Commit
3dca8668
authored
Jan 21, 2020
by
Ted Lyngmo
Committed by
Jesse Beder
Jan 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change NULL to nullptr (#805)
parent
587b24e2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
include/yaml-cpp/contrib/graphbuilder.h
+4
-4
include/yaml-cpp/node/detail/node.h
+2
-2
No files found.
include/yaml-cpp/contrib/graphbuilder.h
View file @
3dca8668
...
@@ -15,7 +15,7 @@ class Parser;
...
@@ -15,7 +15,7 @@ class Parser;
// GraphBuilderInterface
// GraphBuilderInterface
// . Abstraction of node creation
// . Abstraction of node creation
// . pParentNode is always
NULL
or the return value of one of the NewXXX()
// . pParentNode is always
nullptr
or the return value of one of the NewXXX()
// functions.
// functions.
class
GraphBuilderInterface
{
class
GraphBuilderInterface
{
public
:
public
:
...
@@ -73,9 +73,9 @@ class GraphBuilder : public GraphBuilderInterface {
...
@@ -73,9 +73,9 @@ class GraphBuilder : public GraphBuilderInterface {
typedef
typename
Impl
::
Map
Map
;
typedef
typename
Impl
::
Map
Map
;
GraphBuilder
(
Impl
&
impl
)
:
m_impl
(
impl
)
{
GraphBuilder
(
Impl
&
impl
)
:
m_impl
(
impl
)
{
Map
*
pMap
=
NULL
;
Map
*
pMap
=
nullptr
;
Sequence
*
pSeq
=
NULL
;
Sequence
*
pSeq
=
nullptr
;
Node
*
pNode
=
NULL
;
Node
*
pNode
=
nullptr
;
// Type consistency checks
// Type consistency checks
pNode
=
pMap
;
pNode
=
pMap
;
...
...
include/yaml-cpp/node/detail/node.h
View file @
3dca8668
...
@@ -119,7 +119,7 @@ class node {
...
@@ -119,7 +119,7 @@ class node {
template
<
typename
Key
>
template
<
typename
Key
>
node
*
get
(
const
Key
&
key
,
shared_memory_holder
pMemory
)
const
{
node
*
get
(
const
Key
&
key
,
shared_memory_holder
pMemory
)
const
{
// NOTE: this returns a non-const node so that the top-level Node can wrap
// NOTE: this returns a non-const node so that the top-level Node can wrap
// it, and returns a pointer so that it can be
NULL
(if there is no such
// it, and returns a pointer so that it can be
nullptr
(if there is no such
// key).
// key).
return
static_cast
<
const
node_ref
&>
(
*
m_pRef
).
get
(
key
,
pMemory
);
return
static_cast
<
const
node_ref
&>
(
*
m_pRef
).
get
(
key
,
pMemory
);
}
}
...
@@ -136,7 +136,7 @@ class node {
...
@@ -136,7 +136,7 @@ class node {
node
*
get
(
node
&
key
,
shared_memory_holder
pMemory
)
const
{
node
*
get
(
node
&
key
,
shared_memory_holder
pMemory
)
const
{
// NOTE: this returns a non-const node so that the top-level Node can wrap
// NOTE: this returns a non-const node so that the top-level Node can wrap
// it, and returns a pointer so that it can be
NULL
(if there is no such
// it, and returns a pointer so that it can be
nullptr
(if there is no such
// key).
// key).
return
static_cast
<
const
node_ref
&>
(
*
m_pRef
).
get
(
key
,
pMemory
);
return
static_cast
<
const
node_ref
&>
(
*
m_pRef
).
get
(
key
,
pMemory
);
}
}
...
...
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