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/frame.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/frame.h')
| -rw-r--r-- | lib/frame.h | 8 |
1 files changed, 4 insertions, 4 deletions
| diff --git a/lib/frame.h b/lib/frame.h index 36e179e..e049584 100644 --- a/lib/frame.h +++ b/lib/frame.h | |||
| @@ -85,10 +85,10 @@ namespace verbly { | |||
| 85 | 85 | ||
| 86 | // Relationships to other objects | 86 | // Relationships to other objects |
| 87 | 87 | ||
| 88 | static const field word; | 88 | static const field words; |
| 89 | 89 | ||
| 90 | static field part(); | 90 | static field parts(); |
| 91 | static field part(int index); | 91 | static field parts(int index); |
| 92 | 92 | ||
| 93 | private: | 93 | private: |
| 94 | bool valid_ = false; | 94 | bool valid_ = false; |
| @@ -96,7 +96,7 @@ namespace verbly { | |||
| 96 | int id_; | 96 | int id_; |
| 97 | int groupId_; | 97 | int groupId_; |
| 98 | int length_; | 98 | int length_; |
| 99 | std::vector<class part> parts_; | 99 | std::vector<part> parts_; |
| 100 | 100 | ||
| 101 | const database* db_; | 101 | const database* db_; |
| 102 | 102 | ||