From bea3673ae1b3d19585dec56e96dbcd8a56b96e6d Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger 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/word.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/word.h') diff --git a/lib/word.h b/lib/word.h index 8a333a4..864cee1 100644 --- a/lib/word.h +++ b/lib/word.h @@ -126,9 +126,9 @@ namespace verbly { // Relationships with other objects - static const field notion; - static const field lemma; - static const field frame; + static const field notions; + static const field lemmas; + static const field frames; // Relationships with self @@ -169,11 +169,11 @@ namespace verbly { const database* db_; - mutable class notion notion_; - mutable class lemma lemma_; + mutable notion notion_; + mutable lemma lemma_; mutable bool initializedFrames_ = false; - mutable std::vector frames_; + mutable std::vector frames_; }; -- cgit 1.4.1