merge back reorganisation branch

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29615 72102866-910b-0410-8b05-ffd578937521

Headers/Foundation/NSObject.h

@@ -376,50 +376,6 @@ GS_EXPORT NSRecursiveLock *gnustep_global_lock;
 @end
 #endif
 
-/**
- * Provides a number of GNUstep-specific methods that are used to aid
- * implementation of the Base library.
- */
-@interface NSObject (GSCategories)
-
-/**
- * Message sent when an implementation wants to explicitly exclude a method
- * (but cannot due to compiler constraint), and wants to make sure it is not
- * called by mistake.  Default implementation raises an exception at runtime.
- */
-- (id) notImplemented: (SEL)aSel;
-
-/**
- * Message sent when an implementation wants to explicitly require a subclass
- * to implement a method (but cannot at compile time since there is no
- * <code>abstract</code> keyword in Objective-C).  Default implementation
- * raises an exception at runtime to alert developer that he/she forgot to
- * override a method.
- */
-- (id) subclassResponsibility: (SEL)aSel;
-
-/**
- * Message sent when an implementation wants to explicitly exclude a method
- * (but cannot due to compiler constraint) and forbid that subclasses
- * implement it.  Default implementation raises an exception at runtime.  If a
- * subclass <em>does</em> implement this method, however, the superclass's
- * implementation will not be called, so this is not a perfect mechanism.
- */
-- (id) shouldNotImplement: (SEL)aSel;
-
-/**
-  WARNING: The -compare: method for NSObject is deprecated
-           due to subclasses declaring the same selector with
-           conflicting signatures.
-           Comparison of arbitrary objects is not just meaningless
-           but also dangerous as most concrete implementations
-           expect comparable objects as arguments often accessing
-           instance variables directly.
-           This method will be removed in a future release.
-*/
-- (NSComparisonResult) compare: (id)anObject;
-@end
-
 #endif
 
 #import	<Foundation/NSDate.h>