Attachment 144737 Details for Bug 191871 – This is an experimental meta-patch for the shurd's patch of XMLelement

[patch] This is an experimental meta-patch for the shurd's patch of XMLelement

patch-xml-experimental.txt (text/plain), 1.26 KB, created by Kenji Rikitake on 2014-07-17 02:27:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kenji Rikitake

Created: 2014-07-17 02:27:50 UTC

Size: 1.26 KB

patch

obsolete

>diff --git a/files/patch-src_xml.cpp b/files/patch-src_xml.cpp
>index ec972f4..9e2f51e 100644
>--- a/files/patch-src_xml.cpp
>+++ b/files/patch-src_xml.cpp
>@@ -12,9 +12,9 @@
>  
>  namespace tqsllib {
>  
>-+shared_ptr<XMLElement> make_shared_XMLElement(XMLElement *e)
>++shared_ptr<XMLElement> make_shared_XMLElement(XMLElement e)
> +{
>-+	shared_ptr<XMLElement> p(e);
>++	shared_ptr<XMLElement> p = make_shared<XMLElement>(e);
> +	return p;
> +}
> +
>diff --git a/files/patch-src_xml.h b/files/patch-src_xml.h
>index aebd213..e67a840 100644
>--- a/files/patch-src_xml.h
>+++ b/files/patch-src_xml.h
>@@ -31,7 +31,7 @@
>  
> +
>  class XMLElement;
>-+shared_ptr<XMLElement> make_shared_XMLElement(XMLElement *e);
>++shared_ptr<XMLElement> make_shared_XMLElement(XMLElement e);
> +class XMLElementP {
> +	public:
> +		XMLElementP() {}
>@@ -61,7 +61,7 @@
> -XMLElement::addElement(const XMLElement& element) {
> -	XMLElementList::iterator it = _elements.insert(make_pair(element.getElementName(), element));
> +XMLElement::addElement(XMLElement& element) {
>-+	XMLElementList::iterator it = _elements.insert(make_pair(element.getElementName(), make_shared_XMLElement(&element)));
>++	XMLElementList::iterator it = _elements.insert(make_pair(element.getElementName(), make_shared_XMLElement(element)));
>  	return it;
>  }
>

Actions: View | Diff

Attachments on bug 191871: 144677 | 144678 | 144737 | 144738 | 144750 | 144752 | 144763 | 144764 | 144768 | 144769 | 144778 | 144784