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/pronunciation.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/pronunciation.cpp')
| -rw-r--r-- | lib/pronunciation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
| 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 { | |||
| 15 | const field pronunciation::numOfSyllables = field::integerField(object::pronunciation, "syllables"); | 15 | const field pronunciation::numOfSyllables = field::integerField(object::pronunciation, "syllables"); |
| 16 | const field pronunciation::stress = field::stringField(object::pronunciation, "stress"); | 16 | const field pronunciation::stress = field::stringField(object::pronunciation, "stress"); |
| 17 | 17 | ||
| 18 | const field pronunciation::form = field::joinThrough(object::pronunciation, "pronunciation_id", object::form, "forms_pronunciations", "form_id"); | 18 | const field pronunciation::forms = field::joinThrough(object::pronunciation, "pronunciation_id", object::form, "forms_pronunciations", "form_id"); |
| 19 | 19 | ||
| 20 | const field pronunciation::prerhyme = field::stringField(object::pronunciation, "prerhyme", true); | 20 | const field pronunciation::prerhyme = field::stringField(object::pronunciation, "prerhyme", true); |
| 21 | const field pronunciation::rhyme = field::stringField(object::pronunciation, "rhyme", true); | 21 | const field pronunciation::rhyme = field::stringField(object::pronunciation, "rhyme", true); |