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/notion.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/notion.h') diff --git a/lib/notion.h b/lib/notion.h index a180d73..4fd3396 100644 --- a/lib/notion.h +++ b/lib/notion.h @@ -124,7 +124,7 @@ namespace verbly { // Relationships with other objects - static const field word; + static const field words; // Relationships with self @@ -179,7 +179,7 @@ namespace verbly { static const field groupNameField; }; - static const preposition_group_field prepositionGroup; + static const preposition_group_field prepositionGroups; private: bool valid_ = false; -- cgit 1.4.1