From a43b129e5240f860b94550097650d54a9ae9584fea10d3c512debd8b6b8e6e7e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 13 May 2012 15:26:23 +0000 Subject: [PATCH] Accepting request 120825 from home:NicoK:branches:devel:libraries:c_c++ update to 2.6.2 (used the official .tar.gz sources instead of re-packaging into lzma) OBS-URL: https://build.opensuse.org/request/show/120825 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tinyxml?expand=0&rev=18 --- tinyxml.changes | 20 ++++++++++++++++++++ tinyxml.h.in | 40 +++++++++++++++++++++++----------------- tinyxml.spec | 7 +++---- tinyxml_2_6_1.tar.lzma | 3 --- tinyxml_2_6_2.tar.gz | 3 +++ 5 files changed, 49 insertions(+), 24 deletions(-) delete mode 100644 tinyxml_2_6_1.tar.lzma create mode 100644 tinyxml_2_6_2.tar.gz diff --git a/tinyxml.changes b/tinyxml.changes index ab0ba65..f2bfaac 100644 --- a/tinyxml.changes +++ b/tinyxml.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sun May 13 12:19:58 UTC 2012 - lists.nico.k@googlemail.com + +- updated to 2.6.2: + * Switched over to VC 2010 + * Fixed up all the build issues arising from that. + (Lots of latent build problems.) + * Removed the old, now unmaintained and likely not working, + build files. + * Fixed some static analysis issues reported by orbitcowboy + from cppcheck. + * Bayard 95 sent in analysis from a different analyzer - fixes + applied from that as well. + * Tim Kosse sent a patch fixing an infinite loop. + * Ma Anguo identified a doc issue. + * Eddie Cohen identified a missing qualifier resulting in a + compilation error on some systems. + * Fixed a line ending bug. (What year is this? Can we all agree + on a format for text files? Please? ...oh well.) + ------------------------------------------------------------------- Fri Mar 2 01:25:08 UTC 2012 - crrodriguez@opensuse.org diff --git a/tinyxml.h.in b/tinyxml.h.in index 4cf4926..462cb0c 100644 --- a/tinyxml.h.in +++ b/tinyxml.h.in @@ -1,6 +1,6 @@ /* www.sourceforge.net/projects/tinyxml -Original code (2.0 and earlier )copyright (c) 2000-2006 Lee Thomason (www.grinninglizard.com) +Original code by Lee Thomason (www.grinninglizard.com) This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any @@ -93,7 +93,7 @@ class TiXmlParsingData; const int TIXML_MAJOR_VERSION = 2; const int TIXML_MINOR_VERSION = 6; -const int TIXML_PATCH_VERSION = 1; +const int TIXML_PATCH_VERSION = 2; /* Internal structure for tracking location of items in the XML file. @@ -148,7 +148,7 @@ public: virtual bool Visit( const TiXmlText& /*text*/ ) { return true; } /// Visit a comment node virtual bool Visit( const TiXmlComment& /*comment*/ ) { return true; } - /// Visit an unknow node + /// Visit an unknown node virtual bool Visit( const TiXmlUnknown& /*unknown*/ ) { return true; } }; @@ -680,8 +680,8 @@ public: #endif /** Query the type (as an enumerated value, above) of this node. - The possible types are: DOCUMENT, ELEMENT, COMMENT, - UNKNOWN, TEXT, and DECLARATION. + The possible types are: TINYXML_DOCUMENT, TINYXML_ELEMENT, TINYXML_COMMENT, + TINYXML_UNKNOWN, TINYXML_TEXT, and TINYXML_DECLARATION. */ int Type() const { return type; } @@ -952,7 +952,7 @@ public: TiXmlElement( const TiXmlElement& ); - void operator=( const TiXmlElement& base ); + TiXmlElement& operator=( const TiXmlElement& base ); virtual ~TiXmlElement(); @@ -985,6 +985,13 @@ public: does not exist, then TIXML_NO_ATTRIBUTE is returned. */ int QueryIntAttribute( const char* name, int* _value ) const; + /// QueryUnsignedAttribute examines the attribute - see QueryIntAttribute(). + int QueryUnsignedAttribute( const char* name, unsigned* _value ) const; + /** QueryBoolAttribute examines the attribute - see QueryIntAttribute(). + Note that '1', 'true', or 'yes' are considered true, while '0', 'false' + and 'no' are considered false. + */ + int QueryBoolAttribute( const char* name, bool* _value ) const; /// QueryDoubleAttribute examines the attribute - see QueryIntAttribute(). int QueryDoubleAttribute( const char* name, double* _value ) const; /// QueryFloatAttribute examines the attribute - see QueryIntAttribute(). @@ -1164,7 +1171,7 @@ public: SetValue( _value ); } TiXmlComment( const TiXmlComment& ); - void operator=( const TiXmlComment& base ); + TiXmlComment& operator=( const TiXmlComment& base ); virtual ~TiXmlComment() {} @@ -1178,8 +1185,8 @@ public: */ virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding ); - virtual const TiXmlComment* ToComment() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type. - virtual TiXmlComment* ToComment() { return this; } ///< Cast to a more defined type. Will return null not of the requested type. + virtual const TiXmlComment* ToComment() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type. + virtual TiXmlComment* ToComment() { return this; } ///< Cast to a more defined type. Will return null not of the requested type. /** Walk the XML tree visiting this node and all of its children. */ @@ -1229,7 +1236,7 @@ public: #endif TiXmlText( const TiXmlText& copy ) : TiXmlNode( TiXmlNode::TINYXML_TEXT ) { copy.CopyTo( this ); } - void operator=( const TiXmlText& base ) { base.CopyTo( this ); } + TiXmlText& operator=( const TiXmlText& base ) { base.CopyTo( this ); return *this; } // Write this text object to a FILE stream. virtual void Print( FILE* cfile, int depth ) const; @@ -1296,7 +1303,7 @@ public: const char* _standalone ); TiXmlDeclaration( const TiXmlDeclaration& copy ); - void operator=( const TiXmlDeclaration& copy ); + TiXmlDeclaration& operator=( const TiXmlDeclaration& copy ); virtual ~TiXmlDeclaration() {} @@ -1353,7 +1360,7 @@ public: virtual ~TiXmlUnknown() {} TiXmlUnknown( const TiXmlUnknown& copy ) : TiXmlNode( TiXmlNode::TINYXML_UNKNOWN ) { copy.CopyTo( this ); } - void operator=( const TiXmlUnknown& copy ) { copy.CopyTo( this ); } + TiXmlUnknown& operator=( const TiXmlUnknown& copy ) { copy.CopyTo( this ); return *this; } /// Creates a copy of this Unknown and returns it. virtual TiXmlNode* Clone() const; @@ -1362,8 +1369,8 @@ public: virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding ); - virtual const TiXmlUnknown* ToUnknown() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type. - virtual TiXmlUnknown* ToUnknown() { return this; } ///< Cast to a more defined type. Will return null not of the requested type. + virtual const TiXmlUnknown* ToUnknown() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type. + virtual TiXmlUnknown* ToUnknown() { return this; } ///< Cast to a more defined type. Will return null not of the requested type. /** Walk the XML tree visiting this node and all of its children. */ @@ -1399,7 +1406,7 @@ public: #endif TiXmlDocument( const TiXmlDocument& copy ); - void operator=( const TiXmlDocument& copy ); + TiXmlDocument& operator=( const TiXmlDocument& copy ); virtual ~TiXmlDocument() {} @@ -1637,7 +1644,7 @@ public: TiXmlHandle( TiXmlNode* _node ) { this->node = _node; } /// Copy constructor TiXmlHandle( const TiXmlHandle& ref ) { this->node = ref.node; } - TiXmlHandle operator=( const TiXmlHandle& ref ) { this->node = ref.node; return *this; } + TiXmlHandle operator=( const TiXmlHandle& ref ) { if ( &ref != this ) this->node = ref.node; return *this; } /// Return a handle to the first child node. TiXmlHandle FirstChild() const; @@ -1798,4 +1805,3 @@ private: #endif #endif - diff --git a/tinyxml.spec b/tinyxml.spec index d786ff4..6c1b473 100644 --- a/tinyxml.spec +++ b/tinyxml.spec @@ -19,14 +19,14 @@ %define so_version 0 Name: tinyxml -Version: 2.6.1 +Version: 2.6.2 Release: 0 -%define file_version 2_6_1 +%define file_version 2_6_2 %define lib_package lib%{name}%{so_version} Summary: A simple, small, C++ XML parser License: Zlib Group: System/Libraries -Source: %{name}_%{file_version}.tar.lzma +Source: http://downloads.sourceforge.net/tinyxml/%{name}_%{file_version}.tar.gz Source1: configure.ac Source2: Makefile.am Source3: tinyxml.h.in @@ -38,7 +38,6 @@ Url: http://sourceforge.net/projects/tinyxml BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: libtool -BuildRequires: lzma %description TinyXML is a simple, small, C++ XML parser that can be easily integrating diff --git a/tinyxml_2_6_1.tar.lzma b/tinyxml_2_6_1.tar.lzma deleted file mode 100644 index aaf9dc6..0000000 --- a/tinyxml_2_6_1.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dc0c2350ab5d9a5ed34f803064cf1d65f41f72c6178f756a42e9336dcb93655 -size 130955 diff --git a/tinyxml_2_6_2.tar.gz b/tinyxml_2_6_2.tar.gz new file mode 100644 index 0000000..0e9bff5 --- /dev/null +++ b/tinyxml_2_6_2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593 +size 210124