Merge pull request #56 from Pluto-tv/master

Xcode 7.3 optional support
isair · Mar 25, 2016 · db1c9a2 · db1c9a2
2 parents 33006f0 + 9811b10
commit db1c9a2
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/JSONHelper/JSONHelper.swift b/JSONHelper/JSONHelper.swift
@@ -63,12 +63,6 @@ public func <-- <T>(inout property: T?, value: AnyObject?) -> T? {
     } else {
       // Convert by processing the value first.
       switch property {
-      case is Int?:
-        if unwrappedValue is String {
-          if let intValue = Int("\(unwrappedValue)") {
-            newValue = intValue as? T
-          }
-        }
       case is NSURL?:
         newValue = NSURL(string: "\(unwrappedValue)") as? T
       case is NSDate?:
@@ -79,6 +73,12 @@ public func <-- <T>(inout property: T?, value: AnyObject?) -> T? {
         } else if let timestamp = unwrappedValue as? NSNumber {
           newValue = NSDate(timeIntervalSince1970: timestamp.doubleValue) as? T
         }
+      case is Int?:
+        if unwrappedValue is String {
+          if let intValue = Int("\(unwrappedValue)") {
+            newValue = intValue as? T
+          }
+        }
       default:
         break
       }