diff --git a/.travis.yml b/.travis.yml index 6ae994f..a99e810 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ os: - osx julia: - 0.5 + - 0.6 notifications: email: false addons: diff --git a/appveyor.yml b/appveyor.yml index 1abec59..551221a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,8 @@ environment: matrix: - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe" - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe" + - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe" + - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe" branches: only: diff --git a/src/ReadStat.jl b/src/ReadStat.jl index e4fa960..89b0e4b 100644 --- a/src/ReadStat.jl +++ b/src/ReadStat.jl @@ -98,9 +98,11 @@ type ReadStatDataFrame header::Vector{Symbol} types::Vector{DataType} rows::Int - storage_type::DataType + storage_type::Type + + ReadStatDataFrame{T}(::Type{T}) = new(Any[], Symbol[], DataType[], 0, T) end -ReadStatDataFrame(destination_type::DataType) = ReadStatDataFrame(Any[], Symbol[], DataType[], 0, destination_type) + DataFrame(ds::ReadStatDataFrame) = DataFrame(ds.data, ds.header) DataTable(ds::ReadStatDataFrame) = DataTable(ds.data, ds.header)