From 0c9c698d136f3e8418c8356848e992ab9230f8b4 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 16 Oct 2018 21:18:02 +0200 Subject: [PATCH] pipeline: make BlockerSimple constexpr (needed by MutexSimpleImpl) --- panda/src/pipeline/blockerSimple.I | 8 -------- panda/src/pipeline/blockerSimple.h | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/panda/src/pipeline/blockerSimple.I b/panda/src/pipeline/blockerSimple.I index 0188281728..89be34a412 100644 --- a/panda/src/pipeline/blockerSimple.I +++ b/panda/src/pipeline/blockerSimple.I @@ -11,14 +11,6 @@ * @date 2007-06-20 */ -/** - * - */ -INLINE BlockerSimple:: -BlockerSimple() { - _flags = 0; -} - /** * */ diff --git a/panda/src/pipeline/blockerSimple.h b/panda/src/pipeline/blockerSimple.h index 71ae25c41d..d375d5dc16 100644 --- a/panda/src/pipeline/blockerSimple.h +++ b/panda/src/pipeline/blockerSimple.h @@ -28,7 +28,7 @@ */ class EXPCL_PANDA_PIPELINE BlockerSimple { protected: - INLINE BlockerSimple(); + constexpr BlockerSimple() = default; INLINE ~BlockerSimple(); protected: @@ -38,7 +38,7 @@ protected: F_has_waiters = 0x40000000, }; - unsigned int _flags; + unsigned int _flags = 0; friend class ThreadSimpleManager; };