(-awake): Corrected name of method -awake: to -awake for compatibility

(-awake): Corrected name of method -awake: to -awake for compatibility
(+streamVersion:): New method

From-SVN: r4150

diff --git a/gcc/objc/Object.h b/gcc/objc/Object.h
index 1b2b25204ca6fa224823d837042985e6d7d2e473..ed2b3505be55043e1f9736cfb22f8048cbdadfea 100644 (file)
--- a/gcc/objc/Object.h
+++ b/gcc/objc/Object.h
@@ -109,10 +109,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
         /* Archiving */
 + (int)version;
 + setVersion:(int)aVersion;
++ (int)streamVersion: (TypedStream*)aStream;
 
 - read: (TypedStream*)aStream;
 - write: (TypedStream*)aStream;
-- awake: (TypedStream*)aStream;
+- awake;
 
 @end
 

diff --git a/gcc/objc/Object.m b/gcc/objc/Object.m
index 39aab8c29aa5dd2e472b5dc8859d9c44bd8f055f..a7b375175e48bddc0e2575536f2cfeca571c0845 100644 (file)
--- a/gcc/objc/Object.m
+++ b/gcc/objc/Object.m
@@ -315,6 +315,14 @@ extern int errno;
   return self;
 }
 
++ (int)streamVersion: (TypedStream*)aStream
+{
+  if (aStream->mode == OBJC_READONLY)
+    return objc_get_stream_class_version (aStream, self);
+  else
+    return class_get_version (self);
+}
+
 // These are used to write or read the instance variables 
 // declared in this particular part of the object.  Subclasses
 // should extend these, by calling [super read/write: aStream]
@@ -333,9 +341,9 @@ extern int errno;
   return self;
 }
 
-- awake: (TypedStream*)aStream
+- awake
 {
-  // [super awake: aStream];
+  // [super awake];
   return self;
 }