Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,11 @@ dub.selections.json
#unit test binaries
tests/*/tests
__test__*__

*.user
*.userprefs
.directory
.project
*.txt
*.cmake
*.kdev4
.kdev4
6 changes: 3 additions & 3 deletions dub.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "dstddb",
"name": "database",
"description": "A D standard database proposal and implementation",
"copyright": "Copyright © 2015, Erik Smith",
"authors": ["Erik Smith"],
"copyright": "Copyright (C) 2015-2016 Shanghai Putao Technology Co., Ltd",
"authors": ["dlang team of putao labs."],
"license": "MIT",
"sourcePaths": ["src"]
}
Expand Down
2 changes: 0 additions & 2 deletions mysql/test.d
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import std.database.mysql;
import std.experimental.logger;
import std.stdio;

import std.database.rowset;

unittest {
import std.database.testsuite;
alias DB = Database!DefaultPolicy;
Expand Down
4 changes: 3 additions & 1 deletion src/std/database/allocator.d
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@ struct MyMallocator {
import core.stdc.stdlib : malloc;
if (!bytes) return null;
auto p = malloc(bytes);
//log("allocate: ptr: ", p , " size :",bytes);
return p ? p[0 .. bytes] : null;
}

/// Ditto
@system // removed @nogc and nothrow for logging
bool deallocate(void[] b) {
import core.stdc.stdlib : free;
//log("deallocate: ptr: ", b.ptr, "size: ", b.length);
//log("deallocate: ptr: ", b.ptr, " size: ", b.length);
free(b.ptr);
//log("return true");
return true;
}

Expand Down
Loading