summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArseny Kapoulkine <arseny.kapoulkine@gmail.com>2016-10-17 20:36:49 -0700
committerGitHub <noreply@github.com>2016-10-17 20:36:49 -0700
commita832e8a5eff11f58a00ca41ec51ff3895b0da165 (patch)
tree5bdb84eac327f15b879bec3aa1cdba52a5839fe6 /src
parentf53bddd7d5c79c35145ab506e48b18c457026543 (diff)
parentd0b0cc75ad1bc7c0c3226bc57d63095339579cbe (diff)
Merge pull request #119 from pavelkryukov/master
Add C++11 'override' specifier
Diffstat (limited to 'src')
-rw-r--r--src/pugixml.hpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index 09bd692..c4d44e6 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -72,6 +72,15 @@
# endif
#endif
+// If C++ is 2011 or higher, add 'override' qualifiers
+#ifndef PUGIXML_OVERRIDE
+# if __cplusplus >= 201103
+# define PUGIXML_OVERRIDE override
+# else
+# define PUGIXML_OVERRIDE
+# endif
+#endif
+
// Character interface macros
#ifdef PUGIXML_WCHAR_MODE
# define PUGIXML_TEXT(t) L ## t
@@ -273,7 +282,7 @@ namespace pugi
// Construct writer from a FILE* object; void* is used to avoid header dependencies on stdio
xml_writer_file(void* file);
- virtual void write(const void* data, size_t size);
+ virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
private:
void* file;
@@ -288,7 +297,7 @@ namespace pugi
xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream);
xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream);
- virtual void write(const void* data, size_t size);
+ virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
private:
std::basic_ostream<char, std::char_traits<char> >* narrow_stream;
@@ -1214,7 +1223,7 @@ namespace pugi
explicit xpath_exception(const xpath_parse_result& result);
// Get error message
- virtual const char* what() const throw();
+ virtual const char* what() const throw() PUGIXML_OVERRIDE;
// Get parse result
const xpath_parse_result& result() const;