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.cpp | |
| 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.cpp')
| -rw-r--r-- | lib/frame.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
| diff --git a/lib/frame.cpp b/lib/frame.cpp index a73fbda..b5ba914 100644 --- a/lib/frame.cpp +++ b/lib/frame.cpp | |||
| @@ -12,14 +12,14 @@ namespace verbly { | |||
| 12 | const field frame::id = field::integerField(object::frame, "frame_id"); | 12 | const field frame::id = field::integerField(object::frame, "frame_id"); |
| 13 | const field frame::length = field::integerField(object::frame, "length"); | 13 | const field frame::length = field::integerField(object::frame, "length"); |
| 14 | 14 | ||
| 15 | const field frame::word = field::joinField(object::frame, "group_id", object::word); | 15 | const field frame::words = field::joinField(object::frame, "group_id", object::word); |
| 16 | 16 | ||
| 17 | field frame::part() | 17 | field frame::parts() |
| 18 | { | 18 | { |
| 19 | return field::joinField(object::frame, "frame_id", object::part); | 19 | return field::joinField(object::frame, "frame_id", object::part); |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | field frame::part(int index) | 22 | field frame::parts(int index) |
| 23 | { | 23 | { |
| 24 | return field::joinWhere(object::frame, "frame_id", object::part, part::index, index); | 24 | return field::joinWhere(object::frame, "frame_id", object::part, part::index, index); |
| 25 | } | 25 | } |