avoid ntuple deprecation on 0.4

JuliaGeometry · Aug 23, 2015 · 0fbc44f · 0fbc44f
1 parent 97d254b
commit 0fbc44f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/generate_arrays.jl b/src/generate_arrays.jl
@@ -283,8 +283,14 @@ function generate_arrays(maxSz::Integer)
         @eval $TypT(a::T) = $Typ($ColTyp(a))
 
         # construct or convert from other matrix types
-        @eval $Typ(a::AbstractMatrix) = $Typ(ntuple($cSz, c->
-            $ColTyp(ntuple($rSz, r-> a[r,c])...))...)
+        # accomidate ntuple syntax change on 0.4
+        if VERSION < v"0.4-"
+            @eval $Typ(a::AbstractMatrix) = $Typ(ntuple($cSz, c->
+                $ColTyp(ntuple($rSz, r-> a[r,c])...))...)
+        else
+            @eval $Typ(a::AbstractMatrix) = $Typ(ntuple(c->
+                $ColTyp(ntuple(r-> a[r,c], $rSz)...), $cSz)...)
+        end
         @eval convert{T}(::Type{$TypT}, x::AbstractMatrix) = $Typ(x)
 
         # convert to Array