forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix varargs code in database and a few errors in mssql + x64

This commit is contained in:
Trass3r 2011-11-15 19:23:56 +01:00
parent 4a57064709
commit 9d027eb3f6
3 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
database.d
View File

@ -25,35 +25,19 @@ interface Database {
Variant[] args; Variant[] args;
foreach(arg; _arguments) { foreach(arg; _arguments) {
string a; string a;
if(arg == typeid(string)) { if(arg == typeid(string) || arg == typeid(immutable(string)) || arg == typeid(const(string)))
a = va_arg!(string)(_argptr); a = va_arg!string(_argptr);
} else if(arg == typeid(immutable(string))) { else if (arg == typeid(int) || arg == typeid(immutable(int)) || arg == typeid(const(int))) {
a = va_arg!(immutable(string))(_argptr); int e = va_arg!int(_argptr);
} else if(arg == typeid(const(immutable(char)[]))) {
a = va_arg!(const(immutable(char)[]))(_argptr);
} else if (arg == typeid(int)) {
auto e = va_arg!(int)(_argptr);
a = to!string(e);
} else if (arg == typeid(immutable(int))) {
auto e = va_arg!(immutable(int))(_argptr);
a = to!string(e);
} else if (arg == typeid(const(int))) {
auto e = va_arg!(const(int))(_argptr);
a = to!string(e); a = to!string(e);
} else if (arg == typeid(immutable(char))) { } else if (arg == typeid(immutable(char))) {
auto e = va_arg!(immutable(char))(_argptr); char e = va_arg!char(_argptr);
a = to!string(e); a = to!string(e);
} else if (arg == typeid(long)) { } else if (arg == typeid(long) || arg == typeid(const(long)) || arg == typeid(immutable(long))) {
auto e = va_arg!(long)(_argptr); long e = va_arg!long(_argptr);
a = to!string(e);
} else if (arg == typeid(const(long))) {
auto e = va_arg!(const(long))(_argptr);
a = to!string(e);
} else if (arg == typeid(immutable(long))) {
auto e = va_arg!(immutable(long))(_argptr);
a = to!string(e); a = to!string(e);
} else if (arg == typeid(void*)) { } else if (arg == typeid(void*)) {
auto e = va_arg!(void*)(_argptr); void* e = va_arg!(void*)(_argptr);
assert(e is null, "can only pass null pointer"); assert(e is null, "can only pass null pointer");
a = null; a = null;
} else assert(0, "invalid type " ~ arg.toString ); } else assert(0, "invalid type " ~ arg.toString );

8
dom.d
View File

@ -2172,7 +2172,7 @@ class Table : Element {
return position; return position;
} }
foreach(i, rowElement; rows) { foreach(int i, rowElement; rows) {
auto row = cast(TableRow) rowElement; auto row = cast(TableRow) rowElement;
assert(row !is null); assert(row !is null);
assert(i < ret.length); assert(i < ret.length);
@ -2186,8 +2186,8 @@ class Table : Element {
// FIXME: colspan == 0 or rowspan == 0 // FIXME: colspan == 0 or rowspan == 0
// is supposed to mean fill in the rest of // is supposed to mean fill in the rest of
// the table, not skip it // the table, not skip it
foreach(j; 0 .. cell.colspan) { foreach(int j; 0 .. cell.colspan) {
foreach(k; 0 .. cell.rowspan) foreach(int k; 0 .. cell.rowspan)
// if the first row, always append. // if the first row, always append.
insertCell(k + i, k == 0 ? -1 : position, cell); insertCell(k + i, k == 0 ? -1 : position, cell);
position++; position++;
@ -2195,7 +2195,7 @@ class Table : Element {
} }
if(ret[i].length > maxLength) if(ret[i].length > maxLength)
maxLength = ret[i].length; maxLength = cast(int) ret[i].length;
} }
// want to ensure it's rectangular // want to ensure it's rectangular

5
mssql.d
View File

@ -19,7 +19,7 @@ class MsSql : Database {
enforce(env !is null); enforce(env !is null);
scope(failure) scope(failure)
SQLFreeHandle(SQL_HANDLE_ENV, env); SQLFreeHandle(SQL_HANDLE_ENV, env);
SQLSetEnvAttr(env, SQL_ATTR_ODBC_VERSION, (void *) SQL_OV_ODBC3, 0); SQLSetEnvAttr(env, SQL_ATTR_ODBC_VERSION, cast(void *) SQL_OV_ODBC3, 0);
SQLAllocHandle(SQL_HANDLE_DBC, env, &conn); SQLAllocHandle(SQL_HANDLE_DBC, env, &conn);
scope(failure) scope(failure)
SQLFreeHandle(SQL_HANDLE_DBC, conn); SQLFreeHandle(SQL_HANDLE_DBC, conn);
@ -50,8 +50,7 @@ class MsSql : Database {
// this is passed to MsSqlResult to control // this is passed to MsSqlResult to control
SQLHSTMT statement; SQLHSTMT statement;
auto returned = SQLAllocHandle(SQL_HANDLE_STMT, conn, auto returned = SQLAllocHandle(SQL_HANDLE_STMT, conn, &statement);
&statement)
enforce(returned == SQL_SUCCESS); enforce(returned == SQL_SUCCESS);