Merge pull request #191 from JuliaStats/anj/05

A few extra adjustments to 0.5.
JuliaStats · May 31, 2016 · 2642f6c · 2642f6c
2 parents faae09d + 9dc4030
commit 2642f6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/reducedim.jl b/src/reducedim.jl
@@ -355,7 +355,7 @@ immutable MapReduceDim2ArgHelperFun{F,T}
     f::F
     val::T
 end
-Base.call(f::MapReduceDim2ArgHelperFun, x) = f.f(x, f.val)
+@compat (f::MapReduceDim2ArgHelperFun)(x) = f.f(x, f.val)
 
 # A version of _mapreducedim! that accepts an array S of the same size
 # as R, the elements of which are passed as a second argument to f.
@@ -494,7 +494,7 @@ end
 end
 
 immutable Abs2MinusFun end
-Base.call(f::Abs2MinusFun, x, m) = abs2(x - m)
+@compat (::Abs2MinusFun)(x, m) = abs2(x - m)
 
 function Base.varm!(R::AbstractArray, A::DataArray, m::AbstractArray; corrected::Bool=true,
                     skipna::Bool=false, init::Bool=true)

diff --git a/test/data.jl b/test/data.jl
@@ -60,9 +60,9 @@ module TestData
             "[one, two, NA]"
 
     #test_group("PooledDataVector utf8 support")
-    pdvpp = PooledDataArray([utf8("hello")], [false])
+    pdvpp = PooledDataArray([String("hello")], [false])
     @assert isa(pdvpp[1], String)
-    pdvpp = PooledDataArray([utf8("hello")])
+    pdvpp = PooledDataArray([String("hello")])
     @assert isa(pdvpp[1], String)
 
     #test_group("DataVector access")