Merge pull request swiftlang#70 from dgrove-oss/fix-overlay-for-20160412a-master

MadCoder · MadCoder · commit 1fa1513469b3 · 2016-04-13T10:25:43.000-07:00
change prototype of functions returning nil to use ImplictlyUnwrapped…
diff --git a/src/swift/Dispatch.swift b/src/swift/Dispatch.swift
@@ -41,13 +41,13 @@ public var DISPATCH_IO_STRICT_INTERVAL: dispatch_io_interval_flags_t {
   return 1
 }
 
-public var DISPATCH_QUEUE_SERIAL: dispatch_queue_attr_t {
+public var DISPATCH_QUEUE_SERIAL: dispatch_queue_attr_t! {
   return nil
 }
-public var DISPATCH_CURRENT_QUEUE_LABEL: dispatch_queue_t {
+public var DISPATCH_CURRENT_QUEUE_LABEL: dispatch_queue_t! {
   return nil
 }
-public var DISPATCH_TARGET_QUEUE_DEFAULT: dispatch_queue_t {
+public var DISPATCH_TARGET_QUEUE_DEFAULT: dispatch_queue_t! {
   return nil
 }
 public var DISPATCH_QUEUE_PRIORITY_HIGH: dispatch_queue_priority_t {

Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,13 @@ public var DISPATCH_IO_STRICT_INTERVAL: dispatch_io_interval_flags_t {`
`41`	`41`	`return 1`
`42`	`42`	`}`
`43`	`43`
`44`		`-public var DISPATCH_QUEUE_SERIAL: dispatch_queue_attr_t {`
	`44`	`+public var DISPATCH_QUEUE_SERIAL: dispatch_queue_attr_t! {`
`45`	`45`	`return nil`
`46`	`46`	`}`
`47`		`-public var DISPATCH_CURRENT_QUEUE_LABEL: dispatch_queue_t {`
	`47`	`+public var DISPATCH_CURRENT_QUEUE_LABEL: dispatch_queue_t! {`
`48`	`48`	`return nil`
`49`	`49`	`}`
`50`		`-public var DISPATCH_TARGET_QUEUE_DEFAULT: dispatch_queue_t {`
	`50`	`+public var DISPATCH_TARGET_QUEUE_DEFAULT: dispatch_queue_t! {`
`51`	`51`	`return nil`
`52`	`52`	`}`
`53`	`53`	`public var DISPATCH_QUEUE_PRIORITY_HIGH: dispatch_queue_priority_t {`