Remove private concrete class access

gnustep · Sep 24, 2024 · 26e0e52 · 26e0e52
1 parent 24e65a2
commit 26e0e52
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Source/NSCalendarDate.m b/Source/NSCalendarDate.m
@@ -459,6 +459,11 @@ + (id) dateWithYear: (NSInteger)year
   return AUTORELEASE(d);
 }
 
+- (NSTimeInterval) timeIntervalSinceReferenceDate
+{
+  return _seconds_since_ref;
+}
+
 /**
  * Creates and returns a new NSCalendarDate object by taking the
  * value of the receiver and adding the interval in seconds specified.

diff --git a/Source/NSDate.m b/Source/NSDate.m
@@ -1773,7 +1773,7 @@ - (NSDate*) laterDate: (NSDate*)otherDate
   double selfTime;
   if (otherDate == nil)
   {
-    return NO;
+    return nil;
   }
 
   selfTime = [self timeIntervalSinceReferenceDate];

diff --git a/Source/NSDatePrivate.h b/Source/NSDatePrivate.h
@@ -25,6 +25,7 @@
 
 #if defined(OBJC_SMALL_OBJECT_SHIFT) && (OBJC_SMALL_OBJECT_SHIFT == 3)
 #define USE_SMALL_DATE 1
+// FIXME: Change to DATE_CONCRETE_CLASS_NAME
 #define CONCRETE_CLASS_NAME GSSmallDate
 #else
 #define USE_SMALL_DATE 0

diff --git a/Source/NSTimer.m b/Source/NSTimer.m
@@ -35,9 +35,8 @@
 #import "Foundation/NSRunLoop.h"
 #import "Foundation/NSInvocation.h"
 
-@class	NSGDate;
-@interface NSGDate : NSObject	// Help the compiler
-@end
+#import "NSDatePrivate.h"
+
 static Class	NSDate_class;
 
 /**
@@ -58,7 +57,7 @@ + (void) initialize
 {
   if (self == [NSTimer class])
     {
-      NSDate_class = [NSGDate class];
+      NSDate_class = [CONCRETE_CLASS_NAME class];
     }
 }