Skip to content

Commit dd32c71

Browse files
authored
Merge pull request #26 from davidanthoff/fix-0.6-bug
Fix 0.6 bug and julia 0.6 CI testing
2 parents 20d7f83 + f636fd7 commit dd32c71

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ os:
44
- osx
55
julia:
66
- 0.5
7+
- 0.6
78
notifications:
89
email: false
910
addons:

appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ environment:
22
matrix:
33
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
44
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
5+
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
6+
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
57

68
branches:
79
only:

src/ReadStat.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,11 @@ type ReadStatDataFrame
9898
header::Vector{Symbol}
9999
types::Vector{DataType}
100100
rows::Int
101-
storage_type::DataType
101+
storage_type::Type
102+
103+
ReadStatDataFrame{T}(::Type{T}) = new(Any[], Symbol[], DataType[], 0, T)
102104
end
103-
ReadStatDataFrame(destination_type::DataType) = ReadStatDataFrame(Any[], Symbol[], DataType[], 0, destination_type)
105+
104106
DataFrame(ds::ReadStatDataFrame) = DataFrame(ds.data, ds.header)
105107
DataTable(ds::ReadStatDataFrame) = DataTable(ds.data, ds.header)
106108

0 commit comments

Comments
 (0)