Fix rebase breakage.

This commit is contained in:
Matthew Chen 2018-10-02 14:57:00 -04:00
parent 1b1312c455
commit 95387dd220
3 changed files with 13 additions and 3 deletions

View file

@ -4,7 +4,8 @@
import Foundation
class OWS111UDAttributesMigration: OWSDatabaseMigration {
@objc
public class OWS111UDAttributesMigration: OWSDatabaseMigration {
// MARK: - Singletons

View file

@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
[[OWS106EnsureProfileComplete alloc] initWithPrimaryStorage:primaryStorage],
[[OWS107LegacySounds alloc] initWithPrimaryStorage:primaryStorage],
[[OWS108CallLoggingPreference alloc] initWithPrimaryStorage:primaryStorage],
[[OWS109OutgoingMessageState alloc] initWithPrimaryStorage:primaryStorage]
[[OWS109OutgoingMessageState alloc] initWithPrimaryStorage:primaryStorage],
[[OWS111UDAttributesMigration alloc] initWithPrimaryStorage:primaryStorage],
];
}

View file

@ -4,7 +4,16 @@
import Foundation
public func BenchAsync(title: String, block: (() -> Void) -> Void) {
/// Benchmark async code by calling the passed in block parameter when the work
/// is done.
///
/// BenchAsync(title: "my benchmark") { completeBenchmark in
/// foo {
/// completeBenchmark()
/// fooCompletion()
/// }
/// }
public func BenchAsync(title: String, block: (@escaping () -> Void) -> Void) {
let startTime = CFAbsoluteTimeGetCurrent()
block {