From fc4eb533f9b86d2d926e376ec501031c4f9751bb Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 7 Jan 2017 05:48:06 +0000
Subject: [PATCH] upp.src: Gate2->Gate

git-svn-id: svn://ultimatepp.org/upp/trunk@10663 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ODBC/ODBC.cpp                 | 2 +-
 uppsrc/ODBC/ODBC.h                   | 2 +-
 uppsrc/plugin/sqlite3/Sqlite3.h      | 2 +-
 uppsrc/plugin/sqlite3/Sqlite3upp.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/uppsrc/ODBC/ODBC.cpp b/uppsrc/ODBC/ODBC.cpp
index 88cae540f..d112862a6 100644
--- a/uppsrc/ODBC/ODBC.cpp
+++ b/uppsrc/ODBC/ODBC.cpp
@@ -264,7 +264,7 @@ String ODBCSession::EnumRowID(String database, String table)
 	return "";
 }
 
-bool   ODBCPerformScript(const String& text, StatementExecutor& executor, Gate2<int, int> progress_canceled)
+bool   ODBCPerformScript(const String& text, StatementExecutor& executor, Gate<int, int> progress_canceled)
 {
 	const char *p = text;
 	while(*p) {
diff --git a/uppsrc/ODBC/ODBC.h b/uppsrc/ODBC/ODBC.h
index 346b307c6..f10c1f27a 100644
--- a/uppsrc/ODBC/ODBC.h
+++ b/uppsrc/ODBC/ODBC.h
@@ -9,7 +9,7 @@
 
 namespace Upp {
 
-bool   ODBCPerformScript(const String& text, StatementExecutor& executor, Gate2<int, int> progress_canceled = false);
+bool   ODBCPerformScript(const String& text, StatementExecutor& executor, Gate<int, int> progress_canceled = Null);
 
 class ODBCConnection;
 
diff --git a/uppsrc/plugin/sqlite3/Sqlite3.h b/uppsrc/plugin/sqlite3/Sqlite3.h
index 8a08cbeb0..3280d993e 100644
--- a/uppsrc/plugin/sqlite3/Sqlite3.h
+++ b/uppsrc/plugin/sqlite3/Sqlite3.h
@@ -13,7 +13,7 @@ bool Sqlite3PerformScript(const String& text,
 #else
 	StatementExecutor& se = SQLStatementExecutor(),
 #endif
-	Gate2<int, int> progress_canceled = false
+	Gate<int, int> progress_canceled = Null
 );
 
 class Sqlite3Connection;
diff --git a/uppsrc/plugin/sqlite3/Sqlite3upp.cpp b/uppsrc/plugin/sqlite3/Sqlite3upp.cpp
index 5308fe948..58a8e970e 100644
--- a/uppsrc/plugin/sqlite3/Sqlite3upp.cpp
+++ b/uppsrc/plugin/sqlite3/Sqlite3upp.cpp
@@ -535,7 +535,7 @@ const char *Sqlite3ReadString(const char *s, String& stmt) {
 	return s;
 }
 
-bool Sqlite3PerformScript(const String& txt, StatementExecutor& se, Gate2<int, int> progress_canceled) {
+bool Sqlite3PerformScript(const String& txt, StatementExecutor& se, Gate<int, int> progress_canceled) {
 	const char *text = txt;
 	for(;;) {
 		String stmt;