[libcamera-devel,v2,1/3] libcamera: utils: Add exchange()
diff mbox series

Message ID 20191217015106.1175515-2-niklas.soderlund@ragnatech.se
State Superseded
Delegated to: Niklas Söderlund
Headers show
Series
  • libcamera: Add FileDescriptor to help pass numerical fds around
Related show

Commit Message

Niklas Söderlund Dec. 17, 2019, 1:51 a.m. UTC 
C++11 does not support std::exchange(), add a custom implementation in
utils.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/include/utils.h | 9 +++++++++
 src/libcamera/utils.cpp       | 8 ++++++++
 2 files changed, 17 insertions(+)

Patch
diff mbox series 

diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h
index a80f7d096bf725a1..32e3b009040d9efc 100644
--- a/src/libcamera/include/utils.h
+++ b/src/libcamera/include/utils.h
@@ -66,6 +66,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<class T, class U = T>
+T exchange(T &obj, U &&new_value)
+{
+	T old_value = std::move(obj);
+	obj = std::forward<U>(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 d632f6e66638038d..6ebb4e8ce39010c0 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)