diff options
Diffstat (limited to 'lib/part.cpp')
-rw-r--r-- | lib/part.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/part.cpp b/lib/part.cpp index 341d4bb..e7e467b 100644 --- a/lib/part.cpp +++ b/lib/part.cpp | |||
@@ -1,8 +1,8 @@ | |||
1 | #include "part.h" | 1 | #include "part.h" |
2 | #include <stdexcept> | 2 | #include <stdexcept> |
3 | #include <sqlite3.h> | 3 | #include <sqlite3.h> |
4 | #include <hkutil/string.h> | ||
4 | #include "database.h" | 5 | #include "database.h" |
5 | #include "util.h" | ||
6 | 6 | ||
7 | namespace verbly { | 7 | namespace verbly { |
8 | 8 | ||
@@ -19,7 +19,7 @@ namespace verbly { | |||
19 | 19 | ||
20 | const field part::selrestr_field::selrestrJoin = field::joinField(object::part, "part_id", "selrestrs"); | 20 | const field part::selrestr_field::selrestrJoin = field::joinField(object::part, "part_id", "selrestrs"); |
21 | const field part::selrestr_field::selrestrField = field::stringField("selrestrs", "selrestr"); | 21 | const field part::selrestr_field::selrestrField = field::stringField("selrestrs", "selrestr"); |
22 | 22 | ||
23 | const field part::synrestr_field::synrestrJoin = field::joinField(object::part, "part_id", "synrestrs"); | 23 | const field part::synrestr_field::synrestrJoin = field::joinField(object::part, "part_id", "synrestrs"); |
24 | const field part::synrestr_field::synrestrField = field::stringField("synrestrs", "synrestr"); | 24 | const field part::synrestr_field::synrestrField = field::stringField("synrestrs", "synrestr"); |
25 | 25 | ||
@@ -91,8 +91,8 @@ namespace verbly { | |||
91 | case part_type::preposition: | 91 | case part_type::preposition: |
92 | { | 92 | { |
93 | std::string serializedChoices(reinterpret_cast<const char*>(sqlite3_column_blob(row, 5))); | 93 | std::string serializedChoices(reinterpret_cast<const char*>(sqlite3_column_blob(row, 5))); |
94 | new(&preposition_.choices) std::vector<std::string>(split<std::vector<std::string>>(serializedChoices, ",")); | 94 | new(&preposition_.choices) std::vector<std::string>(hatkirby::split<std::vector<std::string>>(serializedChoices, ",")); |
95 | 95 | ||
96 | preposition_.literal = (sqlite3_column_int(row, 6) == 1); | 96 | preposition_.literal = (sqlite3_column_int(row, 6) == 1); |
97 | 97 | ||
98 | break; | 98 | break; |