From 57fff72cda831e9266175fa73751f1ec5f37c997 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Fri, 20 Jan 2017 12:38:15 -0500 Subject: [PATCH] Adjust VERSION condition to avoid using release branch versions --- src/moments.jl | 4 ++-- src/weights.jl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/moments.jl b/src/moments.jl index d9af5a490..f18b1fd02 100644 --- a/src/moments.jl +++ b/src/moments.jl @@ -63,14 +63,14 @@ function var!(R::AbstractArray, A::RealArray, wv::WeightVec, dim::Int; mean=noth end Base.varm(A::RealArray, wv::WeightVec, M::RealArray, dim::Int) = - @static if VERSION < v"0.5.1-pre+19" + @static if VERSION < v"0.6.0-dev.1121" Base.varm!(similar(A, Float64, Base.reduced_dims(size(A), dim)), A, wv, M, dim) else Base.varm!(similar(A, Float64, Base.reduced_indices(indices(A), dim)), A, wv, M, dim) end Base.var(A::RealArray, wv::WeightVec, dim::Int; mean=nothing) = - @static if VERSION < v"0.5.1-pre+19" + @static if VERSION < v"0.6.0-dev.1121" var!(similar(A, Float64, Base.reduced_dims(size(A), dim)), A, wv, dim; mean=mean) else var!(similar(A, Float64, Base.reduced_indices(indices(A), dim)), A, wv, dim; mean=mean) diff --git a/src/weights.jl b/src/weights.jl index 9a7e0bc22..196a6cd37 100644 --- a/src/weights.jl +++ b/src/weights.jl @@ -237,7 +237,7 @@ end function wsum{T<:Number,W<:Real}(A::AbstractArray{T}, w::AbstractVector{W}, dim::Int) length(w) == size(A,dim) || throw(DimensionMismatch("Inconsistent array dimension.")) - @static if VERSION < v"0.5.1-pre+19" + @static if VERSION < v"0.6.0-dev.1121" _wsum!(similar(A, wsumtype(T,W), Base.reduced_dims(size(A), dim)), A, w, dim, true) else _wsum!(similar(A, wsumtype(T,W), Base.reduced_indices(indices(A), dim)), A, w, dim, true) @@ -273,7 +273,7 @@ wmeantype{T,W}(::Type{T}, ::Type{W}) = typeof((zero(T)*zero(W) + zero(T)*zero(W) wmeantype{T<:BlasReal}(::Type{T}, ::Type{T}) = T Base.mean{T<:Number,W<:Real}(A::AbstractArray{T}, w::WeightVec{W}, dim::Int) = - @static if VERSION < v"0.5.1-pre+19" + @static if VERSION < v"0.6.0-dev.1121" mean!(similar(A, wmeantype(T, W), Base.reduced_dims(size(A), dim)), A, w, dim) else mean!(similar(A, wmeantype(T, W), Base.reduced_indices(indices(A), dim)), A, w, dim)