Merge pull request #124 from quickfur/size_t_length

Range API needs size_t for .length.
This commit is contained in:
Adam D. Ruppe 2017-12-12 21:20:58 -05:00 committed by GitHub
commit 4defbe4ddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions

View File

@ -147,7 +147,7 @@ interface ResultSet {
bool empty() @property; bool empty() @property;
Row front() @property; Row front() @property;
void popFront() ; void popFront() ;
int length() @property; size_t length() @property;
/* deprecated */ final ResultSet byAssoc() { return this; } /* deprecated */ final ResultSet byAssoc() { return this; }
} }

View File

@ -111,7 +111,7 @@ class MsSqlResult : ResultSet {
fetchNext; fetchNext;
} }
int length() override size_t length()
{ {
return 1; //FIX ME return 1; //FIX ME
} }

View File

@ -72,7 +72,7 @@ class MySqlResult : ResultSet {
} }
override int length() { override size_t length() {
if(result is null) if(result is null)
return 0; return 0;
return cast(int) mysql_num_rows(result); return cast(int) mysql_num_rows(result);

View File

@ -126,7 +126,7 @@ class PostgresResult : ResultSet {
fetchNext(); fetchNext();
} }
int length() { override size_t length() {
return numRows; return numRows;
} }

View File

@ -227,8 +227,8 @@ class SqliteResult : ResultSet {
position++; position++;
} }
int length() { override size_t length() {
return cast(int) rows.length; return rows.length;
} }
this(Variant[][] rows, char[][] columnNames) { this(Variant[][] rows, char[][] columnNames) {