diff options
Diffstat (limited to 'comms/trustedqsl/files/patch-src_xml.cpp')
| -rw-r--r-- | comms/trustedqsl/files/patch-src_xml.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/comms/trustedqsl/files/patch-src_xml.cpp b/comms/trustedqsl/files/patch-src_xml.cpp index 75cc5fc1188e..4b5f42b7459a 100644 --- a/comms/trustedqsl/files/patch-src_xml.cpp +++ b/comms/trustedqsl/files/patch-src_xml.cpp @@ -1,23 +1,11 @@ ---- src/xml.cpp.orig 2014-07-12 13:18:13.000000000 -0700 -+++ src/xml.cpp 2014-07-18 05:40:18.000000000 -0700 -@@ -20,6 +20,11 @@ - using std::string; - using std::ostream; - using std::map; -+#ifdef USE_TR1 -+using std::tr1::shared_ptr; -+#else -+using std::make_shared; -+#endif - - namespace tqsllib { - -@@ -41,17 +46,17 @@ +--- src/xml.cpp.orig 2015-10-21 17:26:38 UTC ++++ src/xml.cpp +@@ -47,17 +47,17 @@ XMLElement::getAttribute(const string& k void XMLElement::xml_start(void *data, const XML_Char *name, const XML_Char **atts) { XMLElement *el = reinterpret_cast<XMLElement *>(data); - XMLElement new_el(name); -+ shared_ptr<XMLElement> new_el(new XMLElement(name)); ++ std::shared_ptr<XMLElement> new_el(new XMLElement(name)); //cout << "Element: " << name << endl; for (int i = 0; atts[i]; i += 2) { - new_el.setAttribute(atts[i], atts[i+1]); @@ -35,7 +23,7 @@ } } -@@ -65,7 +70,7 @@ +@@ -71,7 +71,7 @@ XMLElement::xml_end(void *data, const XM void XMLElement::xml_text(void *data, const XML_Char *text, int len) { XMLElement *el = reinterpret_cast<XMLElement *>(data); @@ -43,4 +31,4 @@ + el->_parsingStack.back()->second->_text.append(text, len); } - /* + int |