Merge pull request #10 from timward60/master

Update for Swift 2.2.
jkolb · Apr 22, 2016 · 47f5d11 · 47f5d11
2 parents 40cef64 + 236c8b1
commit 47f5d11
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/FieryCrucible/DependencyFactory.swift b/FieryCrucible/DependencyFactory.swift
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 private protocol InstanceContainer : class {
-    typealias InstanceType
+    associatedtype InstanceType
 
     var instance: InstanceType? { get }
 }
@@ -86,11 +86,11 @@ public class DependencyFactory {
 
     public init() { }
 
-    public final func shared<T>(@noescape factory factory: () -> T, name: String = __FUNCTION__, configure: ((T) -> ())? = nil) -> T {
+    public final func shared<T>(@noescape factory factory: () -> T, name: String = #function, configure: ((T) -> ())? = nil) -> T {
         return shared(name, factory: factory(), configure: configure)
     }
 
-    public final func shared<T>(@autoclosure factory: () -> T, name: String = __FUNCTION__, configure: ((T) -> ())? = nil) -> T {
+    public final func shared<T>(@autoclosure factory: () -> T, name: String = #function, configure: ((T) -> ())? = nil) -> T {
         return shared(name, factory: factory, configure: configure)
     }
 
@@ -105,11 +105,11 @@ public class DependencyFactory {
         )
     }
 
-    public final func weakShared<T: AnyObject>(@noescape factory factory: () -> T, name: String = __FUNCTION__, configure: ((T) -> ())? = nil) -> T {
+    public final func weakShared<T: AnyObject>(@noescape factory factory: () -> T, name: String = #function, configure: ((T) -> ())? = nil) -> T {
         return weakShared(name, factory: factory(), configure: configure)
     }
 
-    public final func weakShared<T: AnyObject>(@autoclosure factory: () -> T, name: String = __FUNCTION__, configure: ((T) -> ())? = nil) -> T {
+    public final func weakShared<T: AnyObject>(@autoclosure factory: () -> T, name: String = #function, configure: ((T) -> ())? = nil) -> T {
         return weakShared(name, factory: factory, configure: configure)
     }
 
@@ -124,11 +124,11 @@ public class DependencyFactory {
         )
     }
 
-    public final func unshared<T>(@noescape factory factory: () -> T, name: String = __FUNCTION__, configure: ((T) -> ())? = nil) -> T {
+    public final func unshared<T>(@noescape factory factory: () -> T, name: String = #function, configure: ((T) -> ())? = nil) -> T {
         return unshared(name, factory: factory(), configure: configure)
     }
 
-    public final func unshared<T>(@autoclosure factory: () -> T, name: String = __FUNCTION__, configure: ((T) -> ())? = nil) -> T {
+    public final func unshared<T>(@autoclosure factory: () -> T, name: String = #function, configure: ((T) -> ())? = nil) -> T {
         return unshared(name, factory: factory, configure: configure)
     }
 
@@ -144,11 +144,11 @@ public class DependencyFactory {
         )
     }
 
-    public final func scoped<T>(@noescape factory factory: () -> T, name: String = __FUNCTION__, configure: ((T) -> ())? = nil) -> T {
+    public final func scoped<T>(@noescape factory factory: () -> T, name: String = #function, configure: ((T) -> ())? = nil) -> T {
         return scoped(name, factory: factory(), configure: configure)
     }
 
-    public final func scoped<T>(@autoclosure factory: () -> T, name: String = __FUNCTION__, configure: ((T) -> ())? = nil) -> T {
+    public final func scoped<T>(@autoclosure factory: () -> T, name: String = #function, configure: ((T) -> ())? = nil) -> T {
         return scoped(name, factory: factory, configure: configure)
     }
 
@@ -194,13 +194,13 @@ public class DependencyFactory {
             let delayedConfigures = configureStack
             configureStack.removeAll(keepCapacity: true)
 
-            ++requestDepth
+            requestDepth += 1
 
             for delayedConfigure in delayedConfigures {
                 delayedConfigure()
             }
 
-            --requestDepth
+            requestDepth -= 1
 
             if requestDepth == 0 {
                 // This marks the end of an entire instance request tree. Must do final cleanup here.