Add 0.6 support

.travis.yml

@@ -4,7 +4,8 @@ os:
   - linux
   - osx
 julia:
-  - release
+  - 0.5
+  - 0.6
   - nightly
 notifications:
   email: false

REQUIRE

@@ -1,3 +1,4 @@
 julia 0.5
+Compat 0.25.2
 DataStructures 0.5.3
 StaticArrays 0.3.0

appveyor.yml

@@ -1,9 +1,11 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
+  - JULIAVERSION: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
+  - JULIAVERSION: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIAVERSION: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+  - JULIAVERSION: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - JULIAVERSION: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
+  - JULIAVERSION: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 
 branches:
   only:
@@ -19,7 +21,7 @@ notifications:
 install:
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
-        $("http://s3.amazonaws.com/"+$env:JULIAVERSION),
+        $env:JULIAVERSION
         "C:\projects\julia-binary.exe")
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia

src/NIntegration.jl

@@ -4,6 +4,7 @@ module NIntegration
 
 
 ### Dependencies
+using Compat
 using DataStructures
 using StaticArrays
 

src/types.jl

@@ -1,12 +1,21 @@
-type Box{T}
-    x::T
+if VERSION < v"0.6.0-dev.2618"
+    type Box{T}
+        x::T
 
-    Box() = new()
-    Box(x) = new(x)
+        Box() = new()
+        Box(x) = new(x)
+    end
+else
+    @compat mutable struct Box{T}
+        x::T
+
+        Box{T}() where {T} = new()
+        Box{T}(x::T) where {T} = new(x)
+    end
 end
 (::Type{Box}){T}(x::T) = Box{T}(x)
 
-immutable Region{N,T<:AbstractFloat,R}
+@compat struct Region{N,T<:AbstractFloat,R}
     x::MVector{N,T} # center
     h::MVector{N,T} # half-width
     I::Box{R}
@@ -24,7 +33,7 @@ Base.isequal{N}(r₁::Region{N}, r₂::Region{N}) = isequal(r₁.E.x, r₂.E.x)
 
 Base.show(io::IO, r::Region) = print(io, '(', r.x, ", ", r.h, ')')
 
-immutable Regions{R<:Region}
+@compat struct Regions{R<:Region}
     v::Vector{R}
 end