From e5eb7a889373c8da5abc369999c48d91e52d1952 Mon Sep 17 00:00:00 2001 From: Markus Dreseler Date: Mon, 19 Oct 2020 15:07:45 +0200 Subject: [PATCH] Make clang-11 ready --- src/sql/CreateStatement.h | 4 ++-- src/sql/DeleteStatement.h | 2 +- src/sql/DropStatement.h | 2 +- src/sql/ExecuteStatement.h | 2 +- src/sql/ExportStatement.h | 2 +- src/sql/ImportStatement.h | 2 +- src/sql/InsertStatement.h | 2 +- src/sql/PrepareStatement.h | 2 +- src/sql/SelectStatement.h | 2 +- src/sql/ShowStatement.h | 2 +- src/sql/TransactionStatement.h | 2 +- src/sql/UpdateStatement.h | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/sql/CreateStatement.h b/src/sql/CreateStatement.h index 2263663..e88324f 100755 --- a/src/sql/CreateStatement.h +++ b/src/sql/CreateStatement.h @@ -13,7 +13,7 @@ namespace hsql { // Represents definition of a table column struct ColumnDefinition { ColumnDefinition(char* name, ColumnType type, bool nullable); - virtual ~ColumnDefinition(); + virtual~ColumnDefinition(); char* name; ColumnType type; @@ -30,7 +30,7 @@ namespace hsql { // Example: "CREATE TABLE students (name TEXT, student_number INTEGER, city TEXT, grade DOUBLE)" struct CreateStatement : SQLStatement { CreateStatement(CreateType type); - virtual ~CreateStatement(); + ~CreateStatement() override; CreateType type; bool ifNotExists; // default: false diff --git a/src/sql/DeleteStatement.h b/src/sql/DeleteStatement.h index fb2c3c5..875713e 100755 --- a/src/sql/DeleteStatement.h +++ b/src/sql/DeleteStatement.h @@ -11,7 +11,7 @@ namespace hsql { // Note: if (expr == nullptr) => delete all rows (truncate) struct DeleteStatement : SQLStatement { DeleteStatement(); - virtual ~DeleteStatement(); + ~DeleteStatement() override; char* schema; char* tableName; diff --git a/src/sql/DropStatement.h b/src/sql/DropStatement.h index 51e7d69..dace494 100755 --- a/src/sql/DropStatement.h +++ b/src/sql/DropStatement.h @@ -19,7 +19,7 @@ namespace hsql { struct DropStatement : SQLStatement { DropStatement(DropType type); - virtual ~DropStatement(); + ~DropStatement() override; DropType type; bool ifExists; diff --git a/src/sql/ExecuteStatement.h b/src/sql/ExecuteStatement.h index a73dbbb..3214098 100644 --- a/src/sql/ExecuteStatement.h +++ b/src/sql/ExecuteStatement.h @@ -9,7 +9,7 @@ namespace hsql { // Example: "EXECUTE ins_prep(100, "test", 2.3);" struct ExecuteStatement : SQLStatement { ExecuteStatement(); - virtual ~ExecuteStatement(); + ~ExecuteStatement() override; char* name; std::vector* parameters; diff --git a/src/sql/ExportStatement.h b/src/sql/ExportStatement.h index f432f9e..b6d62a0 100755 --- a/src/sql/ExportStatement.h +++ b/src/sql/ExportStatement.h @@ -8,7 +8,7 @@ namespace hsql { // Represents SQL Export statements. struct ExportStatement : SQLStatement { ExportStatement(ImportType type); - virtual ~ExportStatement(); + ~ExportStatement() override; // ImportType is used for compatibility reasons ImportType type; diff --git a/src/sql/ImportStatement.h b/src/sql/ImportStatement.h index 18b5831..effa39b 100755 --- a/src/sql/ImportStatement.h +++ b/src/sql/ImportStatement.h @@ -14,7 +14,7 @@ namespace hsql { // Represents SQL Import statements. struct ImportStatement : SQLStatement { ImportStatement(ImportType type); - virtual ~ImportStatement(); + ~ImportStatement() override; ImportType type; char* filePath; diff --git a/src/sql/InsertStatement.h b/src/sql/InsertStatement.h index 36a88e3..da8e56b 100755 --- a/src/sql/InsertStatement.h +++ b/src/sql/InsertStatement.h @@ -14,7 +14,7 @@ namespace hsql { // Example: "INSERT INTO students VALUES ('Max', 1112233, 'Musterhausen', 2.3)" struct InsertStatement : SQLStatement { InsertStatement(InsertType type); - virtual ~InsertStatement(); + ~InsertStatement() override; InsertType type; char* schema; diff --git a/src/sql/PrepareStatement.h b/src/sql/PrepareStatement.h index 17fcd59..b574333 100644 --- a/src/sql/PrepareStatement.h +++ b/src/sql/PrepareStatement.h @@ -9,7 +9,7 @@ namespace hsql { // Example: PREPARE test FROM 'SELECT * FROM test WHERE a = ?;' struct PrepareStatement : SQLStatement { PrepareStatement(); - virtual ~PrepareStatement(); + ~PrepareStatement() override; char* name; diff --git a/src/sql/SelectStatement.h b/src/sql/SelectStatement.h index 73dc145..1742984 100644 --- a/src/sql/SelectStatement.h +++ b/src/sql/SelectStatement.h @@ -67,7 +67,7 @@ namespace hsql { // Representation of a full SQL select statement. struct SelectStatement : SQLStatement { SelectStatement(); - virtual ~SelectStatement(); + ~SelectStatement() override; TableRef* fromTable; bool selectDistinct; diff --git a/src/sql/ShowStatement.h b/src/sql/ShowStatement.h index f48359d..1c874f7 100755 --- a/src/sql/ShowStatement.h +++ b/src/sql/ShowStatement.h @@ -16,7 +16,7 @@ namespace hsql { struct ShowStatement : SQLStatement { ShowStatement(ShowType type); - virtual ~ShowStatement(); + ~ShowStatement() override; ShowType type; char* schema; diff --git a/src/sql/TransactionStatement.h b/src/sql/TransactionStatement.h index 25831f2..9275f89 100644 --- a/src/sql/TransactionStatement.h +++ b/src/sql/TransactionStatement.h @@ -15,7 +15,7 @@ namespace hsql { struct TransactionStatement : SQLStatement { TransactionStatement(TransactionCommand command); - virtual ~TransactionStatement(); + ~TransactionStatement() override; TransactionCommand command; }; diff --git a/src/sql/UpdateStatement.h b/src/sql/UpdateStatement.h index bb9bd5c..fcc09d0 100644 --- a/src/sql/UpdateStatement.h +++ b/src/sql/UpdateStatement.h @@ -14,7 +14,7 @@ namespace hsql { // Represents SQL Update statements. struct UpdateStatement : SQLStatement { UpdateStatement(); - virtual ~UpdateStatement(); + ~UpdateStatement() override; // TODO: switch to char* instead of TableRef TableRef* table;