* defineclass.cc (character): Removed.

	(prepare_character): Removed.
	(is_identifier_start): Use Character, not character.
	(is_identifier_part): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@47684 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 2 insertions, 17 deletions

diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc
index 5fb8de3b0f3..290152713e2 100644
--- a/libjava/defineclass.cc
+++ b/libjava/defineclass.cc
@@ -268,30 +268,15 @@ struct _Jv_ClassReader {
    */
 };
 
-/* This is used for the isJavaIdentifierStart & isJavaIdentifierPart
-   methods, so we avoid doing _Jv_InitClass all the time */
-
-static const java::lang::Character *character = 0;
-static void prepare_character ();
-
 void
 _Jv_DefineClass (jclass klass, jbyteArray data, jint offset, jint length)
 {
-  if (character == 0)
-    prepare_character ();
-
   _Jv_ClassReader reader (klass, data, offset, length);
   reader.parse();
 
   /* that's it! */
 }
 
-/** put it after _Jv_DefineClass, so it doesn't get inlined */
-static void prepare_character ()
-{
-  character = new java::lang::Character ('!');
-}
-
 
 /** This section defines the parsing/scanning of the class data */
 
@@ -1523,7 +1508,7 @@ is_identifier_start (int c)
   if (ch == 0x5FU)       		/* _ */
     return 1;
 
-  return character->isJavaIdentifierStart ((jchar) ch);
+  return java::lang::Character::isJavaIdentifierStart ((jchar) ch);
 }
 
 static __inline__ int 
@@ -1540,7 +1525,7 @@ is_identifier_part (int c)
   if (ch == 0x5FU || ch == 0x24U)       /* _ $ */
     return 1;
 
-  return character->isJavaIdentifierStart ((jchar) ch);
+  return java::lang::Character::isJavaIdentifierStart ((jchar) ch);
 }
 
 bool