Skip to content

[5.0] Implement DateIntervalFormatter. #1953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2019
Merged

[5.0] Implement DateIntervalFormatter. #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ if(ENABLE_TESTING)
TestFoundation/TestCodable.swift
TestFoundation/TestDateComponents.swift
TestFoundation/TestDateFormatter.swift
TestFoundation/TestDateIntervalFormatter.swift
TestFoundation/TestDate.swift
TestFoundation/TestDecimal.swift
TestFoundation/TestEnergyFormatter.swift
Expand Down
1 change: 1 addition & 0 deletions CoreFoundation/Base.subproj/CFRuntime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ static CFRuntimeClass const * __CFRuntimeClassTable[__CFRuntimeClassTableSize] _
[_kCFRuntimeIDCFDateFormatter] = &__CFDateFormatterClass,
[_kCFRuntimeIDCFNumberFormatter] = &__CFNumberFormatterClass,
[_kCFRuntimeIDCFCalendar] = &__CFCalendarClass,
[_kCFRuntimeIDCFDateIntervalFormatter] = &__CFDateIntervalFormatterClass,
[_kCFRuntimeIDCFDate] = &__CFDateClass,
[_kCFRuntimeIDCFTimeZone] = &__CFTimeZoneClass,
[_kCFRuntimeIDCFKeyedArchiverUID] = &__CFKeyedArchiverUIDClass,
Expand Down
3 changes: 2 additions & 1 deletion CoreFoundation/Base.subproj/CFRuntime_Internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ enum {
_kCFRuntimeIDCFSocket = 61,
_kCFRuntimeIDCFAttributedString = 62,
_kCFRuntimeIDCFRunArray = 63,
_kCFRuntimeIDCFDateIntervalFormatter = 64,
// If you are adding a new value, it goes below this line.

// Stuff not in CF goes here. This value should be one more than the last one above.
Expand Down Expand Up @@ -124,7 +125,6 @@ CF_PRIVATE const CFRuntimeClass __CFPreferencesDomainClass;

CF_PRIVATE const CFRuntimeClass __CFMachPortClass;


#if (TARGET_OS_MAC || TARGET_OS_WIN32 || DEPLOYMENT_RUNTIME_SWIFT)
CF_PRIVATE const CFRuntimeClass __CFMessagePortClass;
#endif
Expand All @@ -143,6 +143,7 @@ CF_PRIVATE const CFRuntimeClass __CFWindowsNamedPipeClass;
#endif
CF_PRIVATE const CFRuntimeClass __CFTimeZoneClass;
CF_PRIVATE const CFRuntimeClass __CFCalendarClass;
CF_PRIVATE const CFRuntimeClass __CFDateIntervalFormatterClass;

#pragma mark - Private initialiers to run at process start time

Expand Down
1 change: 1 addition & 0 deletions CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <CoreFoundation/CFRegularExpression.h>
#include <CoreFoundation/CFLogUtilities.h>
#include <CoreFoundation/CFURLSessionInterface.h>
#include <CoreFoundation/CFDateIntervalFormatter.h>
#include <CoreFoundation/ForFoundationOnly.h>
#if DEPLOYMENT_TARGET_WINDOWS
#define NOMINMAX
Expand Down
3 changes: 3 additions & 0 deletions CoreFoundation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ add_framework(CoreFoundation
Locale.subproj/CFCalendar_Internal.h
Locale.subproj/CFDateComponents.h
Locale.subproj/CFDateFormatter_Private.h
Locale.subproj/CFDateIntervalFormatter.h
Locale.subproj/CFDateInterval.h
Locale.subproj/CFICULogging.h
Locale.subproj/CFLocaleInternal.h
Expand Down Expand Up @@ -144,6 +145,7 @@ add_framework(CoreFoundation
StringEncodings.subproj/CFStringEncodingConverterExt.h
URL.subproj/CFURLPriv.h
URL.subproj/CFURLSessionInterface.h
Locale.subproj/CFDateIntervalFormatter.h

# AppServices
AppServices.subproj/CFNotificationCenter.h
Expand Down Expand Up @@ -232,6 +234,7 @@ add_framework(CoreFoundation
Locale.subproj/CFCalendar_Enumerate.c
Locale.subproj/CFDateComponents.c
Locale.subproj/CFDateFormatter.c
Locale.subproj/CFDateIntervalFormatter.c
Locale.subproj/CFDateInterval.c
Locale.subproj/CFLocale.c
Locale.subproj/CFLocaleIdentifier.c
Expand Down
Loading