Skip to content

Commit 9f3aa6b

Browse files
authored
Merge pull request #27 from FugroRoames/julia-0.6-fixes
Julia 0.6 fixes
2 parents 62ba22e + 2f355b4 commit 9f3aa6b

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

REQUIRE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
julia 0.5
2+
Compat 0.17.0
23
StaticArrays
34
Rotations 0.3.0

src/CoordinateTransformations.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ __precompile__()
22

33
module CoordinateTransformations
44

5+
using Compat
56
using StaticArrays
67

8+
import Compat.∘
9+
710
using Rotations
811
export RotMatrix, Quat, SpQuat, AngleAxis, RodriguesVec,
912
RotX, RotY, RotZ,

src/affine.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
abstract AbstractAffineMap <: Transformation
1+
@compat abstract type AbstractAffineMap <: Transformation end
22

33
"""
44
Translation(v) <: AbstractAffineMap

src/core.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ transformation on the correct data types by overloading the call method, and
1212
usually would have the corresponding inverse transformation defined by `Base.inv()`.
1313
Efficient compositions can optionally be defined by `compose()` (equivalently `∘`).
1414
"""
15-
abstract Transformation
15+
@compat abstract type Transformation end
1616

1717
"""
1818
The `IdentityTransformation` is a singleton `Transformation` that returns the
@@ -45,6 +45,7 @@ function Base.isapprox(trans1::ComposedTransformation, trans2::ComposedTransform
4545
isapprox(trans1.t1, trans2.t1; kwargs...) && isapprox(trans1.t2, trans2.t2; kwargs...)
4646
end
4747

48+
const compose =
4849

4950
"""
5051
compose(trans1, trans2)
@@ -64,8 +65,6 @@ compose(trans::IdentityTransformation, ::IdentityTransformation) = trans
6465
compose(::IdentityTransformation, trans::Transformation) = trans
6566
compose(trans::Transformation, ::IdentityTransformation) = trans
6667

67-
const = compose # TODO watch JuliaLang/julia#17184 and #17155 for v0.5 compatibility
68-
6968

7069
"""
7170
inv(trans::Transformation)

test/affine.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ CoordinateTransformations.transform_deriv(::SquareMe, x0) = diagm(2*x0)
7575

7676
# Transform
7777
@test trans(x) === SVector(3.0, 1.0)
78-
@test trans(collect(x)) === SVector(3.0, 1.0)
78+
@test trans(collect(x)) == [3.0, 1.0]
7979

8080
# Transform derivative
8181
m1 = transform_deriv(trans, x)

0 commit comments

Comments
 (0)