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/word.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/word.cpp')
| -rw-r--r-- | lib/word.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
| diff --git a/lib/word.cpp b/lib/word.cpp index 90eab1d..d75159c 100644 --- a/lib/word.cpp +++ b/lib/word.cpp | |||
| @@ -15,9 +15,9 @@ namespace verbly { | |||
| 15 | const field word::tagCount = field::integerField(object::word, "tag_count", true); | 15 | const field word::tagCount = field::integerField(object::word, "tag_count", true); |
| 16 | const field word::adjectivePosition = field::integerField(object::word, "position", true); | 16 | const field word::adjectivePosition = field::integerField(object::word, "position", true); |
| 17 | 17 | ||
| 18 | const field word::notion = field::joinField(object::word, "notion_id", object::notion); | 18 | const field word::notions = field::joinField(object::word, "notion_id", object::notion); |
| 19 | const field word::lemma = field::joinField(object::word, "lemma_id", object::lemma); | 19 | const field word::lemmas = field::joinField(object::word, "lemma_id", object::lemma); |
| 20 | const field word::frame = field::joinField(object::word, "group_id", object::frame, true); | 20 | const field word::frames = field::joinField(object::word, "group_id", object::frame, true); |
| 21 | 21 | ||
| 22 | const field word::antonyms = field::selfJoin(object::word, "word_id", "antonymy", "antonym_2_id", "antonym_1_id"); | 22 | const field word::antonyms = field::selfJoin(object::word, "word_id", "antonymy", "antonym_2_id", "antonym_1_id"); |
| 23 | 23 | ||