From d65839d51a858de3626734a49a82456dd7bc44f8 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 5 Feb 2011 17:09:57 +0000 Subject: [PATCH] * renamed NSObject.*copyWithZone to NSObject.class*CopyWithZone to prevent identifier conflicts with the instance methods added by NSCopyingProtocol git-svn-id: trunk@16881 - --- rtl/inc/objcbase.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rtl/inc/objcbase.pp b/rtl/inc/objcbase.pp index eea06bec9a..8516b015f6 100644 --- a/rtl/inc/objcbase.pp +++ b/rtl/inc/objcbase.pp @@ -185,10 +185,10 @@ type function copy: id; message 'copy'; function mutableCopy: id; message 'mutableCopy'; - class function copyWithZone(_zone: NSZonePtr): id; message 'copyWithZone:'; - class function copyWithZone_(_zone: NSZonePtr): id; message 'copyWithZone:'; - class function mutableCopyWithZone(_zone: NSZonePtr): id; message 'mutableCopyWithZone:'; - class function mutableCopyWithZone_(_zone: NSZonePtr): id; message 'mutableCopyWithZone:'; + class function classCopyWithZone(_zone: NSZonePtr): id; message 'copyWithZone:'; + class function classCopyWithZone_(_zone: NSZonePtr): id; message 'copyWithZone:'; + class function classMutableCopyWithZone(_zone: NSZonePtr): id; message 'mutableCopyWithZone:'; + class function classMutableCopyWithZone_(_zone: NSZonePtr): id; message 'mutableCopyWithZone:'; { "class" prefix to method name to avoid name collision with NSObjectProtocol } class function classSuperclass: pobjc_class; message 'superclass';