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/lemma.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/lemma.h')
| -rw-r--r-- | lib/lemma.h | 6 |
1 files changed, 3 insertions, 3 deletions
| diff --git a/lib/lemma.h b/lib/lemma.h index 56cfc56..bba5572 100644 --- a/lib/lemma.h +++ b/lib/lemma.h | |||
| @@ -72,9 +72,9 @@ namespace verbly { | |||
| 72 | 72 | ||
| 73 | // Relationships to other objects | 73 | // Relationships to other objects |
| 74 | 74 | ||
| 75 | static const field word; | 75 | static const field words; |
| 76 | 76 | ||
| 77 | static field form(inflection category); | 77 | static field forms(inflection category); |
| 78 | 78 | ||
| 79 | private: | 79 | private: |
| 80 | 80 | ||
| @@ -84,7 +84,7 @@ namespace verbly { | |||
| 84 | 84 | ||
| 85 | int id_; | 85 | int id_; |
| 86 | 86 | ||
| 87 | mutable std::map<inflection, std::vector<class form>> forms_; | 87 | mutable std::map<inflection, std::vector<form>> forms_; |
| 88 | 88 | ||
| 89 | const database* db_; | 89 | const database* db_; |
| 90 | 90 | ||