Skip to content

Commit 113812f

Browse files
committed
fix some compile errors
1 parent 26f5388 commit 113812f

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/fixed_arrays.jl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function similar_type end
88

99
macro fixed_vector(name_parent)
1010
@assert name_parent.head == :(=)
11-
name, parent = name_parent.args
11+
VecT, SuperT = name_parent.args
1212

1313
expr = quote
1414
struct $(VecT){N, T} <: $(SuperT){N, T}
@@ -204,9 +204,9 @@ const Vecf{N} = Vec{N, Float32}
204204
const PointT{T} = Point{N,T} where N
205205
const Pointf{N} = Point{N,Float32}
206206

207-
Base.isnan(p::Union{AbstractPoint,Vec}) = any(isnan, p)
208-
Base.isinf(p::Union{AbstractPoint,Vec}) = any(isinf, p)
209-
Base.isfinite(p::Union{AbstractPoint,Vec}) = all(isfinite, p)
207+
Base.isnan(p::Union{Point,Vec}) = any(isnan, p)
208+
Base.isinf(p::Union{Point,Vec}) = any(isinf, p)
209+
Base.isfinite(p::Union{Point,Vec}) = all(isfinite, p)
210210

211211
## Generate aliases
212212
## As a text file instead of eval/macro, to not confuse code linter
@@ -232,6 +232,7 @@ open(joinpath(@__DIR__, "generated-aliases.jl"), "w") do io
232232
end
233233
=#
234234

235+
include("mat.jl")
235236
include("generated-aliases.jl")
236237

237238
export Mat, Vec, Point, unit

src/meshes.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function triangle_mesh(primitive::Mesh{N}) where {N}
5858
end
5959
end
6060

61-
function triangle_mesh(primitive::Meshable{N}; nvertices=nothing) where {N}
61+
function triangle_mesh(primitive::GeometryPrimitive{N}; nvertices=nothing) where {N}
6262
if nvertices !== nothing
6363
@warn("nvertices argument deprecated. Wrap primitive in `Tesselation(primitive, nvertices)`")
6464
primitive = Tesselation(primitive, nvertices)

0 commit comments

Comments
 (0)