Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/mxarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@ function unsafe_convert(::Type{Ptr{Void}}, mx::MxArray)
end
# functions to create mxArray from Julia values/arrays

typealias MxRealNum Union{Float64,Float32,Int32,UInt32,Int64,UInt64,Int16,UInt16,Int8,UInt8,Bool}
typealias MxComplexNum Union{Complex64, Complex128}
typealias MxNum Union{MxRealNum, MxComplexNum}
const MxRealNum = Union{Float64, Float32, Int32, UInt32, Int64, UInt64, Int16, UInt16, Int8, UInt8, Bool}
const MxComplexNum = Union{Complex64, Complex128}
const MxNum = Union{MxRealNum, MxComplexNum}

###########################################################
#
# MATLAB types
#
###########################################################

typealias mwSize UInt
typealias mwIndex Int
typealias mxClassID Cint
typealias mxComplexity Cint
const mwSize = UInt
const mwIndex = Int
const mxClassID = Cint
const mxComplexity = Cint

const mxUNKNOWN_CLASS = convert(mxClassID, 0)
const mxCELL_CLASS = convert(mxClassID, 1)
Expand Down Expand Up @@ -432,7 +432,7 @@ function get_fieldname(mx::MxArray, i::Integer)
unsafe_string(p)
end

typealias Pairs Union{Pair,NTuple{2}}
const Pairs = Union{Pair, NTuple{2}}

function mxstruct(pairs::Pairs...)
nf = length(pairs)
Expand Down