diff options
author | Martin Odersky <odersky@gmail.com> | 2008-05-02 14:55:17 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2008-05-02 14:55:17 +0000 |
commit | 76c76b28f952584210fd851f95877b84f0b688a2 (patch) | |
tree | 20dfff67c5d7d092104fd17c66cb597e1c9327b7 /src/library | |
parent | 8c35b8f863e5b7104deb7bfdce957d6d428cc25f (diff) | |
download | scala-76c76b28f952584210fd851f95877b84f0b688a2.tar.gz scala-76c76b28f952584210fd851f95877b84f0b688a2.tar.bz2 scala-76c76b28f952584210fd851f95877b84f0b688a2.zip |
fixed #828, #789, #828.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/immutable/Tree.scala | 52 | ||||
-rw-r--r-- | src/library/scala/collection/mutable/HashTable.scala | 2 |
2 files changed, 52 insertions, 2 deletions
diff --git a/src/library/scala/collection/immutable/Tree.scala b/src/library/scala/collection/immutable/Tree.scala index 3853e23cd9..0ce6469952 100644 --- a/src/library/scala/collection/immutable/Tree.scala +++ b/src/library/scala/collection/immutable/Tree.scala @@ -17,7 +17,10 @@ ** Balanced Trees. These have no storage overhead compared to plain ** unbalanced binary trees, and their performance is in general better ** than AVL trees. -* +** +** NOTE: This code was until 2007-04-01 under a GPL license. The author has +** given permission to remove that license, so that now this code is under +** the general license for the Scala libraries. */ package scala.collection.immutable @@ -387,3 +390,50 @@ private case class GBNode[A <% Ordered[A],B](key: A, override def hashCode() = value.hashCode() + smaller.hashCode() + bigger.hashCode() } + +/* Here is the e-mail where the Author agreed to the change in license. + +from Erik Stenman <happi.stenman@gmail.com> +to martin odersky <martin.odersky@epfl.ch>, +date Tue, Apr 29, 2008 at 3:31 PM +subject Re: test +mailed-by chara.epfl.ch +signed-by gmail.com + +Hi Martin, + +I am fine with that change, and since I don't have a scala distribution handy, +I am also fine with you doing the change yourself. Is that OK? + +Sorry for my dead home address, I'll add an English response to it at some time. + +I am doing fine, and my family is also doing fine. +Hope all is well with you too. + +Cheers, +Erik +- Hide quoted text - + +On Tue, Apr 29, 2008 at 3:13 PM, martin odersky <martin.odersky@epfl.ch> wrote: + + Hi Erik, + + I tried to send mail to happi@home.se, but got a response n swedish. I + was sort of guessing from the response that it contained an + alternative e-mail address and tried to send it there. + + Anyway, I hope things are going well with you! + + There was some discussion recently about the license of Tree.scala in + package collection.immutable. It's GPL, whereas the rest of the Scala + library is BSD. It seems this poses problems with Scala being packaged + with Fedora. Would it be OK with you to change the license to the + general one of Scala libraries? You could simply remove the references + to the GPL + license in the code and send it back to me if that's OK with you. On + the other hand, if there's a problem we'll try something else instead. + + All the best + + -- Martin +*/ diff --git a/src/library/scala/collection/mutable/HashTable.scala b/src/library/scala/collection/mutable/HashTable.scala index 214166e823..fb9ce91c58 100644 --- a/src/library/scala/collection/mutable/HashTable.scala +++ b/src/library/scala/collection/mutable/HashTable.scala @@ -43,7 +43,7 @@ trait HashTable[A] extends AnyRef { /** The initial threshold */ - protected val initialThreshold: Int = newThreshold(initialSize) + protected def initialThreshold: Int = newThreshold(initialSize) /** The actual hash table. */ |