Merge pull request #275 from JuliaGraphics/yyc/0.6

Fix 0.6 abstract type declaration depwarn
JuliaGraphics · Feb 12, 2017 · 0f3d493 · 0f3d493
2 parents a6ed074 + 8be2f5c
commit 0f3d493
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -2,4 +2,4 @@ julia 0.5
 ColorTypes 0.3.0
 FixedPointNumbers 0.3.0
 Reexport
-Compat 0.9.1
+Compat 0.17.0
diff --git a/src/colormatch.jl b/src/colormatch.jl
@@ -1,11 +1,11 @@
 
-abstract CMF
-abstract CIE1931_CMF <: CMF
-abstract CIE1964_CMF <: CMF
-abstract CIE1931J_CMF <: CMF
-abstract CIE1931JV_CMF <: CMF
-abstract CIE2006_2_CMF <: CMF
-abstract CIE2006_10_CMF <: CMF
+@compat abstract type CMF end
+@compat abstract type CIE1931_CMF <: CMF end
+@compat abstract type CIE1964_CMF <: CMF end
+@compat abstract type CIE1931J_CMF <: CMF end
+@compat abstract type CIE1931JV_CMF <: CMF end
+@compat abstract type CIE2006_2_CMF <: CMF end
+@compat abstract type CIE2006_10_CMF <: CMF end
 
 """
     colormatch(wavelength)

diff --git a/src/differences.jl b/src/differences.jl
@@ -1,6 +1,6 @@
 
 # Define an abstract type to represent color difference metrics
-abstract DifferenceMetric
+@compat abstract type DifferenceMetric end
 
 # TODO?: make the DifferenMetrics parametric, to preserve type-stability