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.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/word.cpp') diff --git a/lib/word.cpp b/lib/word.cpp index 90eab1d..d75159c 100644 --- a/lib/word.cpp +++ b/lib/word.cpp @@ -15,9 +15,9 @@ namespace verbly { const field word::tagCount = field::integerField(object::word, "tag_count", true); const field word::adjectivePosition = field::integerField(object::word, "position", true); - const field word::notion = field::joinField(object::word, "notion_id", object::notion); - const field word::lemma = field::joinField(object::word, "lemma_id", object::lemma); - const field word::frame = field::joinField(object::word, "group_id", object::frame, true); + const field word::notions = field::joinField(object::word, "notion_id", object::notion); + const field word::lemmas = field::joinField(object::word, "lemma_id", object::lemma); + const field word::frames = field::joinField(object::word, "group_id", object::frame, true); const field word::antonyms = field::selfJoin(object::word, "word_id", "antonymy", "antonym_2_id", "antonym_1_id"); -- cgit 1.4.1