From 9d8cbe7547d499fefb69bf42e975a2f7e8e7fca4 Mon Sep 17 00:00:00 2001 From: Jesse Ezell Date: Fri, 4 Apr 2014 00:45:41 -0700 Subject: use cast_ptr instead of ptr for travis go tip build --- merge.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'merge.go') diff --git a/merge.go b/merge.go index 9c51a85..48a28b0 100644 --- a/merge.go +++ b/merge.go @@ -182,7 +182,7 @@ func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options *MergeOp idx := &Index{} - ret := C.git_merge_commits(&idx.ptr, r.ptr, ours.ptr, theirs.ptr, copts) + ret := C.git_merge_commits(&idx.ptr, r.ptr, ours.cast_ptr, theirs.cast_ptr, copts) if ret < 0 { return nil, MakeGitError(ret) } @@ -198,7 +198,7 @@ func (r *Repository) MergeTrees(ancestor *Tree, ours *Tree, theirs *Tree, option idx := &Index{} - ret := C.git_merge_trees(&idx.ptr, r.ptr, ancestor.ptr, ours.ptr, theirs.ptr, copts) + ret := C.git_merge_trees(&idx.ptr, r.ptr, ancestor.cast_ptr, ours.cast_ptr, theirs.cast_ptr, copts) if ret < 0 { return nil, MakeGitError(ret) } -- cgit v1.2.3