summary refs log tree commit diff stats
path: root/lib
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2022-12-23 10:39:37 +0000
committerStar Rauchenberger <fefferburbia@gmail.com>2023-02-12 20:04:43 -0500
commit38a5f7bc3aa73fb88d7b13f7636587f9abd10647 (patch)
tree56fd57bcf8c2063f41a11b69dbeefe3785884f8b /lib
parentc97c846887eecc75e2f06c56f5e4b8def63ae7a5 (diff)
downloadverbly-38a5f7bc3aa73fb88d7b13f7636587f9abd10647.tar.gz
verbly-38a5f7bc3aa73fb88d7b13f7636587f9abd10647.tar.bz2
verbly-38a5f7bc3aa73fb88d7b13f7636587f9abd10647.zip
Fixed some issues that stricter compilers picked up
Diffstat (limited to 'lib')
-rw-r--r--lib/statement.cpp6
-rw-r--r--lib/statement.h2
-rw-r--r--lib/word.cpp1
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