fix ambiguity

Author: Alexander-Barth

src/datetime.jl

@@ -296,8 +296,8 @@ for CFDateTime in (
         return (_origin_period(dt1) - _origin_period(dt2)) + (dt1.instant - dt2.instant)
     end
 
-    # fast case if the same resolution and time origin is used
-    @eval @inline function -(dt1::$CFDateTime{T, Torigintuple}, dt2::$CFDateTime{T, Torigintuple}) where {T, Torigintuple}
+    # fast case if the same time origin is used
+    @eval @inline function -(dt1::$CFDateTime{T1, Torigintuple}, dt2::$CFDateTime{T2, Torigintuple}) where {T1, T2, Torigintuple}
         return dt1.instant - dt2.instant
     end
 end
@@ -318,8 +318,7 @@ function -(dt1::DateTime, dt2::AbstractCFDateTime)
 end
 
 -(dt::AbstractCFDateTime, Δ::Period) = dt + (-Δ)
--(dt::AbstractCFDateTime, Δ::Dates.CompoundPeriod) = dt + (-Δ)
--(dt::AbstractCFDateTime, Δ) = dt + (-Δ)
+-(dt::AbstractCFDateTime, Δ::Dates.Period) = dt + (-Δ)
 
 function ==(dt1::AbstractCFDateTime, dt2::AbstractCFDateTime)
     return Dates.value(dt1 - dt2) == 0

test/test_operators.jl

@@ -20,19 +20,24 @@ dt = DateTimeNoLeap(1959, 12, 31, 23, 39, 59, 123)
 
 
 # difference between time instances
-@test DateTimeStandard(2000, 01, 02) - DateTimeStandard(2000, 01, 01) == Dates.Day(1)
+@test DateTimeStandard(2000, 1, 2) - DateTimeStandard(2000, 1, 1) == Dates.Day(1)
 
-@test DateTimeStandard(2000, 01, 02) - DateTimeStandard(2000, 01, 01, units = :day) == Dates.Day(1)
+@test DateTimeStandard(2000, 1, 2) - DateTimeStandard(2000, 1, 1, units = :day) == Dates.Day(1)
 
-@test CFTime.units(DateTimeStandard(2000, 01, 01, units = :day, origin = (1970, 1, 1))) == "days since 1970-01-01"
+@test (
+    DateTimeStandard(2000, 1, 2) -
+        DateTimeStandard(2000, 1, 1, origin = (1970, 1, 1))
+) == Dates.Day(1)
+
+@test CFTime.units(DateTimeStandard(2000, 1, 1, units = :day, origin = (1970, 1, 1))) == "days since 1970-01-01"
 
 # check ordering
 
-@test DateTimeStandard(2000, 01, 01) < DateTimeStandard(2000, 01, 02)
-@test DateTimeStandard(2000, 01, 01) ≤ DateTimeStandard(2000, 01, 01)
+@test DateTimeStandard(2000, 1, 1) < DateTimeStandard(2000, 1, 2)
+@test DateTimeStandard(2000, 1, 1) ≤ DateTimeStandard(2000, 1, 1)
 
-@test DateTimeStandard(2000, 01, 03) > DateTimeStandard(2000, 01, 02)
-@test DateTimeStandard(2000, 01, 03) ≥ DateTimeStandard(2000, 01, 01)
+@test DateTimeStandard(2000, 1, 03) > DateTimeStandard(2000, 1, 2)
+@test DateTimeStandard(2000, 1, 03) ≥ DateTimeStandard(2000, 1, 1)
 
 # issue #55