mirrors/arsd
1
0
Fork 0
mirror of https://github.com/adamdruppe/arsd.git synced 2025-04-27 05:40:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit '9d02'

Browse source 
i have no idea

Conflicts:
	mssql.d
This commit is contained in:
Adam D. Ruppe 2011-11-28 20:06:47 -05:00
commit 8e84e162ba
6 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mssql.d
View file

@ -50,8 +50,7 @@ class MsSql : Database {
// this is passed to MsSqlResult to control
SQLHSTMT statement;
auto returned = SQLAllocHandle(SQL_HANDLE_STMT, conn,
&statement);
auto returned = SQLAllocHandle(SQL_HANDLE_STMT, conn, &statement);
enforce(returned == SQL_SUCCESS);
@ -157,6 +156,10 @@ class MsSqlResult : ResultSet {
if(ptr)
goto more;
}
<<<<<<< HEAD
=======
}
>>>>>>> 9d02
row ~= a;
}