Skip to content

Commit fba7cac

Browse files
authored
Merge pull request #158 from JuliaOpt/ml/dep06
clear deprecations on 0.6
2 parents 89b972c + 0a7dd53 commit fba7cac

File tree

9 files changed

+12
-9
lines changed

9 files changed

+12
-9
lines changed

REQUIRE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
julia 0.5
2+
Compat 0.18

src/HighLevelInterface/HighLevelInterface.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module HighLevelInterface
2+
using Compat
23

34
using ..SolverInterface
45
using ..MathProgBase

src/HighLevelInterface/linprog.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ type LinprogSolution
55
attrs
66
end
77

8-
typealias InputVector{T<:Union{Real,Char}} Union{Vector{T},Real,Char}
8+
@compat InputVector{T<:Union{Real,Char}} = Union{Vector{T},Real,Char}
99

1010
function expandvec(x,len::Integer)
1111
if isa(x,Vector)

src/HighLevelInterface/mixintprog.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ type MixintprogSolution
66
attrs
77
end
88

9-
typealias SymbolInputVector Union{Vector{Symbol},Symbol}
9+
const SymbolInputVector = Union{Vector{Symbol},Symbol}
1010

1111
function no_mip_solver()
1212
error("""

src/SolverInterface/Conic.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Methods for the Conic interface
22

3-
abstract AbstractConicModel <: AbstractMathProgModel
3+
@compat abstract type AbstractConicModel <: AbstractMathProgModel end
44
export AbstractConicModel
55

66
@define_interface begin

src/SolverInterface/LinearQuadratic.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Methods for the LinearQuadratic interface
22

3-
abstract AbstractLinearQuadraticModel <: AbstractMathProgModel
3+
@compat abstract type AbstractLinearQuadraticModel <: AbstractMathProgModel end
44
export AbstractLinearQuadraticModel
55

66
# writeproblem

src/SolverInterface/Nonlinear.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Methods for the Nonlinear interface
22

3-
abstract AbstractNonlinearModel <: AbstractMathProgModel
3+
@compat abstract type AbstractNonlinearModel <: AbstractMathProgModel end
44
export AbstractNonlinearModel
55

6-
abstract AbstractNLPEvaluator
6+
@compat abstract type AbstractNLPEvaluator end
77
export AbstractNLPEvaluator
88

99
# methods for AbstractNLPEvaluator

src/SolverInterface/SolverInterface.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module SolverInterface
22

3+
using Compat
34
using Base.Meta
45

56
const methods_by_tag = Dict{Symbol,Vector{Symbol}}()
@@ -43,11 +44,11 @@ macro define_interface(args)
4344
return code
4445
end
4546

46-
abstract AbstractMathProgModel
47+
@compat abstract type AbstractMathProgModel end
4748
export AbstractMathProgModel
4849

4950
# immutable type which we dispatch solvers on
50-
abstract AbstractMathProgSolver
51+
@compat abstract type AbstractMathProgSolver end
5152
export AbstractMathProgSolver
5253

5354
# create dummy method to define function so that we can attach methods in other modules

src/SolverInterface/callbacks.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
abstract MathProgCallbackData
1+
@compat abstract type MathProgCallbackData end
22
export MathProgCallbackData
33

44
# callback has signature:

0 commit comments

Comments
 (0)