Changeset 159480 in webkit

Timestamp:

Nov 18, 2013 9:14:36 PM (10 years ago)

Author:

mrowe@apple.com

Message:

Disable deprecation warnings related to NSCalendarDate in WebHistory.

Reviewed by Anders Carlsson.

• History/WebHistory.h: Use a #pragma to have the compiler treat this header as

a system header, even when not included from a system location. This has the effect
of suppressing warnings when including this header. It's a more general effect than
we're after but is also less invasive than disabling deprecation warnings around
the APIs that are defined in terms of NSCalendarDate. We'll hopefully revisit this
in the future.

• History/WebHistory.mm: Disable deprecation warnings around uses of NSCalendarDate.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• History/WebHistory.h (modified) (1 diff)
• History/WebHistory.mm (modified) (7 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-11-18  Mark Rowe  <mrowe@apple.com>
+
+        Disable deprecation warnings related to NSCalendarDate in WebHistory.
+
+        Reviewed by Anders Carlsson.
+
+        * History/WebHistory.h: Use a #pragma to have the compiler treat this header as
+        a system header, even when not included from a system location. This has the effect
+        of suppressing warnings when including this header. It's a more general effect than
+        we're after but is also less invasive than disabling deprecation warnings around
+        the APIs that are defined in terms of NSCalendarDate. We'll hopefully revisit this
+        in the future.
+        * History/WebHistory.mm: Disable deprecation warnings around uses of NSCalendarDate.
+
 2013-11-18  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebKit/mac/History/WebHistory.h

@@ -28 +28 @@
 
 #import <Foundation/Foundation.h>
+
+#pragma GCC system_header
 
 @class NSError;

trunk/Source/WebKit/mac/History/WebHistory.mm

@@ -93 +93 @@
 
 - (NSArray *)orderedLastVisitedDays;
-- (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)calendarDate;
 - (BOOL)containsURL:(NSURL *)URL;
 - (WebHistoryItem *)itemForURL:(NSURL *)URL;
@@ -101 +100 @@
 - (BOOL)loadFromURL:(NSURL *)URL collectDiscardedItemsInto:(NSMutableArray *)discardedItems error:(NSError **)error;
 - (BOOL)saveToURL:(NSURL *)URL error:(NSError **)error;
-
-- (NSCalendarDate *)ageLimitDate;
 
 - (void)setHistoryItemLimit:(int)limit;
@@ -446 +443 @@
 // MARK: DATE-BASED RETRIEVAL
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
 - (NSArray *)orderedLastVisitedDays
 {
@@ -476 +476 @@
 }
 
+#pragma clang diagnostic pop
+
 // MARK: URL MATCHING
 
@@ -526 +528 @@
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
 // Return a date that marks the age limit for history entries saved to or
 // loaded from disk. Any entry older than this item should be rejected.
@@ -533 +538 @@
                                                       hours:0 minutes:0 seconds:0];
 }
+
+#pragma clang diagnostic pop
 
 - (BOOL)loadHistoryGutsFromURL:(NSURL *)URL savedItemsCount:(int *)numberOfItemsLoaded collectDiscardedItemsInto:(NSMutableArray *)discardedItems error:(NSError **)error
@@ -775 +782 @@
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
 - (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)date
 {
     return [_historyPrivate orderedItemsLastVisitedOnDay:date];
 }
+
+#pragma clang diagnostic pop
 
 // MARK: URL MATCHING