You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/04/23 20:57:18 UTC
[5/9] git commit: CB-6212 iOS: fix warnings compiled under arm64
64-bit
CB-6212 iOS: fix warnings compiled under arm64 64-bit
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/commit/d1b5e5bd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/tree/d1b5e5bd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/diff/d1b5e5bd
Branch: refs/heads/master
Commit: d1b5e5bdebc954e149feecd745bdf9e4d5e2a668
Parents: 6f3cbab
Author: James Jong <wj...@gmail.com>
Authored: Thu Mar 13 10:01:21 2014 -0400
Committer: James Jong <wj...@gmail.com>
Committed: Thu Mar 13 10:01:21 2014 -0400
----------------------------------------------------------------------
src/ios/CDVGlobalization.m | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/d1b5e5bd/src/ios/CDVGlobalization.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVGlobalization.m b/src/ios/CDVGlobalization.m
index abeb529..8a07c8e 100644
--- a/src/ios/CDVGlobalization.m
+++ b/src/ios/CDVGlobalization.m
@@ -276,13 +276,13 @@
// put the various elements of the date and time into a dictionary
if (comps != nil) {
NSArray* keys = [NSArray arrayWithObjects:@"year", @"month", @"day", @"hour", @"minute", @"second", @"millisecond", nil];
- NSArray* values = [NSArray arrayWithObjects:[NSNumber numberWithInt:[comps year]],
- [NSNumber numberWithInt:[comps month] - 1],
- [NSNumber numberWithInt:[comps day]],
- [NSNumber numberWithInt:[comps hour]],
- [NSNumber numberWithInt:[comps minute]],
- [NSNumber numberWithInt:[comps second]],
- [NSNumber numberWithInt:0], /* iOS does not provide milliseconds */
+ NSArray* values = [NSArray arrayWithObjects:[NSNumber numberWithInteger:[comps year]],
+ [NSNumber numberWithInteger:[comps month] - 1],
+ [NSNumber numberWithInteger:[comps day]],
+ [NSNumber numberWithInteger:[comps hour]],
+ [NSNumber numberWithInteger:[comps minute]],
+ [NSNumber numberWithInteger:[comps second]],
+ [NSNumber numberWithInteger:0], /* iOS does not provide milliseconds */
nil];
NSDictionary* dictionary = [NSDictionary dictionaryWithObjects:values forKeys:keys];
@@ -535,7 +535,7 @@
NSCalendar* calendar = [NSCalendar autoupdatingCurrentCalendar];
- NSNumber* day = [NSNumber numberWithInt:[calendar firstWeekday]];
+ NSNumber* day = [NSNumber numberWithInteger:[calendar firstWeekday]];
if (day) {
NSDictionary* dictionary = [NSDictionary dictionaryWithObject:day forKey:@"value"];