generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-23 00:07:59 +02:00
Code Issues Projects Releases Wiki Activity

Revert "GH #1050 NetSSL_OpenSSL: fix gcc -Wshadow warnings"

Browse Source
This commit is contained in:
Günter Obiltschnig
2016-09-05 08:31:43 +02:00
committed by GitHub
parent 81870321dc
commit 81b140e0a9
11 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
XML/src/XMLWriter.cpp
View File

@@ -712,14 +712,14 @@ void XMLWriter::declareNamespaces(const XMLString& namespaceURI, const XMLString
bool defaultNameSpaceUsed = false;
XMLString defaultNamespaceURI = _namespaces.getURI(XMLString());
XMLString local;
XMLString prefixString;
XMLString prefix;
XMLString elementNamespaceURI = namespaceURI;
Name::split(qname, prefixString, local);
Name::split(qname, prefix, local);
if (elementNamespaceURI.empty())
elementNamespaceURI = _namespaces.getURI(prefixString);
elementNamespaceURI = _namespaces.getURI(prefix);
if (!elementNamespaceURI.empty())
{
usedNamespaces[prefixString].insert(elementNamespaceURI);
usedNamespaces[prefix].insert(elementNamespaceURI);
if (!defaultNamespaceURI.empty() && elementNamespaceURI == defaultNamespaceURI)
defaultNameSpaceUsed = true;
}
@@ -733,7 +733,7 @@ void XMLWriter::declareNamespaces(const XMLString& namespaceURI, const XMLString
XMLString attributeLocal;
Name::split(attributeQName, attributePrefix, attributeLocal);
if (attributeNamespaceURI.empty())
attributeNamespaceURI = _namespaces.getURI(prefixString);
attributeNamespaceURI = _namespaces.getURI(prefix);
if (!attributeNamespaceURI.empty())
{
usedNamespaces[attributePrefix].insert(attributeNamespaceURI);