PatchSet 5189
Date: 2004/09/20 17:06:14
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: TreMap
2004-09-20 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/java/util/TreeMap.java:
Resynced with GNU Classpath.
2004-09-19 Mark Wielaard <[EMAIL PROTECTED]>
Fixes bug #10383 reported by Ilya Perminov.
* java/util/TreeMap.java (root): Don't initialize.
(TreeMap(Comparator)): Call fabricateTree(0).
(fabricateTree): Initialize root and size when count is 0.
* test/jni/Makefile.am:
(AM_CPPFLAGS) Added top/builddir/include.
* test/jni/Makefile.in:
Regenerated.
Members:
ChangeLog:1.2744->1.2745
libraries/javalib/java/util/TreeMap.java:1.18->1.19
test/jni/Makefile.am:1.2->1.3
test/jni/Makefile.in:1.14->1.15
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2744 kaffe/ChangeLog:1.2745
--- kaffe/ChangeLog:1.2744 Mon Sep 20 16:25:26 2004
+++ kaffe/ChangeLog Mon Sep 20 17:06:14 2004
@@ -1,3 +1,21 @@
+2004-09-20 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/javalib/java/util/TreeMap.java:
+ Resynced with GNU Classpath.
+
+ 2004-09-19 Mark Wielaard <[EMAIL PROTECTED]>
+
+ Fixes bug #10383 reported by Ilya Perminov.
+ * java/util/TreeMap.java (root): Don't initialize.
+ (TreeMap(Comparator)): Call fabricateTree(0).
+ (fabricateTree): Initialize root and size when count is 0.
+
+ * test/jni/Makefile.am:
+ (AM_CPPFLAGS) Added top/builddir/include.
+
+ * test/jni/Makefile.in:
+ Regenerated.
+
2004-09-20 Guilhem Lavaux <[EMAIL PROTECTED]>
* kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:
Index: kaffe/libraries/javalib/java/util/TreeMap.java
diff -u kaffe/libraries/javalib/java/util/TreeMap.java:1.18
kaffe/libraries/javalib/java/util/TreeMap.java:1.19
--- kaffe/libraries/javalib/java/util/TreeMap.java:1.18 Thu Apr 22 11:40:44 2004
+++ kaffe/libraries/javalib/java/util/TreeMap.java Mon Sep 20 17:06:16 2004
@@ -130,7 +130,7 @@
/**
* The root node of this TreeMap.
*/
- private transient Node root = nil;
+ private transient Node root;
/**
* The size of this TreeMap. Package visible for use by nested classes.
@@ -213,6 +213,7 @@
public TreeMap(Comparator c)
{
comparator = c;
+ fabricateTree(0);
}
/**
@@ -851,7 +852,11 @@
private void fabricateTree(final int count)
{
if (count == 0)
- return;
+ {
+ root = nil;
+ size = 0;
+ return;
+ }
// We color every row of nodes black, except for the overflow nodes.
// I believe that this is the optimal arrangement. We construct the tree
Index: kaffe/test/jni/Makefile.am
diff -u kaffe/test/jni/Makefile.am:1.2 kaffe/test/jni/Makefile.am:1.3
--- kaffe/test/jni/Makefile.am:1.2 Sun Jul 11 08:55:12 2004
+++ kaffe/test/jni/Makefile.am Mon Sep 20 17:06:17 2004
@@ -8,9 +8,11 @@
check_PROGRAMS= jniBase jniExecClass jniReflect
-AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/include/kaffe \
- -I$(top_srcdir)/libltdl \
- -DCLASSPATH_SOURCE_DIR=\"$(top_srcdir)/test/jni\"
+AM_CPPFLAGS= \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/include -I$(top_srcdir)/include/kaffe \
+ -I$(top_srcdir)/libltdl \
+ -DCLASSPATH_SOURCE_DIR=\"$(top_srcdir)/test/jni\"
if NEED_LIBXPROF
libxprof = ../../kaffe/xprof/libkaffexprof.la
Index: kaffe/test/jni/Makefile.in
diff -u kaffe/test/jni/Makefile.in:1.14 kaffe/test/jni/Makefile.in:1.15
--- kaffe/test/jni/Makefile.in:1.14 Thu Sep 16 21:02:35 2004
+++ kaffe/test/jni/Makefile.in Mon Sep 20 17:06:17 2004
@@ -370,9 +370,11 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/kaffe \
- -I$(top_srcdir)/libltdl \
- -DCLASSPATH_SOURCE_DIR=\"$(top_srcdir)/test/jni\"
+AM_CPPFLAGS = \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/include -I$(top_srcdir)/include/kaffe \
+ -I$(top_srcdir)/libltdl \
+ -DCLASSPATH_SOURCE_DIR=\"$(top_srcdir)/test/jni\"
@[EMAIL PROTECTED] = #
@[EMAIL PROTECTED] = ../../kaffe/xprof/libkaffexprof.la
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
