aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2007-01-26 23:07:08 +0000
committerTom Tromey <tromey@gcc.gnu.org>2007-01-26 23:07:08 +0000
commit7969a3791efb8a9dbed7b6a049d98befcf10db0d (patch)
tree480b780978724842f7b5256099d0c2c73aa4f70d /libjava/classpath
parentcdd76d88c8200bcc541204daeca4770ec6221f5d (diff)
downloadgcc-7969a3791efb8a9dbed7b6a049d98befcf10db0d.zip
gcc-7969a3791efb8a9dbed7b6a049d98befcf10db0d.tar.gz
gcc-7969a3791efb8a9dbed7b6a049d98befcf10db0d.tar.bz2
libjava
* Updated headers. libjava/classpath * tools/gnu/classpath/tools/javah/FieldHelper.java (print): Print 'volatile' after field type. From-SVN: r121215
Diffstat (limited to 'libjava/classpath')
-rw-r--r--libjava/classpath/ChangeLog5
-rw-r--r--libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.classbin2203 -> 2203 bytes
-rw-r--r--libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java6
3 files changed, 8 insertions, 3 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 489b9aa..ef572dd 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-26 Tom Tromey <tromey@redhat.com>
+
+ * tools/gnu/classpath/tools/javah/FieldHelper.java (print): Print
+ 'volatile' after field type.
+
2007-01-23 Marco Trudel <mtrudel@gmx.ch>
* java/util/Arrays.java (binarySearch): Change comparison order.
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class
index 430344c..9b7169f 100644
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class
+++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class
Binary files differ
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java
index a9385e0..f1c369a 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java
@@ -1,5 +1,5 @@
/* FieldHelper.java - field helper methods for CNI
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -52,12 +52,12 @@ public class FieldHelper
out.print(" ");
if (Modifier.isStatic(field.access))
out.print("static ");
- if (Modifier.isVolatile(field.access))
- out.print("volatile ");
if ((field.value instanceof Integer) || (field.value instanceof Long))
out.print("const ");
out.print(Type.getType(field.desc));
out.print(" ");
+ if (Modifier.isVolatile(field.access))
+ out.print("volatile ");
boolean result = false;
if (superType != null && ! Modifier.isStatic(field.access))
{