From 119721f0be8438403648ec744e881aac8272867a Mon Sep 17 00:00:00 2001 From: Jiri Vlasak Date: Fri, 21 Dec 2018 13:39:38 +0100 Subject: [PATCH] Rename circle/segment obstacles getter The name collides with `cos` math function. --- base/rrtbase.cc | 4 ++-- incl/rrtbase.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/rrtbase.cc b/base/rrtbase.cc index f4b5720..4a1d947 100644 --- a/base/rrtbase.cc +++ b/base/rrtbase.cc @@ -95,12 +95,12 @@ std::vector &RRTBase::samples() return this->samples_; } -std::vector *RRTBase::cos() +std::vector *RRTBase::co() { return this->cobstacles_; } -std::vector *RRTBase::sos() +std::vector *RRTBase::so() { return this->sobstacles_; } diff --git a/incl/rrtbase.h b/incl/rrtbase.h index cdf1bb0..71e8a09 100644 --- a/incl/rrtbase.h +++ b/incl/rrtbase.h @@ -65,8 +65,8 @@ class RRTBase { std::vector &dnodes(); std::vector &samples(); std::vector iy_[IYSIZE]; - std::vector *cos(); - std::vector *sos(); + std::vector *co(); + std::vector *so(); std::vector &clog(); std::vector &nlog(); std::vector> &rlog(); -- 2.39.2