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/lemma.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/lemma.cpp') diff --git a/lib/lemma.cpp b/lib/lemma.cpp index 0c6e99e..ea7b0ea 100644 --- a/lib/lemma.cpp +++ b/lib/lemma.cpp @@ -12,9 +12,9 @@ namespace verbly { const field lemma::id = field::integerField(object::lemma, "lemma_id"); const field lemma::inflectionCategory = field::integerField(object::lemma, "category"); - const field lemma::word = field::joinField(object::lemma, "lemma_id", object::word); + const field lemma::words = field::joinField(object::lemma, "lemma_id", object::word); - field lemma::form(inflection category) + field lemma::forms(inflection category) { return field::joinWhere(object::lemma, "form_id", object::form, inflectionCategory, static_cast(category)); } @@ -61,7 +61,7 @@ namespace verbly { void lemma::initializeForm(inflection infl) const { - forms_[infl] = db_->forms(form::lemma %= ((inflectionCategory == infl) && *this), verbly::form::id, -1).all(); + forms_[infl] = db_->forms(form::lemmas %= ((inflectionCategory == infl) && *this), verbly::form::id, -1).all(); } }; -- cgit 1.4.1