Merge pull request JuliaLang#8686 from StephenVavasis/patch-11

Generalize convert for dict
jiahao · Oct 15, 2014 · b1db9ab · b1db9ab
2 parents 63ecbcb + 5c4e222
commit b1db9ab
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/base/dict.jl b/base/dict.jl
@@ -366,7 +366,7 @@ dict_with_eltype(kv, t) = Dict{Any,Any}(kv)
 similar{K,V}(d::Dict{K,V}) = Dict{K,V}()
 
 # conversion between Dict types
-function convert{K,V}(::Type{Dict{K,V}},d::Dict)
+function convert{K,V}(::Type{Dict{K,V}},d::Associative)
  h = Dict{K,V}()
  for (k,v) in d
  ck = convert(K,k)