From 6ffb3d92615fb7874fc9f4d5f6e6359c92b65f8f Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Fri, 23 Dec 2022 10:39:37 +0000 Subject: Fixed some issues that stricter compilers picked up --- lib/statement.cpp | 6 +++--- lib/statement.h | 2 +- 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 { sql << singleton.table << "." << singleton.column; - switch (singleton.comparison) + switch (singleton.cmp) { case comparison::equals: case comparison::does_not_equal: { - if (singleton.comparison == comparison::equals) + if (singleton.cmp == comparison::equals) { sql << " = "; } else { @@ -1152,7 +1152,7 @@ namespace verbly { return { singleton.table, singleton.column, - singleton.comparison, + singleton.cmp, field_binding { tableName, std::get<1>(std::get(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 { struct singleton_type { std::string table; std::string column; - comparison comparison; + comparison cmp; binding value; object parentObject; }; 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 @@ #include "word.h" #include "form.h" -#include "util.h" #include "database.h" #include "query.h" -- cgit 1.4.1