diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2015-01-16 21:48:50 -0800 |
|---|---|---|
| committer | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2015-01-16 21:48:50 -0800 |
| commit | e5ecbd63ce75de0a8f1473cbe0c1f9eea657dd02 (patch) | |
| tree | 8ace0fd644cc3c8274c1e74f2b0743d21a957441 /src/pugixml.hpp | |
| parent | 93c3ab46494f35c390b40220519d83634e4e347f (diff) | |
| parent | 8e95f0d88947631162f5ed1fc5427b414425604b (diff) | |
Merge branch 'master' into compact
Diffstat (limited to 'src/pugixml.hpp')
| -rw-r--r-- | src/pugixml.hpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/pugixml.hpp b/src/pugixml.hpp index 917ef4a..9798b46 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -352,6 +352,7 @@ namespace pugi bool set_value(int rhs); bool set_value(unsigned int rhs); bool set_value(double rhs); + bool set_value(float rhs); bool set_value(bool rhs); #ifdef PUGIXML_HAS_LONG_LONG @@ -364,6 +365,7 @@ namespace pugi xml_attribute& operator=(int rhs); xml_attribute& operator=(unsigned int rhs); xml_attribute& operator=(double rhs); + xml_attribute& operator=(float rhs); xml_attribute& operator=(bool rhs); #ifdef PUGIXML_HAS_LONG_LONG @@ -431,7 +433,7 @@ namespace pugi const char_t* name() const; // 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; // Get attribute list @@ -694,6 +696,7 @@ namespace pugi bool set(int rhs); bool set(unsigned int rhs); bool set(double rhs); + bool set(float rhs); bool set(bool rhs); #ifdef PUGIXML_HAS_LONG_LONG @@ -706,6 +709,7 @@ namespace pugi xml_text& operator=(int rhs); xml_text& operator=(unsigned int rhs); xml_text& operator=(double rhs); + xml_text& operator=(float rhs); xml_text& operator=(bool rhs); #ifdef PUGIXML_HAS_LONG_LONG @@ -1329,6 +1333,13 @@ namespace std #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 * |