diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-03-24 20:08:57 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-03-24 20:08:57 -0700 |
| commit | 61a7b2f2fd221386d680329b358a0cadd9e60986 (patch) | |
| tree | c31ec090cafe93862c3ddc1c48f06c318858c813 | |
| parent | 998bf4792ae255871da89e11de6e1e9cff2747f7 (diff) | |
| download | tmwa-61a7b2f2fd221386d680329b358a0cadd9e60986.tar.gz tmwa-61a7b2f2fd221386d680329b358a0cadd9e60986.tar.bz2 tmwa-61a7b2f2fd221386d680329b358a0cadd9e60986.tar.xz tmwa-61a7b2f2fd221386d680329b358a0cadd9e60986.zip | |
Only 23 days until I can drop gcc 4.6 support ...
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/spell-convert/ast.hpp | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 3dc9847..9c64a6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: fi - sudo apt-get update -qq - sudo apt-get install -qq $PACKAGE - - sudo apt-get install -qq libgtest-dev + - sudo apt-get install -qq libgtest-dev valgrind - make --version ## Do something before the main test script diff --git a/src/spell-convert/ast.hpp b/src/spell-convert/ast.hpp index e5319fc..a830463 100644 --- a/src/spell-convert/ast.hpp +++ b/src/spell-convert/ast.hpp @@ -6,6 +6,10 @@ # include "../strings/rstring.hpp" +#if __GNUC__ == 4 && __GNUC_MINOR__ == 6 +#define override +#endif + // We just leak # pragma GCC diagnostic ignored "-Wnon-virtual-dtor" @@ -111,6 +115,9 @@ struct SpellArg { RString varname; RString vartype; + + SpellArg() : varname(), vartype() {} + SpellArg(RString n, RString t) : varname(n), vartype(t) {} }; struct Effect @@ -340,6 +347,8 @@ struct Item { RString count; RString item; + + Item(RString c, RString i) : count(c), item(i) {} }; struct Expression @@ -429,4 +438,8 @@ struct AreaBar : Expression virtual void show() override; }; +#ifdef override +#undef override +#endif + #endif // AST_HPP |