From c7980a0009d7cd6ba9b7d16e36fb97f43a3a602a Mon Sep 17 00:00:00 2001 From: mrks Date: Sat, 29 Sep 2018 10:38:29 +0200 Subject: [PATCH] Fix include guard naming [-Wreserved-id-macro] (#99) --- src/SQLParser.h | 4 ++-- src/SQLParserResult.h | 6 +++--- src/sql/CreateStatement.h | 4 ++-- src/sql/DeleteStatement.h | 4 ++-- src/sql/DropStatement.h | 4 ++-- src/sql/ExecuteStatement.h | 4 ++-- src/sql/Expr.h | 4 ++-- src/sql/ImportStatement.h | 4 ++-- src/sql/InsertStatement.h | 4 ++-- src/sql/PrepareStatement.h | 4 ++-- src/sql/SQLStatement.h | 6 +++--- src/sql/SelectStatement.h | 4 ++-- src/sql/ShowStatement.h | 4 ++-- src/sql/Table.h | 4 ++-- src/sql/UpdateStatement.h | 4 ++-- src/sql/statements.h | 6 +++--- src/util/sqlhelper.h | 4 ++-- 17 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/SQLParser.h b/src/SQLParser.h index 244bf3a..d3d38ca 100644 --- a/src/SQLParser.h +++ b/src/SQLParser.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__SQLPARSER_H__ -#define __SQLPARSER__SQLPARSER_H__ +#ifndef SQLPARSER_SQLPARSER_H +#define SQLPARSER_SQLPARSER_H #include "SQLParserResult.h" #include "sql/statements.h" diff --git a/src/SQLParserResult.h b/src/SQLParserResult.h index 66b78a8..939aa3d 100644 --- a/src/SQLParserResult.h +++ b/src/SQLParserResult.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__SQLPARSER_RESULT_H__ -#define __SQLPARSER__SQLPARSER_RESULT_H__ +#ifndef SQLPARSER_SQLPARSER_RESULT_H +#define SQLPARSER_SQLPARSER_RESULT_H #include "sql/SQLStatement.h" @@ -90,4 +90,4 @@ namespace hsql { } // namespace hsql -#endif // __SQLPARSER__SQLPARSER_RESULT_H__ \ No newline at end of file +#endif // SQLPARSER_SQLPARSER_RESULT_H \ No newline at end of file diff --git a/src/sql/CreateStatement.h b/src/sql/CreateStatement.h index 27c8625..0419dd1 100755 --- a/src/sql/CreateStatement.h +++ b/src/sql/CreateStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__CREATE_STATEMENT_H__ -#define __SQLPARSER__CREATE_STATEMENT_H__ +#ifndef SQLPARSER_CREATE_STATEMENT_H +#define SQLPARSER_CREATE_STATEMENT_H #include "SQLStatement.h" diff --git a/src/sql/DeleteStatement.h b/src/sql/DeleteStatement.h index 6936147..fb2c3c5 100755 --- a/src/sql/DeleteStatement.h +++ b/src/sql/DeleteStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__DELETE_STATEMENT_H__ -#define __SQLPARSER__DELETE_STATEMENT_H__ +#ifndef SQLPARSER_DELETE_STATEMENT_H +#define SQLPARSER_DELETE_STATEMENT_H #include "SQLStatement.h" diff --git a/src/sql/DropStatement.h b/src/sql/DropStatement.h index f6ab1ad..51e7d69 100755 --- a/src/sql/DropStatement.h +++ b/src/sql/DropStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__DROP_STATEMENT_H__ -#define __SQLPARSER__DROP_STATEMENT_H__ +#ifndef SQLPARSER_DROP_STATEMENT_H +#define SQLPARSER_DROP_STATEMENT_H #include "SQLStatement.h" diff --git a/src/sql/ExecuteStatement.h b/src/sql/ExecuteStatement.h index 99b87e7..a73dbbb 100644 --- a/src/sql/ExecuteStatement.h +++ b/src/sql/ExecuteStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__EXECUTE_STATEMENT_H__ -#define __SQLPARSER__EXECUTE_STATEMENT_H__ +#ifndef SQLPARSER_EXECUTE_STATEMENT_H +#define SQLPARSER_EXECUTE_STATEMENT_H #include "SQLStatement.h" diff --git a/src/sql/Expr.h b/src/sql/Expr.h index 92f35b8..331eea2 100644 --- a/src/sql/Expr.h +++ b/src/sql/Expr.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__EXPR_H__ -#define __SQLPARSER__EXPR_H__ +#ifndef SQLPARSER_EXPR_H +#define SQLPARSER_EXPR_H #include #include diff --git a/src/sql/ImportStatement.h b/src/sql/ImportStatement.h index a10c88c..0e686a0 100755 --- a/src/sql/ImportStatement.h +++ b/src/sql/ImportStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__IMPORT_STATEMENT_H__ -#define __SQLPARSER__IMPORT_STATEMENT_H__ +#ifndef SQLPARSER_IMPORT_STATEMENT_H +#define SQLPARSER_IMPORT_STATEMENT_H #include "SQLStatement.h" diff --git a/src/sql/InsertStatement.h b/src/sql/InsertStatement.h index 956f910..36a88e3 100755 --- a/src/sql/InsertStatement.h +++ b/src/sql/InsertStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__INSERT_STATEMENT_H__ -#define __SQLPARSER__INSERT_STATEMENT_H__ +#ifndef SQLPARSER_INSERT_STATEMENT_H +#define SQLPARSER_INSERT_STATEMENT_H #include "SQLStatement.h" #include "SelectStatement.h" diff --git a/src/sql/PrepareStatement.h b/src/sql/PrepareStatement.h index 4642af9..17fcd59 100644 --- a/src/sql/PrepareStatement.h +++ b/src/sql/PrepareStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__PREPARE_STATEMENT_H__ -#define __SQLPARSER__PREPARE_STATEMENT_H__ +#ifndef SQLPARSER_PREPARE_STATEMENT_H +#define SQLPARSER_PREPARE_STATEMENT_H #include "SQLStatement.h" diff --git a/src/sql/SQLStatement.h b/src/sql/SQLStatement.h index c2c71fb..1c25107 100644 --- a/src/sql/SQLStatement.h +++ b/src/sql/SQLStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__SQLSTATEMENT_H__ -#define __SQLPARSER__SQLSTATEMENT_H__ +#ifndef SQLPARSER_SQLSTATEMENT_H +#define SQLPARSER_SQLSTATEMENT_H #include @@ -49,4 +49,4 @@ namespace hsql { } // namespace hsql -#endif // __SQLPARSER__SQLSTATEMENT_H__ +#endif // SQLPARSER_SQLSTATEMENT_H diff --git a/src/sql/SelectStatement.h b/src/sql/SelectStatement.h index d826db3..8bc3365 100644 --- a/src/sql/SelectStatement.h +++ b/src/sql/SelectStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__SELECT_STATEMENT_H__ -#define __SQLPARSER__SELECT_STATEMENT_H__ +#ifndef SQLPARSER_SELECT_STATEMENT_H +#define SQLPARSER_SELECT_STATEMENT_H #include "SQLStatement.h" #include "Expr.h" diff --git a/src/sql/ShowStatement.h b/src/sql/ShowStatement.h index dcacbf5..f48359d 100755 --- a/src/sql/ShowStatement.h +++ b/src/sql/ShowStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__SHOW_STATEMENT_H__ -#define __SQLPARSER__SHOW_STATEMENT_H__ +#ifndef SQLPARSER_SHOW_STATEMENT_H +#define SQLPARSER_SHOW_STATEMENT_H #include "SQLStatement.h" diff --git a/src/sql/Table.h b/src/sql/Table.h index 5ad951c..c578438 100755 --- a/src/sql/Table.h +++ b/src/sql/Table.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__TABLEREF_H__ -#define __SQLPARSER__TABLEREF_H__ +#ifndef SQLPARSER_TABLEREF_H +#define SQLPARSER_TABLEREF_H #include "Expr.h" #include diff --git a/src/sql/UpdateStatement.h b/src/sql/UpdateStatement.h index eb07a6a..bb9bd5c 100644 --- a/src/sql/UpdateStatement.h +++ b/src/sql/UpdateStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__UPDATE_STATEMENT_H__ -#define __SQLPARSER__UPDATE_STATEMENT_H__ +#ifndef SQLPARSER_UPDATE_STATEMENT_H +#define SQLPARSER_UPDATE_STATEMENT_H #include "SQLStatement.h" diff --git a/src/sql/statements.h b/src/sql/statements.h index 0838256..c6d24c7 100644 --- a/src/sql/statements.h +++ b/src/sql/statements.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__STATEMENTS_H__ -#define __SQLPARSER__STATEMENTS_H__ +#ifndef SQLPARSER_STATEMENTS_H +#define SQLPARSER_STATEMENTS_H #include "SelectStatement.h" #include "ImportStatement.h" @@ -12,4 +12,4 @@ #include "ExecuteStatement.h" #include "ShowStatement.h" -#endif // __SQLPARSER__STATEMENTS_H__ +#endif // SQLPARSER_STATEMENTS_H diff --git a/src/util/sqlhelper.h b/src/util/sqlhelper.h index 7c7e811..9298b72 100644 --- a/src/util/sqlhelper.h +++ b/src/util/sqlhelper.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER__SQLHELPER_H__ -#define __SQLPARSER__SQLHELPER_H__ +#ifndef SQLPARSER_SQLHELPER_H +#define SQLPARSER_SQLHELPER_H #include "../sql/statements.h"