Skip to content

Commit

Permalink
Undo tempory fix due to infinite inference recursion.
Browse files Browse the repository at this point in the history
  • Loading branch information
kmsquire committed Mar 20, 2013
1 parent 5c85239 commit ef29d2e
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/dataarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ DataArray{N}(t::Type, dims::NTuple{N,Int}) = DataArray(Array(t, dims...),
trues(dims...))

# Wrap a scalar in a DataArray w/ repetition
# function DataArray(val::Any, dims::Integer...)
# vals = Array(typeof(val), dims...)
# for i in 1:length(vals)
# vals[i] = val
# end
# DataArray(vals, falses(dims...))
# end
function DataArray(val::Any, dims::Integer...)
vals = Array(typeof(val), dims...)
for i in 1:length(vals)
vals[i] = val
end
DataArray(vals, falses(dims...))
end

# Wrap a scalar in a DataArray w/o repetition
DataArray(val::Any) = DataArray([val], falses(1))
Expand Down

0 comments on commit ef29d2e

Please sign in to comment.