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

Merge pull request #442 from dicej/master

Browse Source 
fix GCC 5.1 compiler warnings/errors
This commit is contained in:
Joshua Warner 2015-06-25 12:33:27 -07:00
commit ebd6bb2e6d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bootimage-template.cpp
View File

@ -1,10 +1,7 @@
const unsigned NAME(BootMask) = (~static_cast<unsigned>(0))
/ NAME(BytesPerWord);
const unsigned NAME(BootShift) = 32 - avian::util::log(NAME(BytesPerWord));
const unsigned NAME(BootFlatConstant) = 1 << NAME(BootShift);
const unsigned NAME(BootHeapOffset) = 1 << (NAME(BootShift) + 1);
const unsigned NAME(BootShift) UNUSED = 32 - avian::util::log(NAME(BytesPerWord));
inline unsigned LABEL(codeMapSize)(unsigned codeSize)
{

4
src/codegen/compiler/event.cpp
View File

@ -1111,10 +1111,10 @@ class CombineEvent : public Event {
"%p %p %d : %p %p %d\n",
secondValue,
secondValue->source,
secondValue->source->type(c),
static_cast<int>(secondValue->source->type(c)),
secondValue->nextWord,
secondValue->nextWord->source,
secondValue->nextWord->source->type(c));
static_cast<int>(secondValue->nextWord->source->type(c)));
}
}