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/part.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/part.h')
| -rw-r--r-- | lib/part.h | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/lib/part.h b/lib/part.h index 9a01312..7180f57 100644 --- a/lib/part.h +++ b/lib/part.h | |||
| @@ -108,7 +108,7 @@ namespace verbly { | |||
| 108 | 108 | ||
| 109 | // Relationships to other objects | 109 | // Relationships to other objects |
| 110 | 110 | ||
| 111 | static const field frame; | 111 | static const field frames; |
| 112 | 112 | ||
| 113 | // Noun synrestr relationship | 113 | // Noun synrestr relationship |
| 114 | 114 | ||
| @@ -123,7 +123,7 @@ namespace verbly { | |||
| 123 | static const field synrestrField; | 123 | static const field synrestrField; |
| 124 | }; | 124 | }; |
| 125 | 125 | ||
| 126 | static const synrestr_field synrestr; | 126 | static const synrestr_field synrestrs; |
| 127 | 127 | ||
| 128 | private: | 128 | private: |
| 129 | 129 | ||