Merge pull request #49 from JuliaOpt/cb/fix07

Fixes for julia 0.7
JuliaOpt · Jul 16, 2018 · aca66cf · aca66cf
2 parents 242ef3a + 48945da
commit aca66cf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ os:
   - osx
 julia:
   - 0.6
+  - 0.7
   - nightly
 env:
   matrix:

diff --git a/REQUIRE b/REQUIRE
@@ -1,4 +1,4 @@
 julia 0.6
 GLPK 0.2.8
 MathProgBase 0.5 0.8
-Compat 0.17.0
+Compat 0.66
diff --git a/src/GLPKInterfaceBase.jl b/src/GLPKInterfaceBase.jl
@@ -44,7 +44,7 @@ function MPB.loadproblem!(lpm::GLPKMathProgModel, A::AbstractMatrix, collb, colu
     checksize(rowub, m, "rowub")
     checksize(obj, n, "obj")
 
-    (ia, ja, ar) = findnz(A)
+    (ia, ja, ar) = findnz(sparse(A))
 
     GLPK.erase_prob(lp)
 

diff --git a/src/GLPKInterfaceMIP.jl b/src/GLPKInterfaceMIP.jl
@@ -160,7 +160,7 @@ function MPB.LinearQuadraticModel(s::GLPKSolverMIP)
         lpm.param.presolve = GLPK.ON
     end
 
-    lpm.param.cb_func = cfunction(_internal_callback, Cvoid, Tuple{Ptr{Cvoid}, Ptr{Cvoid}})
+    lpm.param.cb_func = @cfunction(_internal_callback, Cvoid, (Ptr{Cvoid}, Ptr{Cvoid}))
     lpm.param.cb_info = pointer_from_objref(lpm.cbdata)
 
     for (k,v) in s.opts