Merge pull request #16 from yuyichao/0.5-depwarn

Fix depwarn on 0.5 for ByteString
JuliaLang · May 8, 2016 · 70b51d1 · 70b51d1
2 parents e3a9f84 + 3bf31d4
commit 70b51d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/SHA.jl b/src/SHA.jl
@@ -1,4 +1,4 @@
-#isdefined(Base, :__precompile__) && __precompile__()
+isdefined(Base, :__precompile__) && __precompile__()
 
 module SHA
 
@@ -40,12 +40,12 @@ for (f, ctx) in [(:sha1, :SHA1_CTX),
         # Our basic function is to process arrays of bytes
         function $f(data::Array{UInt8,1})
             ctx = $ctx()
-            update!(ctx, data);
+            update!(ctx, data)
             return digest!(ctx)
         end
 
-        # ByteStrings are a pretty handy thing to be able to crunch through
-        $f(str::ByteString) = $f(str.data)
+        # AbstractStrings are a pretty handy thing to be able to crunch through
+        $f(str::AbstractString) = $f(convert(Array{UInt8,1}, str))
 
         # Convenience function for IO devices, allows for things like:
         # open("test.txt") do f

diff --git a/src/sha1.jl b/src/sha1.jl
@@ -90,4 +90,4 @@ function transform!(context::SHA1_CTX)
     context.state[3] += c
     context.state[4] += d
     context.state[5] += e
-end
+end