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/part.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/part.cpp') diff --git a/lib/part.cpp b/lib/part.cpp index 1fbb24d..cbd951b 100644 --- a/lib/part.cpp +++ b/lib/part.cpp @@ -15,12 +15,12 @@ namespace verbly { const field part::role = field::stringField(object::part, "role", true); - const field part::frame = field::joinField(object::part, "frame_id", object::frame); + const field part::frames = field::joinField(object::part, "frame_id", object::frame); const field part::synrestr_field::synrestrJoin = field::joinField(object::part, "part_id", "synrestrs"); const field part::synrestr_field::synrestrField = field::stringField("synrestrs", "synrestr"); - const part::synrestr_field part::synrestr = {}; + const part::synrestr_field part::synrestrs = {}; part part::createNounPhrase(std::string role, selrestr selrestrs, std::set synrestrs) { -- cgit 1.4.1