ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-13 04:38:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into jdk7

Browse Source 
Conflicts:
	makefile
This commit is contained in:
Joel Dice
2012-05-04 11:33:16 -06:00
parent cab1a675af 58691a7fdb
commit 19de383aae
12 changed files with 286 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interpret.cpp
View File

@ -3067,6 +3067,10 @@ class MyProcessor: public Processor {
abort(s);
}
virtual void addCompilationHandler(CompilationHandler* handler) {
abort(s);
}
virtual void compileMethod(vm::Thread*, Zone*, object*, object*,
DelayedPromise**, object, OffsetResolver*)
{