Merge pull request #57 from wspl/master

sharplet · Jul 28, 2017 · 7e0553a · 7e0553a
2 parents 1867f0a + 974a3b8
commit 7e0553a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/Foundation+Ranges.swift b/Source/Foundation+Ranges.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(Linux)
+#if !swift(>=3.2) && os(Linux)
 typealias NSTextCheckingResult = TextCheckingResult
 #endif
 

diff --git a/Source/MatchResult.swift b/Source/MatchResult.swift
@@ -96,8 +96,8 @@ private final class _MatchResult {
 
   private func utf16Range(from range: NSRange) -> Range<String.UTF16Index>? {
     guard range.location != NSNotFound else { return nil }
-    let start = string.startIndex.advanced(by: range.location)
-    let end = start.advanced(by: range.length)
+    let start = string.index(string.startIndex, offsetBy: range.location)
+    let end = string.index(start, offsetBy: range.length)
     return start..<end
   }