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/form.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/form.h')
| -rw-r--r-- | lib/form.h | 6 |
1 files changed, 3 insertions, 3 deletions
| diff --git a/lib/form.h b/lib/form.h index cf64117..a05d015 100644 --- a/lib/form.h +++ b/lib/form.h | |||
| @@ -104,9 +104,9 @@ namespace verbly { | |||
| 104 | 104 | ||
| 105 | // Relationships to other objects | 105 | // Relationships to other objects |
| 106 | 106 | ||
| 107 | static const field lemma; | 107 | static const field lemmas; |
| 108 | 108 | ||
| 109 | static const field pronunciation; | 109 | static const field pronunciations; |
| 110 | 110 | ||
| 111 | private: | 111 | private: |
| 112 | bool valid_ = false; | 112 | bool valid_ = false; |
| @@ -119,7 +119,7 @@ namespace verbly { | |||
| 119 | const database* db_; | 119 | const database* db_; |
| 120 | 120 | ||
| 121 | mutable bool initializedPronunciations_ = false; | 121 | mutable bool initializedPronunciations_ = false; |
| 122 | mutable std::vector<class pronunciation> pronunciations_; | 122 | mutable std::vector<pronunciation> pronunciations_; |
| 123 | 123 | ||
| 124 | }; | 124 | }; |
| 125 | 125 | ||