From bea3673ae1b3d19585dec56e96dbcd8a56b96e6d Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Fri, 3 Feb 2017 17:02:58 -0500 Subject: Renamed object join fields to prevent conflicts with class names This was not a problem with clang but it caused compilation errors with gcc. --- lib/frame.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/frame.cpp') 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 { const field frame::id = field::integerField(object::frame, "frame_id"); const field frame::length = field::integerField(object::frame, "length"); - const field frame::word = field::joinField(object::frame, "group_id", object::word); + const field frame::words = field::joinField(object::frame, "group_id", object::word); - field frame::part() + field frame::parts() { return field::joinField(object::frame, "frame_id", object::part); } - field frame::part(int index) + field frame::parts(int index) { return field::joinWhere(object::frame, "frame_id", object::part, part::index, index); } -- cgit 1.4.1