From patchwork Fri Jan 10 19:37:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 2550 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5756160673 for ; Fri, 10 Jan 2020 20:38:38 +0100 (CET) X-Halon-ID: ca3d4738-33e0-11ea-b6d8-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p54ac5d7b.dip0.t-ipconnect.de [84.172.93.123]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id ca3d4738-33e0-11ea-b6d8-005056917f90; Fri, 10 Jan 2020 20:38:34 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Fri, 10 Jan 2020 20:37:38 +0100 Message-Id: <20200110193808.2266294-4-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200110193808.2266294-1-niklas.soderlund@ragnatech.se> References: <20200110193808.2266294-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 03/33] libcamera: utils: Add exchange() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2020 19:38:38 -0000 C++11 does not support std::exchange(), add a custom implementation in utils. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/libcamera/include/utils.h | 9 +++++++++ src/libcamera/utils.cpp | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h index badc77533fa15f09..6470cadc2c6c1234 100644 --- a/src/libcamera/include/utils.h +++ b/src/libcamera/include/utils.h @@ -67,6 +67,15 @@ const T& clamp(const T& v, const T& lo, const T& hi) return std::max(lo, std::min(v, hi)); } +/* C++11 doesn't provide std::exchange */ +template +T exchange(T &obj, U &&new_value) +{ + T old_value = std::move(obj); + obj = std::forward(new_value); + return old_value; +} + using clock = std::chrono::steady_clock; using duration = std::chrono::steady_clock::duration; using time_point = std::chrono::steady_clock::time_point; diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp index 5de9e4813353b23c..a7e573ac45aec914 100644 --- a/src/libcamera/utils.cpp +++ b/src/libcamera/utils.cpp @@ -95,6 +95,14 @@ char *secure_getenv(const char *name) * \return lo if v is less than lo, hi if v is greater than hi, otherwise v */ +/** + * \fn libcamera::utils::exchange(T &obj, U &&new_value) + * \brief Replace the value of \a obj with \a new_value and return the old value + * \param[inout] obj Object whose value to replace + * \param[in] new_value The value to assign to obj + * \return The old value of \a obj + */ + /** * \typedef clock * \brief The libcamera clock (monotonic)