FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natDouble.cc (toString): Added parens.

Browse source 
* java/lang/natDouble.cc (toString): Added parens.
	* gnu/gcj/io/shs.h (PROTO): Define.
	* link.cc (resolve_pool_entry): Added missing braces.

From-SVN: r120652
This commit is contained in:
Tom Tromey 2007-01-10 22:56:20 +00:00 • committed by Tom Tromey
parent 26b53f802d
commit ea517ca550
4 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libjava/ChangeLog
View file

@ -1,3 +1,9 @@
2007-01-10 Tom Tromey <tromey@redhat.com>
* java/lang/natDouble.cc (toString): Added parens.
* gnu/gcj/io/shs.h (PROTO): Define.
* link.cc (resolve_pool_entry): Added missing braces.
2007-01-10 H.J. Lu <hongjiu.lu@intel.com> 2007-01-10 H.J. Lu <hongjiu.lu@intel.com>
PR libgcj/30424 PR libgcj/30424

2
libjava/gnu/gcj/io/shs.h
View file

@ -31,6 +31,8 @@ typedef unsigned int uint32_t __attribute__((mode(SI)));
# endif # endif
#endif #endif
#define PROTO
/* The SHS block size and message digest sizes, in bytes */ /* The SHS block size and message digest sizes, in bytes */
#define SHS_BLOCKSIZE 64 #define SHS_BLOCKSIZE 64

4
libjava/java/lang/natDouble.cc
View file

@ -1,6 +1,6 @@
// natDouble.cc - Implementation of java.lang.VMDouble native methods. // natDouble.cc - Implementation of java.lang.VMDouble native methods.
/* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006 Free Software Foundation /* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006, 2007 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
@ -87,7 +87,7 @@ java::lang::VMDouble::toString(jdouble value, jboolean isFloat)
if (sign) if (sign)
*d++ = '-'; *d++ = '-';
if (value >= 1e-3 && value < 1e7 || value == 0) if ((value >= 1e-3 && value < 1e7) || value == 0)
{ {
if (decpt <= 0) if (decpt <= 0)
*d++ = '0'; *d++ = '0';

24
libjava/link.cc
View file

@ -1,6 +1,6 @@
// link.cc - Code for linking and resolving classes and pool entries. // link.cc - Code for linking and resolving classes and pool entries.
/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation /* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
@ -408,16 +408,18 @@ _Jv_Linker::resolve_pool_entry (jclass klass, int index, bool lazy)
// with it should just throw a NoClassDefFoundError with the class' // with it should just throw a NoClassDefFoundError with the class'
// name. // name.
if (! found) if (! found)
if (lazy) {
{ if (lazy)
found = _Jv_NewClass(name, NULL, NULL); {
found->state = JV_STATE_PHANTOM; found = _Jv_NewClass(name, NULL, NULL);
pool->tags[index] |= JV_CONSTANT_ResolvedFlag; found->state = JV_STATE_PHANTOM;
pool->data[index].clazz = found; pool->tags[index] |= JV_CONSTANT_ResolvedFlag;
break; pool->data[index].clazz = found;
} break;
else }
throw new java::lang::NoClassDefFoundError (name->toString()); else
throw new java::lang::NoClassDefFoundError (name->toString());
}
// Check accessibility, but first strip array types as // Check accessibility, but first strip array types as
// _Jv_ClassNameSamePackage can't handle arrays. // _Jv_ClassNameSamePackage can't handle arrays.