diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2022-12-23 10:39:37 +0000 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2022-12-23 10:39:37 +0000 |
| commit | 6ffb3d92615fb7874fc9f4d5f6e6359c92b65f8f (patch) | |
| tree | 5e16207c5afc1478a1263b76d82bb45ee79b8e4c /lib | |
| parent | 03596c07406ea33f76a0fbb3e004df50b8b832e6 (diff) | |
| download | verbly-6ffb3d92615fb7874fc9f4d5f6e6359c92b65f8f.tar.gz verbly-6ffb3d92615fb7874fc9f4d5f6e6359c92b65f8f.tar.bz2 verbly-6ffb3d92615fb7874fc9f4d5f6e6359c92b65f8f.zip | |
Fixed some issues that stricter compilers picked up
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/statement.cpp | 6 | ||||
| -rw-r--r-- | lib/statement.h | 2 | ||||
| -rw-r--r-- | lib/word.cpp | 1 |
3 files changed, 4 insertions, 5 deletions
| diff --git a/lib/statement.cpp b/lib/statement.cpp index 3440acb..6e9e920 100644 --- a/lib/statement.cpp +++ b/lib/statement.cpp | |||
| @@ -804,12 +804,12 @@ namespace verbly { | |||
| 804 | 804 | ||
| 805 | sql << singleton.table << "." << singleton.column; | 805 | sql << singleton.table << "." << singleton.column; |
| 806 | 806 | ||
| 807 | switch (singleton.comparison) | 807 | switch (singleton.cmp) |
| 808 | { | 808 | { |
| 809 | case comparison::equals: | 809 | case comparison::equals: |
| 810 | case comparison::does_not_equal: | 810 | case comparison::does_not_equal: |
| 811 | { | 811 | { |
| 812 | if (singleton.comparison == comparison::equals) | 812 | if (singleton.cmp == comparison::equals) |
| 813 | { | 813 | { |
| 814 | sql << " = "; | 814 | sql << " = "; |
| 815 | } else { | 815 | } else { |
| @@ -1152,7 +1152,7 @@ namespace verbly { | |||
| 1152 | return { | 1152 | return { |
| 1153 | singleton.table, | 1153 | singleton.table, |
| 1154 | singleton.column, | 1154 | singleton.column, |
| 1155 | singleton.comparison, | 1155 | singleton.cmp, |
| 1156 | field_binding { | 1156 | field_binding { |
| 1157 | tableName, | 1157 | tableName, |
| 1158 | std::get<1>(std::get<field_binding>(singleton.value)) | 1158 | std::get<1>(std::get<field_binding>(singleton.value)) |
| diff --git a/lib/statement.h b/lib/statement.h index 632807f..bdf1a6a 100644 --- a/lib/statement.h +++ b/lib/statement.h | |||
| @@ -174,7 +174,7 @@ namespace verbly { | |||
| 174 | struct singleton_type { | 174 | struct singleton_type { |
| 175 | std::string table; | 175 | std::string table; |
| 176 | std::string column; | 176 | std::string column; |
| 177 | comparison comparison; | 177 | comparison cmp; |
| 178 | binding value; | 178 | binding value; |
| 179 | object parentObject; | 179 | object parentObject; |
| 180 | }; | 180 | }; |
| diff --git a/lib/word.cpp b/lib/word.cpp index 5df9ba1..3fb22e5 100644 --- a/lib/word.cpp +++ b/lib/word.cpp | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #include "word.h" | 1 | #include "word.h" |
| 2 | #include "form.h" | 2 | #include "form.h" |
| 3 | #include "util.h" | ||
| 4 | #include "database.h" | 3 | #include "database.h" |
| 5 | #include "query.h" | 4 | #include "query.h" |
| 6 | 5 | ||