@@ -183,7 +183,7 @@ function size(mx::MxArray)
183183 nd = ndims (mx)
184184 pdims:: Ptr{mwSize} = @mxget_attr (mx_get_dims[], Ptr{mwSize}, mx)
185185 _dims = unsafe_wrap (Array, pdims, (nd,))
186- dims = Array ( Int, nd)
186+ dims = Array { Int} ( nd)
187187 for i = 1 : nd
188188 dims[i] = convert (Int, _dims[i])
189189 end
216216
217217function _dims_to_mwSize (dims:: Tuple{Vararg{Int}} )
218218 ndim = length (dims)
219- _dims = Array ( mwSize, ndim)
219+ _dims = Array { mwSize} ( ndim)
220220 for i = 1 : ndim
221221 _dims[i] = convert (mwSize, dims[i])
222222 end
@@ -382,7 +382,7 @@ mxarray(a::Array) = mxcellarray(a)
382382
383383function _fieldname_array (fieldnames:: String... )
384384 n = length (fieldnames)
385- a = Array ( Ptr{UInt8}, n)
385+ a = Array { Ptr{UInt8}} ( n)
386386 for i = 1 : n
387387 a[i] = unsafe_convert (Ptr{UInt8}, fieldnames[i])
388388 end
@@ -437,7 +437,7 @@ typealias Pairs Union{Pair,NTuple{2}}
437437
438438function mxstruct (pairs:: Pairs... )
439439 nf = length (pairs)
440- fieldnames = Array ( String, nf)
440+ fieldnames = Array { String} ( nf)
441441 for i = 1 : nf
442442 fn = pairs[i][1 ]
443443 fieldnames[i] = string (fn)
@@ -494,17 +494,17 @@ function _jarrayx(fun::String, mx::MxArray, siz::Tuple)
494494 if is_complex (mx)
495495 rdat = unsafe_wrap (Array, real_ptr (mx), siz)
496496 idat = unsafe_wrap (Array, imag_ptr (mx), siz)
497- a = complex (rdat, idat)
497+ a = complex . (rdat, idat)
498498 else
499- a = Array (T, siz)
499+ a = Array {T} ( siz)
500500 if ! isempty (a)
501501 ccall (:memcpy , Ptr{Void}, (Ptr{Void}, Ptr{Void}, UInt), a, data_ptr (mx), length (a)* sizeof (T))
502502 end
503503 end
504504 return a
505505 # unsafe_wrap(Array, data_ptr(mx), siz)
506506 elseif is_cell (mx)
507- a = Array ( Any, siz)
507+ a = Array { Any} ( siz)
508508 for i = 1 : length (a)
509509 a[i] = jvalue (get_cell (mx, i))
510510 end
@@ -546,8 +546,8 @@ function _jsparse{T<:MxRealNum}(ty::Type{T}, mx::MxArray)
546546 jc_a:: Vector{mwIndex} = unsafe_wrap (Array, jc_ptr, (n+ 1 ,))
547547 nnz = jc_a[n+ 1 ]
548548
549- ir = Array ( Int, nnz)
550- jc = Array ( Int, n+ 1 )
549+ ir = Array { Int} ( nnz)
550+ jc = Array { Int} ( n+ 1 )
551551
552552 ir_x = unsafe_wrap (Array, ir_ptr, (nnz,))
553553 for i = 1 : nnz
@@ -582,8 +582,8 @@ function Dict(mx::MxArray)
582582 throw (ArgumentError (" Dict(mx::MxArray) only applies to a single struct" ))
583583 end
584584 nf = mxnfields (mx)
585- fnames = Array ( String, nf)
586- fvals = Array ( Any, nf)
585+ fnames = Array { String} ( nf)
586+ fvals = Array { Any} ( nf)
587587 for i = 1 : nf
588588 fnames[i] = get_fieldname (mx, i)
589589 pv = ccall (mx_get_field_bynum[], Ptr{Void}, (Ptr{Void}, mwIndex, Cint), mx, 0 , i- 1 )
0 commit comments