aboutsummaryrefslogtreecommitdiff
path: root/Foundation
diff options
context:
space:
mode:
authorGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2013-12-19 21:30:24 +0000
committerGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2013-12-19 21:30:24 +0000
commit49506cc31201ea09e4d0299b75f0efcd3e64fcc0 (patch)
tree5fa9a10e2c2439f565df1d9fd8463bcb21ca22eb /Foundation
parent9b8635767148b3f95942593bfeefa86f147d2c53 (diff)
Remove obsolete 64-bit NSNumber utility methods.
DELTA=195 (9 added, 180 deleted, 6 changed)
Diffstat (limited to 'Foundation')
-rw-r--r--Foundation/GTMNSNumber+64Bit.h43
-rw-r--r--Foundation/GTMNSNumber+64Bit.m100
-rw-r--r--Foundation/GTMNSNumber+64BitTest.m58
3 files changed, 15 insertions, 186 deletions
diff --git a/Foundation/GTMNSNumber+64Bit.h b/Foundation/GTMNSNumber+64Bit.h
index 91561c8..79ca42c 100644
--- a/Foundation/GTMNSNumber+64Bit.h
+++ b/Foundation/GTMNSNumber+64Bit.h
@@ -1,41 +1,8 @@
//
-// GTMNSNumber+64Bit.h
+// This file previously included utility methods for creating
+// 64-bit NSNumbers.
//
-// Copyright 2009 Google Inc.
+// Applications should be updated to use NSNumber literals and
+// boxed expressions, as described at
+// http://clang.llvm.org/docs/ObjectiveCLiterals.html
//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy
-// of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-//
-
-#import <Foundation/Foundation.h>
-#import "GTMDefines.h"
-#if GTM_IPHONE_SDK
-#import <CoreGraphics/CoreGraphics.h>
-#endif // GTM_IPHONE_SDK
-
-// Adds support for working with NSIntegers,
-// NSUIntegers, CGFloats and NSNumbers (rdar://5812091)
-@interface NSNumber (GTM64BitAdditions)
-
-+ (NSNumber *)gtm_numberWithCGFloat:(CGFloat)value;
-+ (NSNumber *)gtm_numberWithInteger:(NSInteger)value;
-+ (NSNumber *)gtm_numberWithUnsignedInteger:(NSUInteger)value;
-
-- (id)gtm_initWithCGFloat:(CGFloat)value NS_RETURNS_RETAINED NS_CONSUMES_SELF;
-- (id)gtm_initWithInteger:(NSInteger)value NS_RETURNS_RETAINED NS_CONSUMES_SELF;
-- (id)gtm_initWithUnsignedInteger:(NSUInteger)value NS_RETURNS_RETAINED NS_CONSUMES_SELF;
-
-- (CGFloat)gtm_cgFloatValue;
-- (NSInteger)gtm_integerValue;
-- (NSUInteger)gtm_unsignedIntegerValue;
-
-@end
diff --git a/Foundation/GTMNSNumber+64Bit.m b/Foundation/GTMNSNumber+64Bit.m
index c3b1762..79ca42c 100644
--- a/Foundation/GTMNSNumber+64Bit.m
+++ b/Foundation/GTMNSNumber+64Bit.m
@@ -1,98 +1,8 @@
//
-// GTMNSNumber+64Bit.m
+// This file previously included utility methods for creating
+// 64-bit NSNumbers.
//
-// Copyright 2009 Google Inc.
+// Applications should be updated to use NSNumber literals and
+// boxed expressions, as described at
+// http://clang.llvm.org/docs/ObjectiveCLiterals.html
//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy
-// of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-//
-
-#import "GTMNSNumber+64Bit.h"
-
-@implementation NSNumber (GTM64BitAdditions)
-+ (NSNumber *)gtm_numberWithCGFloat:(CGFloat)value {
- return [[[self alloc] gtm_initWithCGFloat:value] autorelease];
-}
-
-+ (NSNumber *)gtm_numberWithInteger:(NSInteger)value {
- return [[[self alloc] gtm_initWithInteger:value] autorelease];
-}
-
-+ (NSNumber *)gtm_numberWithUnsignedInteger:(NSUInteger)value {
- return [[[self alloc] gtm_initWithUnsignedInteger:value] autorelease];
-}
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-
-- (id)gtm_initWithCGFloat:(CGFloat)value {
- CFNumberRef numberRef = CFNumberCreate(NULL, kCFNumberCGFloatType, &value);
- return NSMakeCollectable(numberRef);
-}
-
-- (CGFloat)gtm_cgFloatValue {
- CGFloat value = 0;
- CFNumberGetValue((CFNumberRef)self, kCFNumberCGFloatType, &value);
- return value;
-}
-
-- (id)gtm_initWithInteger:(NSInteger)value {
- return [self initWithInteger:value];
-}
-
-- (NSInteger)gtm_integerValue {
- return [self integerValue];
-}
-
-- (id)gtm_initWithUnsignedInteger:(NSUInteger)value {
- return [self initWithUnsignedInteger:value];
-}
-
-- (NSUInteger)gtm_unsignedIntegerValue {
- return [self unsignedIntegerValue];
-}
-
-#else // MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-
-- (id)gtm_initWithCGFloat:(CGFloat)value {
-#if defined(__LP64__) && __LP64__
- return [self initWithDouble:value];
-#else
- return [self initWithFloat:value];
-#endif // defined(__LP64__) && __LP64__
-}
-
-- (CGFloat)gtm_cgFloatValue {
-#if defined(__LP64__) && __LP64__
- return [self doubleValue];
-#else
- return [self floatValue];
-#endif // defined(__LP64__) && __LP64__
-}
-
-- (id)gtm_initWithInteger:(NSInteger)value {
- return [self initWithLong:value];
-}
-
-- (NSInteger)gtm_integerValue {
- return [self longValue];
-}
-
-- (id)gtm_initWithUnsignedInteger:(NSUInteger)value {
- return [self initWithUnsignedLong:value];
-}
-
-- (NSUInteger)gtm_unsignedIntegerValue {
- return [self unsignedLongValue];
-}
-
-#endif // MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-@end
diff --git a/Foundation/GTMNSNumber+64BitTest.m b/Foundation/GTMNSNumber+64BitTest.m
index 5250bc7..b460994 100644
--- a/Foundation/GTMNSNumber+64BitTest.m
+++ b/Foundation/GTMNSNumber+64BitTest.m
@@ -1,56 +1,8 @@
//
-// GTMNSNumber+64BitTest.m
+// This file previously included tests for utility methods
+// for creating 64-bit NSNumbers.
//
-// Copyright 2009 Google Inc.
+// Applications should be updated to use NSNumber literals
+// and boxed expressions, as described at
+// http://clang.llvm.org/docs/ObjectiveCLiterals.html
//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy
-// of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-//
-
-#import "GTMSenTestCase.h"
-#import "GTMNSNumber+64Bit.h"
-
-@interface GTMNSNumber_64BitTest : GTMTestCase
-@end
-
-@implementation GTMNSNumber_64BitTest
-- (void)testCGFloat {
- CGFloat testValue = 0.0;
- NSNumber *testNum = [NSNumber gtm_numberWithCGFloat:testValue];
- STAssertEquals(testValue, [testNum gtm_cgFloatValue], nil);
- testValue = INFINITY;
- testNum = [NSNumber gtm_numberWithCGFloat:testValue];
- STAssertEquals(testValue, [testNum gtm_cgFloatValue], nil);
- testValue = -1.0;
- testNum = [NSNumber gtm_numberWithCGFloat:testValue];
- STAssertEquals(testValue, [testNum gtm_cgFloatValue], nil);
-}
-
-- (void)testInteger {
- NSInteger testValue = 0.0;
- NSNumber *testNum = [NSNumber gtm_numberWithInteger:testValue];
- STAssertEquals(testValue, [testNum gtm_integerValue], nil);
- testValue = -INT_MAX;
- testNum = [NSNumber gtm_numberWithInteger:testValue];
- STAssertEquals(testValue, [testNum gtm_integerValue], nil);
-}
-
-- (void)testUnsignedInteger {
- NSUInteger testValue = 0.0;
- NSNumber *testNum = [NSNumber gtm_numberWithUnsignedInteger:testValue];
- STAssertEquals(testValue, [testNum gtm_unsignedIntegerValue], nil);
- testValue = UINT_MAX;
- testNum = [NSNumber gtm_numberWithUnsignedInteger:testValue];
- STAssertEquals(testValue, [testNum gtm_unsignedIntegerValue], nil);
-}
-
-@end