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/pronunciation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/pronunciation.cpp') diff --git a/lib/pronunciation.cpp b/lib/pronunciation.cpp index e937ba6..3ddb1c5 100644 --- a/lib/pronunciation.cpp +++ b/lib/pronunciation.cpp @@ -15,7 +15,7 @@ namespace verbly { const field pronunciation::numOfSyllables = field::integerField(object::pronunciation, "syllables"); const field pronunciation::stress = field::stringField(object::pronunciation, "stress"); - const field pronunciation::form = field::joinThrough(object::pronunciation, "pronunciation_id", object::form, "forms_pronunciations", "form_id"); + const field pronunciation::forms = field::joinThrough(object::pronunciation, "pronunciation_id", object::form, "forms_pronunciations", "form_id"); const field pronunciation::prerhyme = field::stringField(object::pronunciation, "prerhyme", true); const field pronunciation::rhyme = field::stringField(object::pronunciation, "rhyme", true); -- cgit 1.4.1