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/pronunciation.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/pronunciation.h')
| -rw-r--r-- | lib/pronunciation.h | 2 |
1 files changed, 1 insertions, 1 deletions
| diff --git a/lib/pronunciation.h b/lib/pronunciation.h index c7a1d4d..e171fe8 100644 --- a/lib/pronunciation.h +++ b/lib/pronunciation.h | |||
| @@ -138,7 +138,7 @@ namespace verbly { | |||
| 138 | 138 | ||
| 139 | // Relationships to other objects | 139 | // Relationships to other objects |
| 140 | 140 | ||
| 141 | static const field form; | 141 | static const field forms; |
| 142 | 142 | ||
| 143 | private: | 143 | private: |
| 144 | bool valid_ = false; | 144 | bool valid_ = false; |