Skip to content

Update for Unsafe(Mutable)Pointer changes. #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DougGregor merged 1 commit into from
Jul 30, 2016
Merged

Update for Unsafe(Mutable)Pointer changes. #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/swift/Data.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@ public struct DispatchData : RandomAccessCollection {
///
/// - parameter buffer: The buffer of bytes to append. The size is calculated from `SourceType` and `buffer.count`.
public mutating func append<SourceType>(_ buffer : UnsafeBufferPointer<SourceType>) {
self.append(UnsafePointer(buffer.baseAddress!), count: buffer.count * sizeof(SourceType.self))
let count = buffer.count * sizeof(SourceType.self)
buffer.baseAddress?.withMemoryRebound(to: UInt8.self, capacity: count) {
self.append($0, count: count)
}
}

private func _copyBytesHelper(to pointer: UnsafeMutablePointer<UInt8>, from range: CountableRange<Index>) {
Expand Down Expand Up @@ -176,8 +179,11 @@ public struct DispatchData : RandomAccessCollection {

guard !copyRange.isEmpty else { return 0 }

let pointer : UnsafeMutablePointer<UInt8> = UnsafeMutablePointer<UInt8>(buffer.baseAddress!)
_copyBytesHelper(to: pointer, from: copyRange)
let bufferCapacity = buffer.count * sizeof(DestinationType.self)
buffer.baseAddress?.withMemoryRebound(to: UInt8.self, capacity: bufferCapacity) {

_copyBytesHelper(to: $0, from: copyRange)
}
return copyRange.count
}

Expand Down