This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[ecj] Patch: FYI: add missing qualifications
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 15 Aug 2006 11:51:24 -0600
- Subject: [ecj] Patch: FYI: add missing qualifications
- Reply-to: tromey at redhat dot com
I'm checking this in on the gcj-eclipse branch.
I don't know why I needed these extra qualifications now, but a build
yesterday failed without them.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* gnu/gcj/runtime/natSharedLibLoader.cc (init): Added missing
'::'.
* gnu/gcj/convert/natIconv.cc (init): Added missing '::'.
(read): Likewise.
* gnu/gcj/natCore.cc (create): Added missing '::'.
* gnu/classpath/natSystemProperties.cc (insertSystemProperties):
Added missing '::'
Index: gnu/classpath/natSystemProperties.cc
===================================================================
--- gnu/classpath/natSystemProperties.cc (revision 115453)
+++ gnu/classpath/natSystemProperties.cc (working copy)
@@ -142,7 +142,7 @@
}
void
-gnu::classpath::SystemProperties::insertSystemProperties (java::util::Properties *newprops)
+gnu::classpath::SystemProperties::insertSystemProperties (::java::util::Properties *newprops)
{
// A convenience define.
#define SET(Prop,Val) \
Index: gnu/gcj/natCore.cc
===================================================================
--- gnu/gcj/natCore.cc (revision 115453)
+++ gnu/gcj/natCore.cc (working copy)
@@ -1,6 +1,6 @@
// natCore -- C++ side of Core
-/* Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
+/* Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation
This file is part of libgcj.
@@ -115,6 +115,6 @@
{
gnu::gcj::Core *core = _Jv_create_core (root, name);
if (core == NULL)
- throw new java::io::IOException (JvNewStringLatin1 ("can't open core"));
+ throw new ::java::io::IOException (JvNewStringLatin1 ("can't open core"));
return core;
}
Index: gnu/gcj/convert/natIconv.cc
===================================================================
--- gnu/gcj/convert/natIconv.cc (revision 115453)
+++ gnu/gcj/convert/natIconv.cc (working copy)
@@ -1,6 +1,6 @@
// natIconv.cc -- Java side of iconv() reader.
-/* Copyright (C) 2000, 2001, 2003 Free Software Foundation
+/* Copyright (C) 2000, 2001, 2003, 2006 Free Software Foundation
This file is part of libgcj.
@@ -47,13 +47,13 @@
iconv_t h = iconv_open ("UCS-2", buffer);
if (h == (iconv_t) -1)
- throw new java::io::UnsupportedEncodingException (encoding);
+ throw new ::java::io::UnsupportedEncodingException (encoding);
JvAssert (h != NULL);
handle = reinterpret_cast<gnu::gcj::RawData *> (h);
#else /* HAVE_ICONV */
// If no iconv, just throw an exception.
- throw new java::io::UnsupportedEncodingException (encoding);
+ throw new ::java::io::UnsupportedEncodingException (encoding);
#endif /* HAVE_ICONV */
}
@@ -96,7 +96,7 @@
// some conversion might have taken place. So we fall through
// to the normal case.
if (errno != EINVAL && errno != E2BIG)
- throw new java::io::CharConversionException ();
+ throw new ::java::io::CharConversionException ();
}
if (iconv_byte_swap)
@@ -147,13 +147,13 @@
iconv_t h = iconv_open (buffer, "UCS-2");
if (h == (iconv_t) -1)
- throw new java::io::UnsupportedEncodingException (encoding);
+ throw new ::java::io::UnsupportedEncodingException (encoding);
JvAssert (h != NULL);
handle = reinterpret_cast<gnu::gcj::RawData *> (h);
#else /* HAVE_ICONV */
// If no iconv, just throw an exception.
- throw new java::io::UnsupportedEncodingException (encoding);
+ throw new ::java::io::UnsupportedEncodingException (encoding);
#endif /* HAVE_ICONV */
}
Index: gnu/gcj/runtime/natSharedLibLoader.cc
===================================================================
--- gnu/gcj/runtime/natSharedLibLoader.cc (revision 115453)
+++ gnu/gcj/runtime/natSharedLibLoader.cc (working copy)
@@ -85,7 +85,7 @@
if (flags==0)
flags = RTLD_GLOBAL | RTLD_LAZY;
- JvSynchronize dummy1(&java::lang::Class::class$);
+ JvSynchronize dummy1(&::java::lang::Class::class$);
SharedLibDummy dummy2;
curLoader = loader;
curHelper = this;
@@ -95,7 +95,7 @@
if (h == NULL)
{
const char *msg = dlerror();
- throw new java::lang::UnknownError(JvNewStringLatin1(msg));
+ throw new ::java::lang::UnknownError(JvNewStringLatin1(msg));
}
handler = (gnu::gcj::RawData*) h;
#else