diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-02-03 17:02:58 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-02-03 17:02:58 -0500 |
| commit | bea3673ae1b3d19585dec56e96dbcd8a56b96e6d (patch) | |
| tree | c8ab07b8c69f90c053d6b60620b679216df011fc /lib/lemma.cpp | |
| parent | e3d5d30956434732fa99d390f927906742bf7d85 (diff) | |
| download | verbly-bea3673ae1b3d19585dec56e96dbcd8a56b96e6d.tar.gz verbly-bea3673ae1b3d19585dec56e96dbcd8a56b96e6d.tar.bz2 verbly-bea3673ae1b3d19585dec56e96dbcd8a56b96e6d.zip | |
Renamed object join fields to prevent conflicts with class names
This was not a problem with clang but it caused compilation errors with gcc.
Diffstat (limited to 'lib/lemma.cpp')
| -rw-r--r-- | lib/lemma.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
| 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 { | |||
| 12 | const field lemma::id = field::integerField(object::lemma, "lemma_id"); | 12 | const field lemma::id = field::integerField(object::lemma, "lemma_id"); |
| 13 | const field lemma::inflectionCategory = field::integerField(object::lemma, "category"); | 13 | const field lemma::inflectionCategory = field::integerField(object::lemma, "category"); |
| 14 | 14 | ||
| 15 | const field lemma::word = field::joinField(object::lemma, "lemma_id", object::word); | 15 | const field lemma::words = field::joinField(object::lemma, "lemma_id", object::word); |
| 16 | 16 | ||
| 17 | field lemma::form(inflection category) | 17 | field lemma::forms(inflection category) |
| 18 | { | 18 | { |
| 19 | return field::joinWhere(object::lemma, "form_id", object::form, inflectionCategory, static_cast<int>(category)); | 19 | return field::joinWhere(object::lemma, "form_id", object::form, inflectionCategory, static_cast<int>(category)); |
| 20 | } | 20 | } |
| @@ -61,7 +61,7 @@ namespace verbly { | |||
| 61 | 61 | ||
| 62 | void lemma::initializeForm(inflection infl) const | 62 | void lemma::initializeForm(inflection infl) const |
| 63 | { | 63 | { |
| 64 | forms_[infl] = db_->forms(form::lemma %= ((inflectionCategory == infl) && *this), verbly::form::id, -1).all(); | 64 | forms_[infl] = db_->forms(form::lemmas %= ((inflectionCategory == infl) && *this), verbly::form::id, -1).all(); |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | }; | 67 | }; |