From de48a0bafd91a28081b5876ddbb53a9d2df82573 Mon Sep 17 00:00:00 2001 From: Pedro Flemming Date: Thu, 6 Apr 2017 18:27:47 +0200 Subject: [PATCH] adjust define guard namings --- 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/Table.h | 4 ++-- src/sql/UpdateStatement.h | 4 ++-- src/sql/statements.h | 6 +++--- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/SQLParser.h b/src/SQLParser.h index 5bb2a4a..7ee774e 100644 --- a/src/SQLParser.h +++ b/src/SQLParser.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSER_H_ -#define __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 0e4e562..a39c1cb 100644 --- a/src/SQLParserResult.h +++ b/src/SQLParserResult.h @@ -1,5 +1,5 @@ -#ifndef __SQLPARSERRESULT__ -#define __SQLPARSERRESULT__ +#ifndef __SQLPARSER__SQLPARSER_RESULT_H__ +#define __SQLPARSER__SQLPARSER_RESULT_H__ #include "sql/SQLStatement.h" @@ -70,4 +70,4 @@ namespace hsql { } // namespace hsql -#endif // __SQLPARSERRESULT__ \ 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 5b96d33..92e4d39 100644 --- a/src/sql/CreateStatement.h +++ b/src/sql/CreateStatement.h @@ -1,5 +1,5 @@ -#ifndef __CREATE_STATEMENT_H__ -#define __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 ed4d77d..af34352 100644 --- a/src/sql/DeleteStatement.h +++ b/src/sql/DeleteStatement.h @@ -1,5 +1,5 @@ -#ifndef __DELETE_STATEMENT_H__ -#define __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 08c1b53..18b1363 100644 --- a/src/sql/DropStatement.h +++ b/src/sql/DropStatement.h @@ -1,5 +1,5 @@ -#ifndef __DROP_STATEMENT_H__ -#define __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 2f5db10..0bd9c42 100644 --- a/src/sql/ExecuteStatement.h +++ b/src/sql/ExecuteStatement.h @@ -1,5 +1,5 @@ -#ifndef __EXECUTE_STATEMENT_H__ -#define __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 536bd31..bba37bd 100644 --- a/src/sql/Expr.h +++ b/src/sql/Expr.h @@ -1,5 +1,5 @@ -#ifndef __EXPRESSION_H__ -#define __EXPRESSION_H__ +#ifndef __SQLPARSER__EXPR_H__ +#define __SQLPARSER__EXPR_H__ #include #include diff --git a/src/sql/ImportStatement.h b/src/sql/ImportStatement.h index 4fb3e3e..1290713 100644 --- a/src/sql/ImportStatement.h +++ b/src/sql/ImportStatement.h @@ -1,5 +1,5 @@ -#ifndef __IMPORT_STATEMENT_H__ -#define __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 06184fa..3aa8fd2 100644 --- a/src/sql/InsertStatement.h +++ b/src/sql/InsertStatement.h @@ -1,5 +1,5 @@ -#ifndef __INSERT_STATEMENT_H__ -#define __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 9455952..c65e7f4 100644 --- a/src/sql/PrepareStatement.h +++ b/src/sql/PrepareStatement.h @@ -1,5 +1,5 @@ -#ifndef __PREPARE_STATEMENT_H__ -#define __PREPARE_STATEMENT_H__ +#ifndef __SQLPARSER__PREPARE_STATEMENT_H__ +#define __SQLPARSER__PREPARE_STATEMENT_H__ #include "../SQLParserResult.h" #include "SQLStatement.h" diff --git a/src/sql/SQLStatement.h b/src/sql/SQLStatement.h index 4c87cb8..1e1e643 100644 --- a/src/sql/SQLStatement.h +++ b/src/sql/SQLStatement.h @@ -1,5 +1,5 @@ -#ifndef __SQLSTATEMENT_H__ -#define __SQLSTATEMENT_H__ +#ifndef __SQLPARSER__SQLSTATEMENT_H__ +#define __SQLPARSER__SQLSTATEMENT_H__ #include "Expr.h" #include @@ -36,4 +36,4 @@ namespace hsql { }; } // namespace hsql -#endif // __SQLSTATEMENT_H__ +#endif // __SQLPARSER__SQLSTATEMENT_H__ diff --git a/src/sql/SelectStatement.h b/src/sql/SelectStatement.h index 7606e68..095310e 100644 --- a/src/sql/SelectStatement.h +++ b/src/sql/SelectStatement.h @@ -1,5 +1,5 @@ -#ifndef __SELECT_STATEMENT_H__ -#define __SELECT_STATEMENT_H__ +#ifndef __SQLPARSER__SELECT_STATEMENT_H__ +#define __SQLPARSER__SELECT_STATEMENT_H__ #include "SQLStatement.h" #include "Expr.h" diff --git a/src/sql/Table.h b/src/sql/Table.h index 745d5f1..96ee775 100644 --- a/src/sql/Table.h +++ b/src/sql/Table.h @@ -1,5 +1,5 @@ -#ifndef __TABLEREF_H__ -#define __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 b4d6e28..744d55b 100644 --- a/src/sql/UpdateStatement.h +++ b/src/sql/UpdateStatement.h @@ -1,5 +1,5 @@ -#ifndef __UPDATE_STATEMENT_H__ -#define __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 13c4a30..d9e59ea 100644 --- a/src/sql/statements.h +++ b/src/sql/statements.h @@ -1,5 +1,5 @@ -#ifndef __STATEMENTS_H__ -#define __STATEMENTS_H__ +#ifndef __SQLPARSER__STATEMENTS_H__ +#define __SQLPARSER__STATEMENTS_H__ #include "SelectStatement.h" #include "ImportStatement.h" @@ -11,4 +11,4 @@ #include "PrepareStatement.h" #include "ExecuteStatement.h" -#endif // __STATEMENTS_H__ \ No newline at end of file +#endif // __SQLPARSER__STATEMENTS_H__ \ No newline at end of file