From e409a2c8f40385bfbaee3abbf6c2fdf84fc7b23c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 1 Sep 1999 22:02:20 +0000 Subject: Modifier.java (ALL_FLAGS): New constant. * java/lang/reflect/Modifier.java (ALL_FLAGS): New constant. * resolve.cc: Removed constants defined by java.lang.reflect.Modifier. Include . (_Jv_ResolvePoolEntry): Use values from Modifier. (_Jv_DetermineVTableIndex): Likewise. (_Jv_PrepareClass): Likewise. (ncode): Likewise. * defineclass.cc (_Jv_ClassReader): Removed constants defined by java.lang.reflect.Modifier. Include . (checkExtends): Use values from Modifier. (checkImplements): Likewise. (handleField): Likewise. (handleConstantValueAttribute): Likewise. (handleFieldsEnd): Likewise. (handleMethod ): Likewise. (handleMethodsEnd): Likewise. (handleClassBegin): Likewise. * interpret.cc: Removed constants defined by java.lang.reflect.Modifier. (continue1): Use values from Modifier. * java/lang/natClassLoader.cc: Removed constants defined by java.lang.reflect.Modifier. From-SVN: r29037 --- libjava/java/lang/natClassLoader.cc | 13 ------------- libjava/java/lang/reflect/Modifier.java | 3 +++ 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 4c0f411a877..4172a44e263 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -205,19 +205,6 @@ java::lang::ClassLoader::findLoadedClass (jstring name) return _Jv_FindClassInCache (_Jv_makeUtf8Const (name), this); } -static const int PUBLIC = 0x001; -static const int PRIVATE = 0x002; -static const int PROTECTED = 0x004; -static const int STATIC = 0x008; -static const int FINAL = 0x010; -static const int SYNCHRONIZED = 0x020; -static const int VOLATILE = 0x040; -static const int TRANSIENT = 0x080; -static const int NATIVE = 0x100; -static const int INTERFACE = 0x200; -static const int ABSTRACT = 0x400; -static const int ALL_FLAGS = 0x7FF; - /** This function does class-preparation for compiled classes. NOTE: It contains replicated functionality from diff --git a/libjava/java/lang/reflect/Modifier.java b/libjava/java/lang/reflect/Modifier.java index f9df49e80ee..51285318df7 100644 --- a/libjava/java/lang/reflect/Modifier.java +++ b/libjava/java/lang/reflect/Modifier.java @@ -35,6 +35,9 @@ public class Modifier public static final int INTERFACE = 0x200; public static final int ABSTRACT = 0x400; + // This is only used by the C++ code, so it is not public. + static final int ALL_FLAGS = 0x7ff; + public static boolean isAbstract (int mod) { return (mod & ABSTRACT) != 0; -- cgit v1.2.1