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/frame.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/frame.h')

diff --git a/lib/frame.h b/lib/frame.h
index 36e179e..e049584 100644
--- a/lib/frame.h
+++ b/lib/frame.h
@@ -85,10 +85,10 @@ namespace verbly {
 
     // Relationships to other objects
 
-    static const field word;
+    static const field words;
 
-    static field part();
-    static field part(int index);
+    static field parts();
+    static field parts(int index);
 
   private:
     bool valid_ = false;
@@ -96,7 +96,7 @@ namespace verbly {
     int id_;
     int groupId_;
     int length_;
-    std::vector<class part> parts_;
+    std::vector<part> parts_;
 
     const database* db_;
 
-- 
cgit 1.4.1