Fix hcat ambiguity errors on Julia 0.6 (#20)

JuliaData · Feb 24, 2017 · 9902e6e · 9902e6e
1 parent 008ee1d
commit 9902e6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/abstractdatatable/abstractdatatable.jl b/src/abstractdatatable/abstractdatatable.jl
@@ -704,8 +704,10 @@ without(dt::AbstractDataTable, c::Any) = without(dt, index(dt)[c])
 
 # catch-all to cover cases where indexing returns a DataTable and copy doesn't
 Base.hcat(dt::AbstractDataTable, x) = hcat!(dt[:, :], x)
+Base.hcat(dt1::AbstractDataTable, dt2::AbstractDataTable) = hcat!(dt[:, :], dt2)
 
 Base.hcat(dt::AbstractDataTable, x, y...) = hcat!(hcat(dt, x), y...)
+Base.hcat(dt1::AbstractDataTable, dt2::AbstractDataTable, dtn::AbstractDataTable...) = hcat!(hcat(dt1, dt2), dtn...)
 
 # vcat only accepts DataTables. Finds union of columns, maintaining order
 # of first dt. Missing data become null values.

diff --git a/src/datatable/datatable.jl b/src/datatable/datatable.jl
@@ -766,6 +766,8 @@ hcat!(a::DataTable, b, c...) = hcat!(hcat!(a, b), c...)
 
 # hcat
 Base.hcat(dt::DataTable, x) = hcat!(copy(dt), x)
+Base.hcat(dt1::DataTable, dt2::AbstractDataTable) = hcat!(copy(dt1), dt2)
+Base.hcat(dt1::DataTable, dt2::AbstractDataTable, dtn::AbstractDataTable...) = hcat!(hcat(dt1, dt2), dtn...)
 
 ##############################################################################
 ##