← Back to branch summary

~dobey/go-unityscopes/fix-typo

~dobey/go-unityscopes/fix-typo

« back to all changes in this revision

Viewing changes to unityscope.go

Committer: Rodney Dawes
Author(s): James Henstridge
Date: 2016-10-03 20:26:39 UTC
mfrom: (73.1.11 v2)
Revision ID: rodney.dawes@canonical.com-20161003202639-6qnaojpfps0vk11q

Update code to work with Go 1.6's new cgo pointer handling rules.

files added:
helpers.go

files modified:
activationresponse.cpp

activationresponse.go

childscope.cpp

childscope.go

column_layout.cpp

column_layout.go

department.cpp

department.go

helpers.cpp

helpers.h

metadata.cpp

metadata.go

query.cpp

query.go

reply.cpp

reply.go

result.cpp

result.go

shim.cpp

shim.h

unityscope.go

Show diffs side-by-side

added added

removed removed

254

254

scopeId := base[:len(base)-len(".ini")]

255

255

256

256

var errorString *C.char

257

C.run_scope(unsafe.Pointer(&scopeId), unsafe.Pointer(runtimeConfig), unsafe.Pointer(scopeConfig), unsafe.Pointer(&scope), &errorString)

257

C.run_scope(strData(scopeId), strData(*runtimeConfig), strData(*scopeConfig), unsafe.Pointer(&scope), &errorString)

258

258

return checkError(errorString)

259

259

}

260

260

Older »