From 365dda7937dae0b6edef1f498473c57c715eec1d Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Thu, 17 Mar 2016 01:27:54 -0400 Subject: Renamed some class members that shared names with classes --- lib/token.cpp | 4 ++-- lib/token.h | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/token.cpp b/lib/token.cpp index aa8f50e..facab8a 100644 --- a/lib/token.cpp +++ b/lib/token.cpp @@ -12,12 +12,12 @@ namespace verbly { return _type; } - verb_token::verb_token(const class verb& _verb) : token(token::type::verb), _verb(&_verb) + verb_token::verb_token(const verb& _verb) : token(token::type::verb), _verb(&_verb) { } - const class verb& verb_token::verb() const + const verb& verb_token::get_verb() const { return *_verb; } diff --git a/lib/token.h b/lib/token.h index 44d99cb..b22032b 100644 --- a/lib/token.h +++ b/lib/token.h @@ -4,6 +4,7 @@ #include #include #include +#include namespace verbly { @@ -61,9 +62,9 @@ namespace verbly { inflection _inflection = inflection::infinitive; public: - verb_token(const class verb& _verb); + verb_token(const verb& _verb); - const class verb& verb() const; + const verb& get_verb() const; verb_token& inflect(inflection infl); @@ -260,7 +261,7 @@ namespace verbly { return m_theme; } - fillin_type fillin_type() const + fillin_type get_fillin_type() const { return m_fillin_type; } -- cgit 1.4.1