From f9645126dd6c8ef54e0dfb4083480b561951c66c Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Tue, 31 Mar 2020 08:09:18 +0200
Subject: [PATCH] [sqlite] always use sqlite includes - also with cling
Old CINT was not able to parse them correctly
---
sql/sqlite/inc/TSQLiteResult.h | 5 -----
sql/sqlite/inc/TSQLiteRow.h | 4 ++--
sql/sqlite/inc/TSQLiteServer.h | 4 ----
sql/sqlite/inc/TSQLiteStatement.h | 1 -
4 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/sql/sqlite/inc/TSQLiteResult.h b/sql/sqlite/inc/TSQLiteResult.h
index 6b46e97dc39..220144cc539 100644
--- a/sql/sqlite/inc/TSQLiteResult.h
+++ b/sql/sqlite/inc/TSQLiteResult.h
@@ -14,12 +14,7 @@
#include "TSQLResult.h"
-#if !defined(__CINT__)
#include <sqlite3.h>
-#else
-struct sqlite3_stmt;
-#endif
-
class TSQLiteResult : public TSQLResult {
diff --git a/sql/sqlite/inc/TSQLiteRow.h b/sql/sqlite/inc/TSQLiteRow.h
index 46f41a6a7b4..c7ba4ec5eb7 100644
--- a/sql/sqlite/inc/TSQLiteRow.h
+++ b/sql/sqlite/inc/TSQLiteRow.h
@@ -14,12 +14,12 @@
#include "TSQLRow.h"
-struct sqlite3_stmt;
+#include <sqlite3.h>
class TSQLiteRow : public TSQLRow {
private:
- sqlite3_stmt *fResult{nullptr}; // current result set
+ sqlite3_stmt *fResult{nullptr}; ///<! current result set
Bool_t IsValid(Int_t field);
public:
diff --git a/sql/sqlite/inc/TSQLiteServer.h b/sql/sqlite/inc/TSQLiteServer.h
index 557daf6664d..6527ec9db62 100644
--- a/sql/sqlite/inc/TSQLiteServer.h
+++ b/sql/sqlite/inc/TSQLiteServer.h
@@ -14,11 +14,7 @@
#include "TSQLServer.h"
-#if !defined(__CINT__)
#include <sqlite3.h>
-#else
-struct sqlite3;
-#endif
class TSQLiteServer : public TSQLServer {
diff --git a/sql/sqlite/inc/TSQLiteStatement.h b/sql/sqlite/inc/TSQLiteStatement.h
index 98978dbf904..7c896d930bd 100644
--- a/sql/sqlite/inc/TSQLiteStatement.h
+++ b/sql/sqlite/inc/TSQLiteStatement.h
@@ -21,7 +21,6 @@ struct SQLite3_Stmt_t {
sqlite3_stmt *fRes;
};
-
class TSQLiteStatement : public TSQLStatement {
private:
--
GitLab