Merge pull request #26 from davidanthoff/fix-0.6-bug

Fix 0.6 bug and julia 0.6 CI testing
queryverse · Jun 9, 2017 · dd32c71 · dd32c71
2 parents 20d7f83 + f636fd7
commit dd32c71
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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)