Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pugixml
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SCALE
Code
external
pugixml
Commits
c2d90c49
Commit
c2d90c49
authored
4 years ago
by
Jan Niklas Hasse
Browse files
Options
Downloads
Patches
Plain Diff
Use nullptr in pugixml.hpp if available, see #91
parent
f49d7acd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/pugixml.hpp
+13
-4
13 additions, 4 deletions
src/pugixml.hpp
with
13 additions
and
4 deletions
src/pugixml.hpp
+
13
−
4
View file @
c2d90c49
...
...
@@ -111,6 +111,15 @@
# endif
#endif
// If C++ is 2011 or higher, use 'nullptr'
#ifndef PUGIXML_NULL
# if __cplusplus >= 201103
# define PUGIXML_NULL nullptr
# else
# define PUGIXML_NULL 0
# endif
#endif
// Character interface macros
#ifdef PUGIXML_WCHAR_MODE
# define PUGIXML_TEXT(t) L ## t
...
...
@@ -661,15 +670,15 @@ namespace pugi
#ifndef PUGIXML_NO_XPATH
// Select single node by evaluating XPath query. Returns first node from the resulting node set.
xpath_node
select_node
(
const
char_t
*
query
,
xpath_variable_set
*
variables
=
0
)
const
;
xpath_node
select_node
(
const
char_t
*
query
,
xpath_variable_set
*
variables
=
PUGIXML_NULL
)
const
;
xpath_node
select_node
(
const
xpath_query
&
query
)
const
;
// Select node set by evaluating XPath query
xpath_node_set
select_nodes
(
const
char_t
*
query
,
xpath_variable_set
*
variables
=
0
)
const
;
xpath_node_set
select_nodes
(
const
char_t
*
query
,
xpath_variable_set
*
variables
=
PUGIXML_NULL
)
const
;
xpath_node_set
select_nodes
(
const
xpath_query
&
query
)
const
;
// (deprecated: use select_node instead) Select single node by evaluating XPath query.
PUGIXML_DEPRECATED
xpath_node
select_single_node
(
const
char_t
*
query
,
xpath_variable_set
*
variables
=
0
)
const
;
PUGIXML_DEPRECATED
xpath_node
select_single_node
(
const
char_t
*
query
,
xpath_variable_set
*
variables
=
PUGIXML_NULL
)
const
;
PUGIXML_DEPRECATED
xpath_node
select_single_node
(
const
xpath_query
&
query
)
const
;
#endif
...
...
@@ -1212,7 +1221,7 @@ namespace pugi
public:
// Construct a compiled object from XPath expression.
// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on compilation errors.
explicit
xpath_query
(
const
char_t
*
query
,
xpath_variable_set
*
variables
=
0
);
explicit
xpath_query
(
const
char_t
*
query
,
xpath_variable_set
*
variables
=
PUGIXML_NULL
);
// Constructor
xpath_query
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment