From bea3673ae1b3d19585dec56e96dbcd8a56b96e6d Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 3 Feb 2017 17:02:58 -0500
Subject: Renamed object join fields to prevent conflicts with class names

This was not a problem with clang but it caused compilation errors with gcc.
---
 lib/lemma.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/lemma.h')

diff --git a/lib/lemma.h b/lib/lemma.h
index 56cfc56..bba5572 100644
--- a/lib/lemma.h
+++ b/lib/lemma.h
@@ -72,9 +72,9 @@ namespace verbly {
 
     // Relationships to other objects
 
-    static const field word;
+    static const field words;
 
-    static field form(inflection category);
+    static field forms(inflection category);
 
   private:
 
@@ -84,7 +84,7 @@ namespace verbly {
 
     int id_;
 
-    mutable std::map<inflection, std::vector<class form>> forms_;
+    mutable std::map<inflection, std::vector<form>> forms_;
 
     const database* db_;
 
-- 
cgit 1.4.1