diff options
| author | Warren Levy <warrenl@cygnus.com> | 2000-07-27 23:57:07 +0000 |
|---|---|---|
| committer | Warren Levy <warrenl@gcc.gnu.org> | 2000-07-27 23:57:07 +0000 |
| commit | 7db51521a018eaa0751e5948091cfb29c841ca91 (patch) | |
| tree | ff39f131cca0a0da7843ec7d8797e9f7c82bd82d /libjava/gcj/field.h | |
| parent | b2244c65f518cfb4b6a5385ddfe45bc3ce2cf9c0 (diff) | |
| download | gcc-7db51521a018eaa0751e5948091cfb29c841ca91.zip gcc-7db51521a018eaa0751e5948091cfb29c841ca91.tar.gz gcc-7db51521a018eaa0751e5948091cfb29c841ca91.tar.bz2 | |
mauve-libgcj: Activated serialization tests.
* mauve-libgcj: Activated serialization tests.
* gcj/field.h (getModifiers): Mask off unknown flags.
* gnu/java/security/provider/SHA.java (munch): Reset buffer to 0 so
spurious bits don't cause discrepancies.
* java/io/ObjectOutputStream.java: Fixed typo in comment.
* java/io/ObjectStreamClass.java: Fixed typos in comments.
(lookup): Applied patch from Brian Jones <cbj@gnu.org> to optimize.
(hasClassInitializer): Call getDeclaredMethod instead of getMethod.
* java/lang/Throwable.java (serialVersionUID): New field.
* java/lang/reflect/Modifier.java (ALL_FLAGS): Preserve STRICT if used.
* java/lang/reflect/natConstructor.cc (getModifiers): Mask off
unknown flags.
* java/lang/reflect/natMethod.cc: Ditto.
* java/security/Key.java (serialVersionUID): Removed field for now.
* java/security/interfaces/DSAPrivateKey.java (serialVersionUID): Ditto.
* java/security/interfaces/DSAPublicKey.java (serialVersionUID): Ditto.
Serialization mods.
From-SVN: r35302
Diffstat (limited to 'libjava/gcj/field.h')
| -rw-r--r-- | libjava/gcj/field.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libjava/gcj/field.h b/libjava/gcj/field.h index 4413fa3..0ad381c 100644 --- a/libjava/gcj/field.h +++ b/libjava/gcj/field.h @@ -13,6 +13,7 @@ details. */ #include <java/lang/Class.h> #include <java/lang/reflect/Field.h> +#include <java/lang/reflect/Modifier.h> #define _Jv_FIELD_UNRESOLVED_FLAG 0x8000 #define _Jv_FIELD_CONSTANT_VALUE 0x4000 @@ -74,8 +75,11 @@ struct _Jv_Field return type; } - // FIXME - may need to mask off internal flags. - int getModifiers() { return flags; } + // Need to mask off all unknown/internal flags before returning. + int getModifiers() + { + return flags & java::lang::reflect::Modifier::ALL_FLAGS; + } #ifdef COMPACT_FIELDS _Jv_Utf8Const * getNameUtf8Const (jclass cls) |