Skip to content

Commit de800db

Browse files
committed
Fix overloading
1 parent 4f9312d commit de800db

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/Blocks/Blocks.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ The module `Blocks` contains common input-output components, referred to as bloc
33
"""
44
module Blocks
55
using ModelingToolkit, Symbolics
6-
using IfElse: ifelse
6+
import IfElse: ifelse
77
import ..@symcheck
88
using ModelingToolkit: getdefault
99

src/Blocks/sources.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,10 @@ Base.isless(y::Number, x::Parameter) = Base.isless(y, x.ref)
511511

512512
Base.copy(x::Parameter{T}) where {T} = Parameter{T}(copy(x.data), x.ref)
513513

514-
Base.ifelse(c::Bool, x::Parameter, y::Parameter) = ifelse(c, x.ref, y.ref)
515-
Base.ifelse(c::Bool, x::Parameter, y::Number) = ifelse(c, x.ref, y)
516-
Base.ifelse(c::Bool, x::Number, y::Parameter) = ifelse(c, x, y.ref)
514+
ifelse(c::Bool, x::Parameter, y::Parameter) = ifelse(c, x.ref, y.ref)
515+
ifelse(c::Bool, x::Parameter, y::Number) = ifelse(c, x.ref, y)
516+
ifelse(c::Bool, x::Number, y::Parameter) = ifelse(c, x, y.ref)
517+
517518
Base.max(x::Number, y::Parameter) = max(x, y.ref)
518519
Base.max(x::Parameter, y::Number) = max(x.ref, y)
519520
Base.max(x::Parameter, y::Parameter) = max(x.ref, y.ref)

0 commit comments

Comments
 (0)