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/form.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/form.h')

diff --git a/lib/form.h b/lib/form.h
index cf64117..a05d015 100644
--- a/lib/form.h
+++ b/lib/form.h
@@ -104,9 +104,9 @@ namespace verbly {
 
     // Relationships to other objects
 
-    static const field lemma;
+    static const field lemmas;
 
-    static const field pronunciation;
+    static const field pronunciations;
 
   private:
     bool valid_ = false;
@@ -119,7 +119,7 @@ namespace verbly {
     const database* db_;
 
     mutable bool initializedPronunciations_ = false;
-    mutable std::vector<class pronunciation> pronunciations_;
+    mutable std::vector<pronunciation> pronunciations_;
 
   };
 
-- 
cgit 1.4.1