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

Merge commit '79558e7e34580406527e20ed25bf65e6ce0bae54'

Browse Source
This commit is contained in:
Josh warner 2009-06-05 15:55:14 -06:00
commit 6c669b96bb
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
readme.txt
View File

@ -417,8 +417,8 @@ architecture-specific parameters.
Step 8: Write a driver which starts the VM and runs the desired main Step 8: Write a driver which starts the VM and runs the desired main
method. Note the bootimageBin function, which will be called by the method. Note the bootimageBin function, which will be called by the
VM to get a handle to the embedded jar. We tell the VM about this VM to get a handle to the embedded boot image. We tell the VM about
function via the "avian.bootimage" property. this function via the "avian.bootimage" property.
Note also that this example includes no resources besides class files. Note also that this example includes no resources besides class files.
If our application loaded resources such as images and properties If our application loaded resources such as images and properties

6
src/stream.h
View File

@ -44,6 +44,12 @@ class Stream {
void read(uint8_t* data, unsigned size) { void read(uint8_t* data, unsigned size) {
if (size > this->size - position_) { if (size > this->size - position_) {
// GCC 4.4 will give us an uninitialized value warning in read1
// unless we do this: (it's smart enough to track data flow
// across functions but not smart enough to see we won't return
// from Client::handleError)
*data = 0;
client->handleError(); client->handleError();
} else { } else {
memcpy(data, this->data + position_, size); memcpy(data, this->data + position_, size);

6
src/type-generator.cpp
View File

@ -1560,11 +1560,7 @@ writeAccessor(Output* out, Object* member, Object* offset, bool unsafe = false)
} }
} }
if (memberOwner(member)->type == Object::Pod) { out->write(">(reinterpret_cast<uint8_t*>(o)");
out->write(">(o->body");
} else {
out->write(">(reinterpret_cast<uint8_t*>(o)");
}
if (endsWith("[0]", typeName) if (endsWith("[0]", typeName)
or (member->type != Object::Scalar or (member->type != Object::Scalar
and memberTypeObject(member))) and memberTypeObject(member)))