diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
| commit | aa31a06235496c0d808e57c8ce914cb4b640bc6e (patch) | |
| tree | 33385e828ddca0b2857bac9e3dac4dd3723a3eee /lib | |
| parent | f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02 (diff) | |
| parent | 00a1c6118b2d64b867c8e640c295462bcccfc7c9 (diff) | |
| download | astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.gz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.bz2 astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.xz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/include/rapidxml/rapidxml.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/include/rapidxml/rapidxml.hpp b/lib/include/rapidxml/rapidxml.hpp index ae91e08..ffa41c4 100644 --- a/lib/include/rapidxml/rapidxml.hpp +++ b/lib/include/rapidxml/rapidxml.hpp @@ -74,9 +74,9 @@ namespace rapidxml public: //! Constructs parse error - parse_error(const char *what, void *where) - : m_what(what) - , m_where(where) + parse_error(const char *what_, void *where_) + : m_what(what_) + , m_where(where_) { } |