Reinstated old, trusted starr from r17713.

Modified version number detection, so that
until we have a new starr both 4 and 5 are
acceptable (without warnings).

Restored stability test so that it does
complain if differences are found; however,
a failed stability test is still non-fatal
for the time being.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala
index c09136e9a5..ff000c85d6 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala
@@ -68,10 +68,21 @@ abstract class UnPickler {
     private def checkVersion(filename: String) {
       val major = readNat()
       val minor = readNat()
+
+// remove the portion below, between "cut here", before releasing the first 2.8 beta
+
 //---cut here---
+
+      // transiently, use this bit as long as stability fails.
+      if (major != 4 && major != 5)
+
+      // once stability is restored, use the following bit instead:
+/*
       if (major == 4) { // !!! temporarily accept 4 as version.
         println("WARNING: old class format, please recompile "+filename)
       } else
+*/
+
 //---cut here---
       if (major != MajorVersion || minor > MinorVersion)
         throw new IOException("Scala signature " + classRoot.name +