From 365dda7937dae0b6edef1f498473c57c715eec1d Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 17 Mar 2016 01:27:54 -0400
Subject: Renamed some class members that shared names with classes

---
 lib/token.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/token.h')

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 <string>
 #include <list>
 #include <sstream>
+#include <algorithm>
 
 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