objc4-646.tar.gz

[apple/objc4.git] / runtime / Protocol.h

diff --git a/runtime/Protocol.h b/runtime/Protocol.h
index b5e494335daef35f03e05574712f295d7d78cb57..0e78850d1c81d33fba71f228f261f176aebb0e30 100644 (file)
--- a/runtime/Protocol.h
+++ b/runtime/Protocol.h
@@ -1,9 +1,7 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
+ * Copyright (c) 1999-2003, 2006-2007 Apple Inc.  All Rights Reserved.
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -30,38 +28,55 @@
 #ifndef _OBJC_PROTOCOL_H_
 #define _OBJC_PROTOCOL_H_
 
-#import <objc/Object.h>
+#if !__OBJC__
+
+// typedef Protocol is here:
+#include <objc/runtime.h>
+
+
+#elif __OBJC2__
+
+#include <objc/NSObject.h>
 
-struct objc_method_description {
-       SEL name;
-       char *types;
-};
-struct objc_method_description_list {
-        int count;
-        struct objc_method_description list[1];
-};
+// All methods of class Protocol are unavailable. 
+// Use the functions in objc/runtime.h instead.
 
+__OSX_AVAILABLE_STARTING(__MAC_10_0, __IPHONE_2_0)
+@interface Protocol : NSObject
+@end
+
+
+#else
+
+#include <objc/Object.h>
+
+__OSX_AVAILABLE_STARTING(__MAC_10_0, __IPHONE_2_0)
 @interface Protocol : Object
 {
 @private
-       char *protocol_name;
-       struct objc_protocol_list *protocol_list;
-       struct objc_method_description_list *instance_methods, *class_methods;
+    char *protocol_name OBJC2_UNAVAILABLE;
+    struct objc_protocol_list *protocol_list OBJC2_UNAVAILABLE;
+    struct objc_method_description_list *instance_methods OBJC2_UNAVAILABLE;
+    struct objc_method_description_list *class_methods OBJC2_UNAVAILABLE;
 }
 
 /* Obtaining attributes intrinsic to the protocol */
 
-- (const char *)name;
+- (const char *)name OBJC2_UNAVAILABLE;
 
 /* Testing protocol conformance */
 
-- (BOOL) conformsTo: (Protocol *)aProtocolObject;
+- (BOOL) conformsTo: (Protocol *)aProtocolObject OBJC2_UNAVAILABLE;
 
 /* Looking up information specific to a protocol */
 
-- (struct objc_method_description *) descriptionForInstanceMethod:(SEL)aSel;
-- (struct objc_method_description *) descriptionForClassMethod:(SEL)aSel;
+- (struct objc_method_description *) descriptionForInstanceMethod:(SEL)aSel
+    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5, __IPHONE_2_0,__IPHONE_2_0);
+- (struct objc_method_description *) descriptionForClassMethod:(SEL)aSel 
+    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5, __IPHONE_2_0,__IPHONE_2_0);
 
 @end
 
+#endif
+
 #endif /* _OBJC_PROTOCOL_H_ */