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.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/word.h')
| -rw-r--r-- | lib/word.h | 12 |
1 files changed, 6 insertions, 6 deletions
| diff --git a/lib/word.h b/lib/word.h index 8a333a4..864cee1 100644 --- a/lib/word.h +++ b/lib/word.h | |||
| @@ -126,9 +126,9 @@ namespace verbly { | |||
| 126 | 126 | ||
| 127 | // Relationships with other objects | 127 | // Relationships with other objects |
| 128 | 128 | ||
| 129 | static const field notion; | 129 | static const field notions; |
| 130 | static const field lemma; | 130 | static const field lemmas; |
| 131 | static const field frame; | 131 | static const field frames; |
| 132 | 132 | ||
| 133 | // Relationships with self | 133 | // Relationships with self |
| 134 | 134 | ||
| @@ -169,11 +169,11 @@ namespace verbly { | |||
| 169 | 169 | ||
| 170 | const database* db_; | 170 | const database* db_; |
| 171 | 171 | ||
| 172 | mutable class notion notion_; | 172 | mutable notion notion_; |
| 173 | mutable class lemma lemma_; | 173 | mutable lemma lemma_; |
| 174 | 174 | ||
| 175 | mutable bool initializedFrames_ = false; | 175 | mutable bool initializedFrames_ = false; |
| 176 | mutable std::vector<class frame> frames_; | 176 | mutable std::vector<frame> frames_; |
| 177 | 177 | ||
| 178 | }; | 178 | }; |
| 179 | 179 | ||