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.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/part.cpp')
| -rw-r--r-- | lib/part.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
| 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 { | |||
| 15 | 15 | ||
| 16 | const field part::role = field::stringField(object::part, "role", true); | 16 | const field part::role = field::stringField(object::part, "role", true); |
| 17 | 17 | ||
| 18 | const field part::frame = field::joinField(object::part, "frame_id", object::frame); | 18 | const field part::frames = field::joinField(object::part, "frame_id", object::frame); |
| 19 | 19 | ||
| 20 | const field part::synrestr_field::synrestrJoin = field::joinField(object::part, "part_id", "synrestrs"); | 20 | const field part::synrestr_field::synrestrJoin = field::joinField(object::part, "part_id", "synrestrs"); |
| 21 | const field part::synrestr_field::synrestrField = field::stringField("synrestrs", "synrestr"); | 21 | const field part::synrestr_field::synrestrField = field::stringField("synrestrs", "synrestr"); |
| 22 | 22 | ||
| 23 | const part::synrestr_field part::synrestr = {}; | 23 | const part::synrestr_field part::synrestrs = {}; |
| 24 | 24 | ||
| 25 | part part::createNounPhrase(std::string role, selrestr selrestrs, std::set<std::string> synrestrs) | 25 | part part::createNounPhrase(std::string role, selrestr selrestrs, std::set<std::string> synrestrs) |
| 26 | { | 26 | { |