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/notion.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/notion.cpp')
| -rw-r--r-- | lib/notion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/lib/notion.cpp b/lib/notion.cpp index c8a8b47..e8cc616 100644 --- a/lib/notion.cpp +++ b/lib/notion.cpp | |||
| @@ -13,7 +13,7 @@ namespace verbly { | |||
| 13 | const field notion::wnid = field::integerField(object::notion, "wnid", true); | 13 | const field notion::wnid = field::integerField(object::notion, "wnid", true); |
| 14 | const field notion::numOfImages = field::integerField(object::notion, "images", true); | 14 | const field notion::numOfImages = field::integerField(object::notion, "images", true); |
| 15 | 15 | ||
| 16 | const field notion::word = field::joinField(object::notion, "word_id", object::word); | 16 | const field notion::words = field::joinField(object::notion, "word_id", object::word); |
| 17 | 17 | ||
| 18 | const field notion::hypernyms = field::selfJoin(object::notion, "notion_id", "hypernymy", "hyponym_id", "hypernym_id"); | 18 | const field notion::hypernyms = field::selfJoin(object::notion, "notion_id", "hypernymy", "hyponym_id", "hypernym_id"); |
| 19 | const field notion::hyponyms = field::selfJoin(object::notion, "notion_id", "hypernymy", "hypernym_id", "hyponym_id"); | 19 | const field notion::hyponyms = field::selfJoin(object::notion, "notion_id", "hypernymy", "hypernym_id", "hyponym_id"); |
| @@ -53,7 +53,7 @@ namespace verbly { | |||
| 53 | const field notion::causes = field::selfJoin(object::notion, "notion_id", "causality", "effect_id", "cause_id"); | 53 | const field notion::causes = field::selfJoin(object::notion, "notion_id", "causality", "effect_id", "cause_id"); |
| 54 | const field notion::effects = field::selfJoin(object::notion, "notion_id", "causality", "cause_id", "effect_id"); | 54 | const field notion::effects = field::selfJoin(object::notion, "notion_id", "causality", "cause_id", "effect_id"); |
| 55 | 55 | ||
| 56 | const notion::preposition_group_field notion::prepositionGroup = {}; | 56 | const notion::preposition_group_field notion::prepositionGroups = {}; |
| 57 | 57 | ||
| 58 | const field notion::preposition_group_field::isA = field::joinField(object::notion, "notion_id", "is_a"); | 58 | const field notion::preposition_group_field::isA = field::joinField(object::notion, "notion_id", "is_a"); |
| 59 | const field notion::preposition_group_field::groupNameField = field::stringField("is_a", "groupname"); | 59 | const field notion::preposition_group_field::groupNameField = field::stringField("is_a", "groupname"); |