Skip to content

Remove global constructor from pugixml #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zeux merged 1 commit into from
Aug 26, 2025
+4 −3
Merged

Remove global constructor from pugixml #683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/pugixml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9226,8 +9226,6 @@ PUGI_IMPL_NS_BEGIN
char_t name[1];
};

static const xpath_node_set dummy_node_set;

PUGI_IMPL_FN PUGI_IMPL_UNSIGNED_OVERFLOW unsigned int hash_string(const char_t* str)
{
// Jenkins one-at-a-time hash (http://en.wikipedia.org/wiki/Jenkins_hash_function#one-at-a-time)
Expand Down Expand Up @@ -12967,7 +12965,10 @@ namespace pugi

PUGI_IMPL_FN const xpath_node_set& xpath_variable::get_node_set() const
{
return (_type == xpath_type_node_set) ? static_cast<const impl::xpath_variable_node_set*>(this)->value : impl::dummy_node_set;
if (_type == xpath_type_node_set)
return static_cast<const impl::xpath_variable_node_set*>(this)->value;
static const xpath_node_set dummy_node_set;
return dummy_node_set;
}

PUGI_IMPL_FN bool xpath_variable::set(bool value)
Expand Down
Loading