From 39821a05d99debe50c4e506da782f9403fa62edc Mon Sep 17 00:00:00 2001 From: Abdo Eid Date: Mon, 25 Sep 2023 16:36:50 +0000 Subject: [PATCH] fixed the merge conflict error --- src/StdLib.jl | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/StdLib.jl b/src/StdLib.jl index a19e100..5a11931 100644 --- a/src/StdLib.jl +++ b/src/StdLib.jl @@ -130,17 +130,6 @@ function StdDeque() where {T} return StdDeque{T}() end -Base.IndexStyle(::Type{<:StdDeque}) = IndexLinear() -Base.size(v::StdDeque) = (Int(cppsize(v)),) -Base.getindex(v::StdDeque, i::Int) = cxxgetindex(v,i)[] -Base.setindex!(v::StdDeque{T}, val, i::Int) where {T} = cxxsetindex!(v, convert(T,val), i) -Base.push!(v::StdDeque, x) = push_back!(v, x) -Base.pushfirst!(v::StdDeque, x) = push_front!(v, x) -Base.pop!(v::StdDeque) = pop_back!(v) -Base.popfirst!(v::StdDeque) = pop_front!(v) -Base.resize!(v::StdDeque, n::Integer) = resize!(v, n) -end - Base.IndexStyle(::Type{<:StdDeque}) = IndexLinear() Base.size(d::StdDeque) = (Int(cppsize(d)),) Base.resize!(d::StdDeque, n::Integer) = resize(d, n)