diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-03-26 17:58:39 -0400 |
---|---|---|
committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-03-26 19:43:25 -0400 |
commit | ad5e31e2031349c9b9d0bf5d9fcaa1ea7950db58 (patch) | |
tree | dd3e7e943628f1410f4a8d2f260c994d62be308d /src/util/sexpr.h | |
parent | a9912269ab2b47b783a66f381b14148c0ac73e93 (diff) |
Fixes for warnings from clang++, from -std=gnu++0x, from swig, and from javac
Diffstat (limited to 'src/util/sexpr.h')
-rw-r--r-- | src/util/sexpr.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/util/sexpr.h b/src/util/sexpr.h index 135a83c7e..e9ea83aa1 100644 --- a/src/util/sexpr.h +++ b/src/util/sexpr.h @@ -37,6 +37,13 @@ namespace CVC4 { +class CVC4_PUBLIC SExprKeyword { + std::string d_str; +public: + SExprKeyword(const std::string& s) : d_str(s) {} + const std::string& getString() const { return d_str; } +};/* class SExpr::Keyword */ + /** * A simple S-expression. An S-expression is either an atom with a * string value, or a list of other S-expressions. @@ -65,11 +72,7 @@ class CVC4_PUBLIC SExpr { public: - class CVC4_PUBLIC Keyword : protected std::string { - public: - Keyword(const std::string& s) : std::string(s) {} - const std::string& getString() const { return *this; } - };/* class SExpr::Keyword */ + typedef SExprKeyword Keyword; SExpr() : d_sexprType(SEXPR_STRING), |