[vtk7] 03/24: update sqlite patch
Gert Wollny
gewo at moszumanska.debian.org
Sun Jul 9 08:00:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
gewo pushed a commit to branch master
in repository vtk7.
commit e5b991a7f4321905f08fd26240e3e84da9b159d8
Author: Gert Wollny <gewo at debian.org>
Date: Sat Jul 8 10:13:13 2017 +0000
update sqlite patch
---
debian/patches/40_use_system_sqlite.patch | 342 +++++++++++++++---------------
1 file changed, 166 insertions(+), 176 deletions(-)
diff --git a/debian/patches/40_use_system_sqlite.patch b/debian/patches/40_use_system_sqlite.patch
index ee393a5..8b41d9c 100644
--- a/debian/patches/40_use_system_sqlite.patch
+++ b/debian/patches/40_use_system_sqlite.patch
@@ -3,69 +3,67 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/750183
Last-Update: 2014-06-03
-Index: VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.cxx
-===================================================================
---- VTK-6.3.0.orig/IO/SQL/vtkSQLiteDatabase.cxx
-+++ VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.cxx
+--- a/IO/SQL/vtkSQLiteDatabase.cxx
++++ b/IO/SQL/vtkSQLiteDatabase.cxx
@@ -29,7 +29,7 @@
- #include <vtksys/ios/fstream>
- #include <vtksys/ios/sstream>
+ #include <fstream>
+ #include <sstream>
-#include <vtksqlite/vtk_sqlite3.h>
+#include <sqlite3.h>
vtkStandardNewMacro(vtkSQLiteDatabase);
-@@ -307,15 +307,15 @@ bool vtkSQLiteDatabase::Open(const char*
- }
+@@ -307,15 +307,15 @@
}
+ }
- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
-+ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
++ int result = sqlite_open(this->DatabaseFileName, & (this->SQLiteInstance));
- if (result != VTK_SQLITE_OK)
+ if (result != SQLITE_OK)
- {
+ {
vtkDebugMacro(<<"SQLite open() failed. Error code is "
<< result << " and message is "
- << vtk_sqlite3_errmsg(this->SQLiteInstance) );
-+ << sqlite3_errmsg(this->SQLiteInstance) );
++ << sqlite_errmsg(this->SQLiteInstance) );
- vtk_sqlite3_close(this->SQLiteInstance);
-+ sqlite3_close(this->SQLiteInstance);
++ sqlite_close(this->SQLiteInstance);
return false;
- }
+ }
else
-@@ -334,8 +334,8 @@ void vtkSQLiteDatabase::Close()
- }
+@@ -334,8 +334,8 @@
+ }
else
- {
+ {
- int result = vtk_sqlite3_close(this->SQLiteInstance);
- if (result != VTK_SQLITE_OK)
-+ int result = sqlite3_close(this->SQLiteInstance);
++ int result = sqlite_close(this->SQLiteInstance);
+ if (result != SQLITE_OK)
- {
+ {
vtkWarningMacro(<< "Close(): SQLite returned result code " << result);
- }
-@@ -374,7 +374,7 @@ vtkStringArray * vtkSQLiteDatabase::GetT
+ }
+@@ -374,7 +374,7 @@
if (!status)
- {
+ {
vtkErrorMacro(<< "GetTables(): Database returned error: "
- << vtk_sqlite3_errmsg(this->SQLiteInstance) );
+ << sqlite3_errmsg(this->SQLiteInstance) );
query->Delete();
return this->Tables;
- }
-@@ -403,7 +403,7 @@ vtkStringArray * vtkSQLiteDatabase::GetR
+ }
+@@ -403,7 +403,7 @@
if (!status)
- {
+ {
vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: "
- << vtk_sqlite3_errmsg(this->SQLiteInstance) );
+ << sqlite3_errmsg(this->SQLiteInstance) );
query->Delete();
return NULL;
- }
-@@ -467,10 +467,10 @@ bool vtkSQLiteDatabase::ParseURL(const c
+ }
+@@ -467,10 +467,10 @@
// ----------------------------------------------------------------------
bool vtkSQLiteDatabase::HasError()
{
@@ -78,11 +76,9 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.cxx
- return vtk_sqlite3_errmsg(this->SQLiteInstance);
+ return sqlite3_errmsg(this->SQLiteInstance);
}
-Index: VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.h
-===================================================================
---- VTK-6.3.0.orig/IO/SQL/vtkSQLiteDatabase.h
-+++ VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.h
-@@ -49,7 +49,7 @@
+--- a/IO/SQL/vtkSQLiteDatabase.h
++++ b/IO/SQL/vtkSQLiteDatabase.h
+@@ -52,7 +52,7 @@
class vtkSQLQuery;
class vtkSQLiteQuery;
class vtkStringArray;
@@ -91,7 +87,7 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.h
class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
{
-@@ -147,7 +147,7 @@ protected:
+@@ -167,7 +167,7 @@
virtual bool ParseURL(const char* url);
private:
@@ -100,10 +96,8 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.h
// We want this to be private, a user of this class
// should not be setting this for any reason
-Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
-===================================================================
---- VTK-6.3.0.orig/IO/SQL/vtkSQLiteQuery.cxx
-+++ VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
+--- a/IO/SQL/vtkSQLiteQuery.cxx
++++ b/IO/SQL/vtkSQLiteQuery.cxx
@@ -25,7 +25,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
@@ -113,7 +107,7 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
#include <cassert>
-@@ -43,7 +43,7 @@ vtkSQLiteQuery::vtkSQLiteQuery()
+@@ -43,7 +43,7 @@
{
this->Statement = NULL;
this->InitialFetch = true;
@@ -122,36 +116,36 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
this->LastErrorText = NULL;
this->TransactionInProgress = false;
}
-@@ -61,7 +61,7 @@ vtkSQLiteQuery::~vtkSQLiteQuery()
- {
+@@ -61,7 +61,7 @@
+ {
if (this->Database != NULL)
- {
+ {
- vtk_sqlite3_finalize(this->Statement);
-+ sqlite3_finalize(this->Statement);
++ sqlite_finalize(this->Statement);
this->Statement = NULL;
- }
}
-@@ -128,8 +128,8 @@ bool vtkSQLiteQuery::SetQuery(const char
+ }
+@@ -128,8 +128,8 @@
if (this->Statement)
- {
+ {
vtkDebugMacro(<<"Finalizing old statement");
- int finalizeStatus = vtk_sqlite3_finalize(this->Statement);
- if (finalizeStatus != VTK_SQLITE_OK)
-+ int finalizeStatus = sqlite3_finalize(this->Statement);
++ int finalizeStatus = sqlite_finalize(this->Statement);
+ if (finalizeStatus != SQLITE_OK)
- {
+ {
vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code "
<< finalizeStatus);
-@@ -148,19 +148,19 @@ bool vtkSQLiteQuery::SetQuery(const char
+@@ -148,19 +148,19 @@
return false;
- }
+ }
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+ sqlite3 *db = dbContainer->SQLiteInstance;
++ sqlite *db = dbContainer->SQLiteInstance;
const char *unused_statement;
- int prepareStatus = vtk_sqlite3_prepare_v2(db,
-+ int prepareStatus = sqlite3_prepare_v2(db,
++ int prepareStatus = sqlite_prepare_v2(db,
this->Query,
static_cast<int>(strlen(this->Query)),
&this->Statement,
@@ -159,78 +153,78 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
- if (prepareStatus != VTK_SQLITE_OK)
+ if (prepareStatus != SQLITE_OK)
- {
+ {
- this->SetLastErrorText(vtk_sqlite3_errmsg(db));
- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message "
-+ this->SetLastErrorText(sqlite3_errmsg(db));
-+ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message "
++ this->SetLastErrorText(sqlite_errmsg(db));
++ vtkWarningMacro(<<"SetQuery(): sqlite_prepare_v2() failed with error message "
<< this->GetLastErrorText()
<< " on statement: '"
<< this->Query << "'");
-@@ -191,31 +191,31 @@ bool vtkSQLiteQuery::Execute()
- }
+@@ -191,31 +191,31 @@
+ }
else
- {
+ {
- vtk_sqlite3_reset(this->Statement);
-+ sqlite3_reset(this->Statement);
- }
++ sqlite_reset(this->Statement);
+ }
vtkDebugMacro(<<"Execute(): Query ready to execute.");
this->InitialFetch = true;
- int result = vtk_sqlite3_step(this->Statement);
-+ int result = sqlite3_step(this->Statement);
++ int result = sqlite_step(this->Statement);
this->InitialFetchResult = result;
- if (result == VTK_SQLITE_DONE)
+ if (result == SQLITE_DONE)
- {
+ {
this->SetLastErrorText(NULL);
this->Active = true;
return true;
- }
+ }
- else if (result != VTK_SQLITE_ROW)
+ else if (result != SQLITE_ROW)
- {
+ {
vtkSQLiteDatabase *dbContainer =
vtkSQLiteDatabase::SafeDownCast(this->Database);
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+ sqlite3 *db = dbContainer->SQLiteInstance;
++ sqlite *db = dbContainer->SQLiteInstance;
- this->SetLastErrorText(vtk_sqlite3_errmsg(db));
- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message "
-+ this->SetLastErrorText(sqlite3_errmsg(db));
-+ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message "
++ this->SetLastErrorText(sqlite_errmsg(db));
++ vtkDebugMacro(<< "Execute(): sqlite_step() returned error message "
<< this->GetLastErrorText());
this->Active = false;
return false;
-@@ -236,7 +236,7 @@ int vtkSQLiteQuery::GetNumberOfFields()
- }
+@@ -236,7 +236,7 @@
+ }
else
- {
+ {
- return vtk_sqlite3_column_count(this->Statement);
-+ return sqlite3_column_count(this->Statement);
- }
++ return sqlite_column_count(this->Statement);
+ }
}
-@@ -256,7 +256,7 @@ const char * vtkSQLiteQuery::GetFieldNam
- }
+@@ -256,7 +256,7 @@
+ }
else
- {
+ {
- return vtk_sqlite3_column_name(this->Statement, column);
-+ return sqlite3_column_name(this->Statement, column);
- }
++ return sqlite_column_name(this->Statement, column);
+ }
}
-@@ -276,22 +276,22 @@ int vtkSQLiteQuery::GetFieldType(int col
- }
+@@ -276,22 +276,22 @@
+ }
else
- {
+ {
- switch (vtk_sqlite3_column_type(this->Statement, column))
-+ switch (sqlite3_column_type(this->Statement, column))
- {
++ switch (sqlite_column_type(this->Statement, column))
+ {
- case VTK_SQLITE_INTEGER:
+ case SQLITE_INTEGER:
return VTK_INT;
@@ -250,37 +244,37 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
{
vtkErrorMacro(<<"GetFieldType(): Unknown data type "
- << vtk_sqlite3_column_type(this->Statement, column)
-+ << sqlite3_column_type(this->Statement, column)
++ << sqlite_column_type(this->Statement, column)
<<" from SQLite.");
return VTK_VOID;
}
-@@ -312,7 +312,7 @@ bool vtkSQLiteQuery::NextRow()
- {
+@@ -312,7 +312,7 @@
+ {
vtkDebugMacro(<<"NextRow(): Initial fetch being handled.");
this->InitialFetch = false;
- if (this->InitialFetchResult == VTK_SQLITE_DONE)
+ if (this->InitialFetchResult == SQLITE_DONE)
- {
+ {
return false;
- }
-@@ -323,12 +323,12 @@ bool vtkSQLiteQuery::NextRow()
}
+@@ -323,12 +323,12 @@
+ }
else
- {
+ {
- int result = vtk_sqlite3_step(this->Statement);
- if (result == VTK_SQLITE_DONE)
-+ int result = sqlite3_step(this->Statement);
++ int result = sqlite_step(this->Statement);
+ if (result == SQLITE_DONE)
- {
+ {
return false;
- }
+ }
- else if (result == VTK_SQLITE_ROW)
+ else if (result == SQLITE_ROW)
- {
+ {
return true;
- }
-@@ -336,8 +336,8 @@ bool vtkSQLiteQuery::NextRow()
- {
+ }
+@@ -336,8 +336,8 @@
+ {
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
@@ -290,29 +284,29 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
vtkErrorMacro(<<"NextRow(): Database returned error code "
<< result << " with the following message: "
<< this->GetLastErrorText());
-@@ -363,33 +363,33 @@ vtkVariant vtkSQLiteQuery::DataValue(vtk
- }
+@@ -363,33 +363,33 @@
+ }
else
- {
+ {
- switch (vtk_sqlite3_column_type(this->Statement, column))
-+ switch (sqlite3_column_type(this->Statement, column))
- {
++ switch (sqlite_column_type(this->Statement, column))
+ {
- case VTK_SQLITE_INTEGER:
- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column));
+ case SQLITE_INTEGER:
-+ return vtkVariant(sqlite3_column_int(this->Statement, column));
++ return vtkVariant(sqlite_column_int(this->Statement, column));
- case VTK_SQLITE_FLOAT:
- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column));
+ case SQLITE_FLOAT:
-+ return vtkVariant(sqlite3_column_double(this->Statement, column));
++ return vtkVariant(sqlite_column_double(this->Statement, column));
- case VTK_SQLITE_TEXT:
+ case SQLITE_TEXT:
{
- vtksys_ios::ostringstream str;
+ std::ostringstream str;
- str << vtk_sqlite3_column_text(this->Statement, column);
-+ str << sqlite3_column_text(this->Statement, column);
++ str << sqlite_column_text(this->Statement, column);
return vtkVariant(vtkStdString(str.str()));
}
@@ -326,142 +320,142 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
return vtkVariant(vtkStdString(
- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)),
- vtk_sqlite3_column_bytes(this->Statement, column)));
-+ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)),
-+ sqlite3_column_bytes(this->Statement, column)));
++ static_cast<const char*>(sqlite_column_blob(this->Statement, column)),
++ sqlite_column_bytes(this->Statement, column)));
}
- case VTK_SQLITE_NULL:
+ case SQLITE_NULL:
default:
return vtkVariant();
- }
-@@ -420,11 +420,11 @@ bool vtkSQLiteQuery::BeginTransaction()
+ }
+@@ -420,11 +420,11 @@
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+ sqlite3 *db = dbContainer->SQLiteInstance;
++ sqlite *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
-+ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
++ int result = sqlite_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == VTK_SQLITE_OK)
+ if (result == SQLITE_OK)
- {
+ {
this->TransactionInProgress = true;
this->SetLastErrorText(NULL);
-@@ -448,7 +448,7 @@ bool vtkSQLiteQuery::CommitTransaction()
+@@ -448,7 +448,7 @@
{
if (this->Statement)
- {
+ {
- vtk_sqlite3_finalize(this->Statement);
-+ sqlite3_finalize(this->Statement);
++ sqlite_finalize(this->Statement);
this->Statement = NULL;
- }
+ }
-@@ -460,11 +460,11 @@ bool vtkSQLiteQuery::CommitTransaction()
+@@ -460,11 +460,11 @@
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+ sqlite3 *db = dbContainer->SQLiteInstance;
++ sqlite *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
-+ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
++ int result = sqlite_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == VTK_SQLITE_OK)
+ if (result == SQLITE_OK)
- {
+ {
this->TransactionInProgress = false;
this->SetLastErrorText(NULL);
-@@ -496,11 +496,11 @@ bool vtkSQLiteQuery::RollbackTransaction
+@@ -496,11 +496,11 @@
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+ sqlite3 *db = dbContainer->SQLiteInstance;
++ sqlite *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
-+ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
++ int result = sqlite_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == VTK_SQLITE_OK)
+ if (result == SQLITE_OK)
- {
+ {
this->TransactionInProgress = false;
this->SetLastErrorText(NULL);
-@@ -644,11 +644,11 @@ bool vtkSQLiteQuery::BindIntegerParamete
+@@ -644,11 +644,11 @@
if (this->Active)
- {
+ {
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite3_reset(this->Statement);
- }
++ sqlite_reset(this->Statement);
+ }
- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value);
-+ int status = sqlite3_bind_int(this->Statement, index+1, value);
++ int status = sqlite_bind_int(this->Statement, index+1, value);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
- {
- vtksys_ios::ostringstream errormessage;
+ {
+ std::ostringstream errormessage;
errormessage << "sqlite_bind_int returned error: " << status;
-@@ -673,11 +673,11 @@ bool vtkSQLiteQuery::BindInt64Parameter(
+@@ -673,11 +673,11 @@
if (this->Active)
- {
+ {
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite3_reset(this->Statement);
- }
++ sqlite_reset(this->Statement);
+ }
- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value));
-+ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value));
++ int status = sqlite_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value));
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
- {
- vtksys_ios::ostringstream errormessage;
+ {
+ std::ostringstream errormessage;
errormessage << "sqlite_bind_int64 returned error: " << status;
-@@ -702,12 +702,12 @@ bool vtkSQLiteQuery::BindDoubleParameter
+@@ -702,12 +702,12 @@
if (this->Active)
- {
+ {
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite3_reset(this->Statement);
- }
++ sqlite_reset(this->Statement);
+ }
- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value);
-+ int status = sqlite3_bind_double(this->Statement, index+1, value);
++ int status = sqlite_bind_double(this->Statement, index+1, value);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
- {
- vtksys_ios::ostringstream errormessage;
+ {
+ std::ostringstream errormessage;
errormessage << "sqlite_bind_double returned error: " << status;
-@@ -731,12 +731,12 @@ bool vtkSQLiteQuery::BindStringParameter
+@@ -731,12 +731,12 @@
if (this->Active)
- {
+ {
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite3_reset(this->Statement);
- }
++ sqlite_reset(this->Statement);
+ }
- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT);
-+ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT);
++ int status = sqlite_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
- {
- vtksys_ios::ostringstream errormessage;
+ {
+ std::ostringstream errormessage;
errormessage << "sqlite_bind_text returned error: " << status;
-@@ -760,17 +760,17 @@ bool vtkSQLiteQuery::BindBlobParameter(i
+@@ -760,17 +760,17 @@
if (this->Active)
- {
+ {
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite3_reset(this->Statement);
- }
++ sqlite_reset(this->Statement);
+ }
int status =
- vtk_sqlite3_bind_blob(this->Statement,
-+ sqlite3_bind_blob(this->Statement,
++ sqlite_bind_blob(this->Statement,
index+1,
data,
length,
@@ -470,30 +464,28 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
- {
- vtksys_ios::ostringstream errormessage;
+ {
+ std::ostringstream errormessage;
errormessage << "sqlite_bind_blob returned error: " << status;
-@@ -794,12 +794,12 @@ bool vtkSQLiteQuery::ClearParameterBindi
+@@ -794,12 +794,12 @@
if (this->Active)
- {
+ {
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
-+ sqlite3_reset(this->Statement);
- }
++ sqlite_reset(this->Statement);
+ }
- int status = vtk_sqlite3_clear_bindings(this->Statement);
-+ int status = sqlite3_clear_bindings(this->Statement);
++ int status = sqlite_clear_bindings(this->Statement);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
- {
- vtksys_ios::ostringstream errormessage;
+ {
+ std::ostringstream errormessage;
errormessage << "sqlite_clear_bindings returned error: " << status;
-Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.h
-===================================================================
---- VTK-6.3.0.orig/IO/SQL/vtkSQLiteQuery.h
-+++ VTK-6.3.0/IO/SQL/vtkSQLiteQuery.h
-@@ -47,7 +47,7 @@
+--- a/IO/SQL/vtkSQLiteQuery.h
++++ b/IO/SQL/vtkSQLiteQuery.h
+@@ -50,7 +50,7 @@
class vtkSQLiteDatabase;
class vtkVariant;
class vtkVariantArray;
@@ -502,19 +494,17 @@ Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.h
class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery
{
-@@ -155,7 +155,7 @@ private:
- vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented.
- void operator=(const vtkSQLiteQuery &); // Not implemented.
+@@ -175,7 +175,7 @@
+ vtkSQLiteQuery(const vtkSQLiteQuery &) VTK_DELETE_FUNCTION;
+ void operator=(const vtkSQLiteQuery &) VTK_DELETE_FUNCTION;
- vtk_sqlite3_stmt *Statement;
+ sqlite3_stmt *Statement;
bool InitialFetch;
int InitialFetchResult;
char *LastErrorText;
-Index: VTK-6.3.0/ThirdParty/sqlite/CMakeLists.txt
-===================================================================
---- VTK-6.3.0.orig/ThirdParty/sqlite/CMakeLists.txt
-+++ VTK-6.3.0/ThirdParty/sqlite/CMakeLists.txt
+--- a/ThirdParty/sqlite/CMakeLists.txt
++++ b/ThirdParty/sqlite/CMakeLists.txt
@@ -1,4 +1,3 @@
set(vtksqlite_THIRD_PARTY 1)
-set(vtksqlite_LIBRARIES vtksqlite)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk7.git
More information about the debian-science-commits
mailing list