Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

change ::ByteString to ::String in a few places now that bytestring i…

…s called automatically (#5677)
  • Loading branch information...
commit b2c4de69edce97aa9d08a7e9ccf588183ee9452e 1 parent 638572d
@stevengj stevengj authored
Showing with 7 additions and 7 deletions.
  1. +4 −4 base/libc.jl
  2. +2 −2 base/loading.jl
  3. +1 −1  base/util.jl
View
8 base/libc.jl
@@ -34,8 +34,8 @@ type TmStruct
end
strftime(t) = strftime("%c", t)
-strftime(fmt::ByteString, t::Real) = strftime(fmt, TmStruct(t))
-function strftime(fmt::ByteString, tm::TmStruct)
+strftime(fmt::String, t::Real) = strftime(fmt, TmStruct(t))
+function strftime(fmt::String, tm::TmStruct)
timestr = Array(Uint8, 128)
n = ccall(:strftime, Int, (Ptr{Uint8}, Int, Ptr{Uint8}, Ptr{Void}),
timestr, length(timestr), fmt, &tm)
@@ -45,8 +45,8 @@ function strftime(fmt::ByteString, tm::TmStruct)
bytestring(convert(Ptr{Uint8},timestr))
end
-strptime(timestr::ByteString) = strptime("%c", timestr)
-function strptime(fmt::ByteString, timestr::ByteString)
+strptime(timestr::String) = strptime("%c", timestr)
+function strptime(fmt::String, timestr::String)
tm = TmStruct()
r = ccall(:strptime, Ptr{Uint8}, (Ptr{Uint8}, Ptr{Uint8}, Ptr{Void}),
timestr, fmt, &tm)
View
4 base/loading.jl
@@ -86,10 +86,10 @@ end
# remote/parallel load
-include_string(txt::ByteString, fname::ByteString) =
+include_string(txt::String, fname::String) =
ccall(:jl_load_file_string, Any, (Ptr{Uint8},Ptr{Uint8}), txt, fname)
-include_string(txt::ByteString) = include_string(txt, "string")
+include_string(txt::String) = include_string(txt, "string")
function source_path(default::Union(String,Nothing)="")
t = current_task()
View
2  base/util.jl
@@ -249,7 +249,7 @@ end
end
@windows_only begin
- function clipboard(x::ByteString)
+ function clipboard(x::String)
ccall((:OpenClipboard, "user32"), stdcall, Bool, (Ptr{Void},), C_NULL)
ccall((:EmptyClipboard, "user32"), stdcall, Bool, ())
p = ccall((:GlobalAlloc, "kernel32"), stdcall, Ptr{Void}, (Uint16,Int32), 2, length(x)+1)
Please sign in to comment.
Something went wrong with that request. Please try again.