Merge pull request #315 from JuliaOpt/bl/v0.7warn

Remove v0.7 warnings

Author: blegat

src/Utilities/functions.jl

@@ -140,7 +140,7 @@ If `x` (resp. `y`, `z`) is `VariableIndex(1)` (resp. 2, 3).
 The canonical representation of `ScalarAffineFunction([y, x, z, x, z], [2, 1, 3, -2, -3], 5)` is `ScalarAffineFunction([x, y], [-1, 2], 5)`.
 
 """
-function canonical{T}(f::SAF{T})
+function canonical(f::SAF{T}) where T
     σ = sortperm(f.variables)
     outputindex = Int[]
     variables = VI[]
@@ -165,7 +165,7 @@ function canonical{T}(f::SAF{T})
     end
     SAF{T}(variables, coefficients, f.constant)
 end
-function canonical{T}(f::VAF{T})
+function canonical(f::VAF{T}) where T
     σ = sortperm(1:length(f.variables), by = i -> (f.outputindex[i], f.variables[i]))
     outputindex = Int[]
     variables = VI[]

src/Utilities/model.jl

@@ -30,18 +30,18 @@ function _getset(constrs::Vector, ci::CI, i::Int)
     _gets(constrs[i]...)
 end
 
-_modifyconstr{F, S}(ci::CI{F, S}, f::F, s::S, change::F) = (ci, change, s)
-_modifyconstr{F, S}(ci::CI{F, S}, f::F, s::S, change::S) = (ci, f, change)
-_modifyconstr{F, S}(ci::CI{F, S}, f::F, s::S, change::MOI.AbstractFunctionModification) = (ci, modifyfunction(f, change), s)
-function _modifyconstraint!{F, S}(constrs::Vector{C{F, S}}, ci::CI{F}, i::Int, change)
+_modifyconstr(ci::CI{F, S}, f::F, s::S, change::F) where {F, S} = (ci, change, s)
+_modifyconstr(ci::CI{F, S}, f::F, s::S, change::S) where {F, S} = (ci, f, change)
+_modifyconstr(ci::CI{F, S}, f::F, s::S, change::MOI.AbstractFunctionModification) where {F, S} = (ci, modifyfunction(f, change), s)
+function _modifyconstraint!(constrs::Vector{C{F, S}}, ci::CI{F}, i::Int, change) where {F, S}
     constrs[i] = _modifyconstr(constrs[i]..., change)
 end
 
-_getnoc{F, S}(constrs::Vector{C{F, S}}, noc::MOI.NumberOfConstraints{F, S}) = length(constrs)
+_getnoc(constrs::Vector{C{F, S}}, noc::MOI.NumberOfConstraints{F, S}) where {F, S} = length(constrs)
 # Might be called when calling NumberOfConstraint with different coefficient type than the one supported
 _getnoc(constrs::Vector, noc::MOI.NumberOfConstraints) = 0
 
-function _getloc{F, S}(constrs::Vector{C{F, S}})::Vector{Tuple{DataType, DataType}}
+function _getloc(constrs::Vector{C{F, S}})::Vector{Tuple{DataType, DataType}} where {F, S}
     isempty(constrs) ? [] : [(F, S)]
 end
 
@@ -534,7 +534,7 @@ macro model(modelname, ss, sst, vs, vst, sf, sft, vf, vft)
                 field = _field(s)
                 code = quote
                     $code
-                    $funct{F}(model::$c, ci::$T{F, <:$set}, args...) = $funct(model.$field, ci, args...)
+                    $funct(model::$c, ci::$T{F, <:$set}, args...) where F = $funct(model.$field, ci, args...)
                 end
             end
         end

src/Utilities/sets.jl

@@ -16,6 +16,6 @@ const DimensionUpdatableSets = Union{MOI.Reals,
 
 Returns a set with the dimension modified to `newdim`.
 """
-function updatedimension{S<:DimensionUpdatableSets}(::S, newdim)
+function updatedimension(::S, newdim) where S<:DimensionUpdatableSets
     S(newdim)
 end