Fixes for hashing changes (JuliaLang/julia#6624)

JuliaData · May 11, 2014 · 3cbe03f · 3cbe03f · simonster · May 11, 2014
1 parent b555ea8
commit 3cbe03f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/dataframe/dataframe.jl b/src/dataframe/dataframe.jl
@@ -996,7 +996,7 @@ end
 function Base.hash(adf::AbstractDataFrame)
     h = hash(size(adf)) + 1
     for i in 1:size(adf, 2)
-        h = bitmix(h, int(hash(adf[i])))
+        h = hash(adf[i], h)
     end
     return uint(h)
 end

diff --git a/src/other/index.jl b/src/other/index.jl
@@ -26,6 +26,7 @@ Base.names(x::Index) = copy(x.names)
 Base.copy(x::Index) = Index(copy(x.lookup), copy(x.names))
 Base.deepcopy(x::Index) = Index(deepcopy(x.lookup), deepcopy(x.names))
 Base.isequal(x::Index, y::Index) = isequal(x.lookup, y.lookup) && isequal(x.names, y.names)
+Base.(:(==))(x::Index, y::Index) = isequal(x, y)
 
 function names!(x::Index, nm::Vector{Symbol})
     if length(nm) != length(x)