NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: signal: Don't use reinterpret_cast<>() to perform downcasts

Browse source 
Use static_cast<>() instead of reinterpret_cast<>() to perform
downcasts, as reinterpret_cast<>() isn't meant (and guaranteed to be
safe) for that purpose.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-01-26 18:29:41 +02:00
parent aae0b7ffb1
commit eae59ca2cd
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/libcamera/signal.h
View file

@ -37,7 +37,7 @@ public:
SlotMember(T *obj, void(T::*func)(Args...))
: SlotBase<Args...>(obj), func_(func) { }
void invoke(Args... args) { (reinterpret_cast<T *>(this->obj_)->*func_)(args...); }
void invoke(Args... args) { (static_cast<T *>(this->obj_)->*func_)(args...); }
private:
friend class Signal<Args...>;
@ -111,7 +111,7 @@ public:
* match, so we can safely cast to SlotMember<T, Args>.
*/
if (slot->obj_ == object &&
reinterpret_cast<SlotMember<T, Args...> *>(slot)->func_ == func) {
static_cast<SlotMember<T, Args...> *>(slot)->func_ == func) {
iter = slots_.erase(iter);
delete slot;
} else {
@ -125,7 +125,7 @@ public:
for (auto iter = slots_.begin(); iter != slots_.end(); ) {
SlotBase<Args...> *slot = *iter;
if (slot->obj_ == nullptr &&
reinterpret_cast<SlotStatic<Args...> *>(slot)->func_ == func) {
static_cast<SlotStatic<Args...> *>(slot)->func_ == func) {
iter = slots_.erase(iter);
delete slot;
} else {