pugixml: headers diff between 1.5 and 1.6 versions

	pugixml.hpp	pugixml.hpp
	/**	/**

	* pugixml parser - version 1.5	* pugixml parser - version 1.6
	* --------------------------------------------------------	* --------------------------------------------------------

	* Copyright (C) 2006-2014, by Arseny Kapoulkine (arseny.kapoulkine@gmail.c om)	* Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.c om)
	* Report bugs and download new versions at http://pugixml.org/	* Report bugs and download new versions at http://pugixml.org/
	*	*
	* This library is distributed under the MIT License. See notice at the end	* This library is distributed under the MIT License. See notice at the end
	* of this file.	* of this file.
	*	*
	* This work is based on the pugxml parser, which is:	* This work is based on the pugxml parser, which is:
	* Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)	* Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
	*/	*/

	#ifndef PUGIXML_VERSION	#ifndef PUGIXML_VERSION
	// Define version macro; evaluates to major * 100 + minor so that it's safe to use in less-than comparisons	// Define version macro; evaluates to major * 100 + minor so that it's safe to use in less-than comparisons

	# define PUGIXML_VERSION 150	# define PUGIXML_VERSION 160
	#endif	#endif

	// Include user configuration file (this can define various configuration m acros)	// Include user configuration file (this can define various configuration m acros)
	#include "pugiconfig.hpp"	#include "pugiconfig.hpp"

	#ifndef HEADER_PUGIXML_HPP	#ifndef HEADER_PUGIXML_HPP
	#define HEADER_PUGIXML_HPP	#define HEADER_PUGIXML_HPP

	// Include stddef.h for size_t and ptrdiff_t	// Include stddef.h for size_t and ptrdiff_t
	#include <stddef.h>	#include <stddef.h>

	skipping to change at line 355	skipping to change at line 355
	bool as_bool(bool def = false) const;	bool as_bool(bool def = false) const;

	// Set attribute name/value (returns false if attribute is e mpty or there is not enough memory)	// Set attribute name/value (returns false if attribute is e mpty or there is not enough memory)
	bool set_name(const char_t* rhs);	bool set_name(const char_t* rhs);
	bool set_value(const char_t* rhs);	bool set_value(const char_t* rhs);

	// Set attribute value with type conversion (numbers are con verted to strings, boolean is converted to "true"/"false")	// Set attribute value with type conversion (numbers are con verted to strings, boolean is converted to "true"/"false")
	bool set_value(int rhs);	bool set_value(int rhs);
	bool set_value(unsigned int rhs);	bool set_value(unsigned int rhs);
	bool set_value(double rhs);	bool set_value(double rhs);

		bool set_value(float rhs);
	bool set_value(bool rhs);	bool set_value(bool rhs);

	#ifdef PUGIXML_HAS_LONG_LONG	#ifdef PUGIXML_HAS_LONG_LONG
	bool set_value(long long rhs);	bool set_value(long long rhs);
	bool set_value(unsigned long long rhs);	bool set_value(unsigned long long rhs);
	#endif	#endif

	// Set attribute value (equivalent to set_value without erro r checking)	// Set attribute value (equivalent to set_value without erro r checking)
	xml_attribute& operator=(const char_t* rhs);	xml_attribute& operator=(const char_t* rhs);
	xml_attribute& operator=(int rhs);	xml_attribute& operator=(int rhs);
	xml_attribute& operator=(unsigned int rhs);	xml_attribute& operator=(unsigned int rhs);
	xml_attribute& operator=(double rhs);	xml_attribute& operator=(double rhs);

		xml_attribute& operator=(float rhs);
	xml_attribute& operator=(bool rhs);	xml_attribute& operator=(bool rhs);

	#ifdef PUGIXML_HAS_LONG_LONG	#ifdef PUGIXML_HAS_LONG_LONG
	xml_attribute& operator=(long long rhs);	xml_attribute& operator=(long long rhs);
	xml_attribute& operator=(unsigned long long rhs);	xml_attribute& operator=(unsigned long long rhs);
	#endif	#endif

	// Get next/previous attribute in the attribute list of the parent node	// Get next/previous attribute in the attribute list of the parent node
	xml_attribute next_attribute() const;	xml_attribute next_attribute() const;
	xml_attribute previous_attribute() const;	xml_attribute previous_attribute() const;

	skipping to change at line 434	skipping to change at line 436
	// Check if node is empty.	// Check if node is empty.
	bool empty() const;	bool empty() const;

	// Get node type	// Get node type
	xml_node_type type() const;	xml_node_type type() const;

	// Get node name, or "" if node is empty or it has no name	// Get node name, or "" if node is empty or it has no name
	const char_t* name() const;	const char_t* name() const;

	// Get node value, or "" if node is empty or it has no value	// Get node value, or "" if node is empty or it has no value

	// Note: For <node>text</node> node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes.	// Note: For <node>text</node> node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes.
	const char_t* value() const;	const char_t* value() const;

	// Get attribute list	// Get attribute list
	xml_attribute first_attribute() const;	xml_attribute first_attribute() const;
	xml_attribute last_attribute() const;	xml_attribute last_attribute() const;

	// Get children list	// Get children list
	xml_node first_child() const;	xml_node first_child() const;
	xml_node last_child() const;	xml_node last_child() const;


	skipping to change at line 697	skipping to change at line 699
	// Get text as bool (returns true if first character is in ' 1tTyY' set), or the default value if object is empty	// Get text as bool (returns true if first character is in ' 1tTyY' set), or the default value if object is empty
	bool as_bool(bool def = false) const;	bool as_bool(bool def = false) const;

	// Set text (returns false if object is empty or there is no t enough memory)	// Set text (returns false if object is empty or there is no t enough memory)
	bool set(const char_t* rhs);	bool set(const char_t* rhs);

	// Set text with type conversion (numbers are converted to s trings, boolean is converted to "true"/"false")	// Set text with type conversion (numbers are converted to s trings, boolean is converted to "true"/"false")
	bool set(int rhs);	bool set(int rhs);
	bool set(unsigned int rhs);	bool set(unsigned int rhs);
	bool set(double rhs);	bool set(double rhs);

		bool set(float rhs);
	bool set(bool rhs);	bool set(bool rhs);

	#ifdef PUGIXML_HAS_LONG_LONG	#ifdef PUGIXML_HAS_LONG_LONG
	bool set(long long rhs);	bool set(long long rhs);
	bool set(unsigned long long rhs);	bool set(unsigned long long rhs);
	#endif	#endif

	// Set text (equivalent to set without error checking)	// Set text (equivalent to set without error checking)
	xml_text& operator=(const char_t* rhs);	xml_text& operator=(const char_t* rhs);
	xml_text& operator=(int rhs);	xml_text& operator=(int rhs);
	xml_text& operator=(unsigned int rhs);	xml_text& operator=(unsigned int rhs);
	xml_text& operator=(double rhs);	xml_text& operator=(double rhs);

		xml_text& operator=(float rhs);
	xml_text& operator=(bool rhs);	xml_text& operator=(bool rhs);

	#ifdef PUGIXML_HAS_LONG_LONG	#ifdef PUGIXML_HAS_LONG_LONG
	xml_text& operator=(long long rhs);	xml_text& operator=(long long rhs);
	xml_text& operator=(unsigned long long rhs);	xml_text& operator=(unsigned long long rhs);
	#endif	#endif

	// Get the data node (node_pcdata or node_cdata) for this ob ject	// Get the data node (node_pcdata or node_cdata) for this ob ject
	xml_node data() const;	xml_node data() const;
	};	};

	skipping to change at line 1332	skipping to change at line 1336
	{	{
	// Workarounds for (non-standard) iterator category detection	// Workarounds for (non-standard) iterator category detection
	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category (const pugi::xml_node_iterator&);	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category (const pugi::xml_node_iterator&);
	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category (const pugi::xml_attribute_iterator&);	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category (const pugi::xml_attribute_iterator&);
	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category (const pugi::xml_named_node_iterator&);	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category (const pugi::xml_named_node_iterator&);
	}	}
	#endif	#endif

	#endif	#endif


		// Make sure implementation is included in header-only mode
		// Use macro expansion in #include to work around QMake (QTBUG-11923)
		#if defined(PUGIXML_HEADER_ONLY) && !defined(PUGIXML_SOURCE)
		# define PUGIXML_SOURCE "pugixml.cpp"
		# include PUGIXML_SOURCE
		#endif

	/**	/**

	* Copyright (c) 2006-2014 Arseny Kapoulkine	* Copyright (c) 2006-2015 Arseny Kapoulkine
	*	*
	* Permission is hereby granted, free of charge, to any person	* Permission is hereby granted, free of charge, to any person
	* obtaining a copy of this software and associated documentation	* obtaining a copy of this software and associated documentation
	* files (the "Software"), to deal in the Software without	* files (the "Software"), to deal in the Software without
	* restriction, including without limitation the rights to use,	* restriction, including without limitation the rights to use,
	* copy, modify, merge, publish, distribute, sublicense, and/or sell	* copy, modify, merge, publish, distribute, sublicense, and/or sell
	* copies of the Software, and to permit persons to whom the	* copies of the Software, and to permit persons to whom the
	* Software is furnished to do so, subject to the following	* Software is furnished to do so, subject to the following
	* conditions:	* conditions:
	*	*

End of changes. 10 change blocks.
	5 lines changed or deleted	16 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/