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.h | |
| 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.h')
| -rw-r--r-- | lib/notion.h | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/lib/notion.h b/lib/notion.h index a180d73..4fd3396 100644 --- a/lib/notion.h +++ b/lib/notion.h | |||
| @@ -124,7 +124,7 @@ namespace verbly { | |||
| 124 | 124 | ||
| 125 | // Relationships with other objects | 125 | // Relationships with other objects |
| 126 | 126 | ||
| 127 | static const field word; | 127 | static const field words; |
| 128 | 128 | ||
| 129 | // Relationships with self | 129 | // Relationships with self |
| 130 | 130 | ||
| @@ -179,7 +179,7 @@ namespace verbly { | |||
| 179 | static const field groupNameField; | 179 | static const field groupNameField; |
| 180 | }; | 180 | }; |
| 181 | 181 | ||
| 182 | static const preposition_group_field prepositionGroup; | 182 | static const preposition_group_field prepositionGroups; |
| 183 | 183 | ||
| 184 | private: | 184 | private: |
| 185 | bool valid_ = false; | 185 | bool valid_ = false; |