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

fix build for GCC 4.3

Browse Source 
Note that this requires removing the -Wconversion flag for now.  I'll
see about restoring it when I'm ready to tackle all those warnings.
This commit is contained in:
Joel Dice 2008-03-10 13:49:10 -06:00
parent 6fa847518c
commit a388ca19ee
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefile
View File

@ -52,8 +52,7 @@ strip-all = --strip-all
rdynamic = -rdynamic
warnings = -Wall -Wextra -Werror -Wunused-parameter \
-Winit-self -Wconversion
warnings = -Wall -Wextra -Werror -Wunused-parameter -Winit-self
common-cflags = $(warnings) -fno-rtti -fno-exceptions \
-I$(JAVA_HOME)/include -idirafter $(src) -I$(native-build) \

2
src/heap.cpp
View File

@ -78,7 +78,7 @@ set(void** o, void* value)
{
*o = reinterpret_cast<void*>
(reinterpret_cast<uintptr_t>(value)
| reinterpret_cast<uintptr_t>(*o) & (~PointerMask));
| (reinterpret_cast<uintptr_t>(*o) & (~PointerMask)));
}
inline void

2
src/machine.h
View File

@ -1484,7 +1484,7 @@ setObjectClass(Thread*, object o, object value)
cast<object>(o, 0)
= reinterpret_cast<object>
(reinterpret_cast<uintptr_t>(value)
| reinterpret_cast<uintptr_t>(cast<object>(o, 0)) & (~PointerMask));
| (reinterpret_cast<uintptr_t>(cast<object>(o, 0)) & (~PointerMask)));
}
object&