Patch Detail
Show a patch.
GET /api/1.1/patches/11007/?format=api
{ "id": 11007, "url": "https://patchwork.libcamera.org/api/1.1/patches/11007/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11007/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210126130415.26849-3-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-01-26T13:04:15", "name": "[libcamera-devel,v2,2/2] Revert \"libcamera: Use helper variable template for type traits\"", "commit_ref": "c763ae023d9b64e7910c2dfc849f6c1f5081f657", "pull_url": null, "state": "accepted", "archived": false, "hash": "ac6ef2c8aa620e63e063bc35a700c01a828fea43", "submitter": { "id": 75, "url": "https://patchwork.libcamera.org/api/1.1/people/75/?format=api", "name": "Jean-Michel Hautbois", "email": "jeanmichel.hautbois@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11007/mbox/", "series": [ { "id": 1609, "url": "https://patchwork.libcamera.org/api/1.1/series/1609/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1609", "date": "2021-01-26T13:04:13", "name": "libcamera: revert C++17 specific code for public API", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1609/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11007/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11007/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 24C35C0F2B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 26 Jan 2021 13:04:25 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E8E5468304;\n\tTue, 26 Jan 2021 14:04:24 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BEEF468301\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Jan 2021 14:04:23 +0100 (CET)", "from localhost.localdomain (unknown\n\t[IPv6:2a01:e0a:169:7140:510d:40f3:f9f9:5153])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1B5BA2C1;\n\tTue, 26 Jan 2021 14:04:22 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Rnd40kMN\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611666262;\n\tbh=WwXESPQ4ZZ+F4o511mNmyphQPbZmeyVqWi9xOy213HU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Rnd40kMNleLomPcHFpQWnGtyL5S/3Oz0FTv9FDOIYnvgxE8FHw5hXFP66Xb9YHsY3\n\toWhvT27Zm1jaOt/5Ittj390py/svPJ8ZCDcI5ReYDttf4ibtmtEBvxV3MCItSbDE3p\n\tsXHrEGU7+6j0FN2zjajMOxM0u5stO2JKq+gM7HDI=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 26 Jan 2021 14:04:15 +0100", "Message-Id": "<20210126130415.26849-3-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210126130415.26849-1-jeanmichel.hautbois@ideasonboard.com>", "References": "<20210126130415.26849-1-jeanmichel.hautbois@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 2/2] Revert \"libcamera: Use helper\n\tvariable template for type traits\"", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This reverts commit 6cbdc2859963e17bc897a4022f1d68170477d888.\n---\n include/libcamera/bound_method.h | 2 +-\n include/libcamera/controls.h | 12 ++++----\n include/libcamera/object.h | 2 +-\n include/libcamera/signal.h | 4 +--\n include/libcamera/span.h | 48 ++++++++++++++++----------------\n 5 files changed, 34 insertions(+), 34 deletions(-)", "diff": "diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h\nindex feac51da..95a95653 100644\n--- a/include/libcamera/bound_method.h\n+++ b/include/libcamera/bound_method.h\n@@ -63,7 +63,7 @@ public:\n \t}\n \tvirtual ~BoundMethodBase() = default;\n \n-\ttemplate<typename T, typename std::enable_if_t<!std::is_same_v<Object, T>> * = nullptr>\n+\ttemplate<typename T, typename std::enable_if_t<!std::is_same<Object, T>::value> * = nullptr>\n \tbool match(T *obj) { return obj == obj_; }\n \tbool match(Object *object) { return object == object_; }\n \ndiff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex dc549a92..3b7f3347 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -98,7 +98,7 @@ public:\n #ifndef __DOXYGEN__\n \ttemplate<typename T, typename std::enable_if_t<!details::is_span<T>::value &&\n \t\t\t\t\t\t details::control_type<T>::value &&\n-\t\t\t\t\t\t !std::is_same_v<std::string, std::remove_cv_t<T>>,\n+\t\t\t\t\t\t !std::is_same<std::string, std::remove_cv_t<T>>::value,\n \t\t\t\t\t\t std::nullptr_t> = nullptr>\n \tControlValue(const T &value)\n \t\t: type_(ControlTypeNone), numElements_(0)\n@@ -108,7 +108,7 @@ public:\n \t}\n \n \ttemplate<typename T, typename std::enable_if_t<details::is_span<T>::value ||\n-\t\t\t\t\t\t std::is_same_v<std::string, std::remove_cv_t<T>>,\n+\t\t\t\t\t\t std::is_same<std::string, std::remove_cv_t<T>>::value,\n \t\t\t\t\t\t std::nullptr_t> = nullptr>\n #else\n \ttemplate<typename T>\n@@ -142,7 +142,7 @@ public:\n \n #ifndef __DOXYGEN__\n \ttemplate<typename T, typename std::enable_if_t<!details::is_span<T>::value &&\n-\t\t\t\t\t\t !std::is_same_v<std::string, std::remove_cv_t<T>>,\n+\t\t\t\t\t\t !std::is_same<std::string, std::remove_cv_t<T>>::value,\n \t\t\t\t\t\t std::nullptr_t> = nullptr>\n \tT get() const\n \t{\n@@ -153,7 +153,7 @@ public:\n \t}\n \n \ttemplate<typename T, typename std::enable_if_t<details::is_span<T>::value ||\n-\t\t\t\t\t\t std::is_same_v<std::string, std::remove_cv_t<T>>,\n+\t\t\t\t\t\t std::is_same<std::string, std::remove_cv_t<T>>::value,\n \t\t\t\t\t\t std::nullptr_t> = nullptr>\n #else\n \ttemplate<typename T>\n@@ -170,7 +170,7 @@ public:\n \n #ifndef __DOXYGEN__\n \ttemplate<typename T, typename std::enable_if_t<!details::is_span<T>::value &&\n-\t\t\t\t\t\t !std::is_same_v<std::string, std::remove_cv_t<T>>,\n+\t\t\t\t\t\t !std::is_same<std::string, std::remove_cv_t<T>>::value,\n \t\t\t\t\t\t std::nullptr_t> = nullptr>\n \tvoid set(const T &value)\n \t{\n@@ -179,7 +179,7 @@ public:\n \t}\n \n \ttemplate<typename T, typename std::enable_if_t<details::is_span<T>::value ||\n-\t\t\t\t\t\t std::is_same_v<std::string, std::remove_cv_t<T>>,\n+\t\t\t\t\t\t std::is_same<std::string, std::remove_cv_t<T>>::value,\n \t\t\t\t\t\t std::nullptr_t> = nullptr>\n #else\n \ttemplate<typename T>\ndiff --git a/include/libcamera/object.h b/include/libcamera/object.h\nindex 423208db..a1882f05 100644\n--- a/include/libcamera/object.h\n+++ b/include/libcamera/object.h\n@@ -32,7 +32,7 @@ public:\n \tvoid postMessage(std::unique_ptr<Message> msg);\n \n \ttemplate<typename T, typename R, typename... FuncArgs, typename... Args,\n-\t\t typename std::enable_if_t<std::is_base_of_v<Object, T>> * = nullptr>\n+\t\t typename std::enable_if_t<std::is_base_of<Object, T>::value> * = nullptr>\n \tR invokeMethod(R (T::*func)(FuncArgs...), ConnectionType type,\n \t\t Args... args)\n \t{\ndiff --git a/include/libcamera/signal.h b/include/libcamera/signal.h\nindex 46d917d5..5bcd7a77 100644\n--- a/include/libcamera/signal.h\n+++ b/include/libcamera/signal.h\n@@ -44,7 +44,7 @@ public:\n \t}\n \n #ifndef __DOXYGEN__\n-\ttemplate<typename T, typename R, typename std::enable_if_t<std::is_base_of_v<Object, T>> * = nullptr>\n+\ttemplate<typename T, typename R, typename std::enable_if_t<std::is_base_of<Object, T>::value> * = nullptr>\n \tvoid connect(T *obj, R (T::*func)(Args...),\n \t\t ConnectionType type = ConnectionTypeAuto)\n \t{\n@@ -52,7 +52,7 @@ public:\n \t\tSignalBase::connect(new BoundMethodMember<T, void, Args...>(obj, object, func, type));\n \t}\n \n-\ttemplate<typename T, typename R, typename std::enable_if_t<!std::is_base_of_v<Object, T>> * = nullptr>\n+\ttemplate<typename T, typename R, typename std::enable_if_t<!std::is_base_of<Object, T>::value> * = nullptr>\n #else\n \ttemplate<typename T, typename R>\n #endif\ndiff --git a/include/libcamera/span.h b/include/libcamera/span.h\nindex d720adb8..91e9f974 100644\n--- a/include/libcamera/span.h\n+++ b/include/libcamera/span.h\n@@ -125,8 +125,8 @@ public:\n \n \ttemplate<std::size_t N>\n \tconstexpr Span(element_type (&arr)[N],\n-\t\t std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n-\t\t\t\t\t\t\t element_type (*)[]> &&\n+\t\t std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n+\t\t\t\t\t\t\t element_type (*)[]>::value &&\n \t\t\t\t\tN == Extent,\n \t\t\t\t\tstd::nullptr_t> = nullptr) noexcept\n \t\t: data_(arr)\n@@ -135,8 +135,8 @@ public:\n \n \ttemplate<std::size_t N>\n \tconstexpr Span(std::array<value_type, N> &arr,\n-\t\t std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n-\t\t\t\t\t\t\t element_type (*)[]> &&\n+\t\t std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n+\t\t\t\t\t\t\t element_type (*)[]>::value &&\n \t\t\t\t\tN == Extent,\n \t\t\t\t\tstd::nullptr_t> = nullptr) noexcept\n \t\t: data_(arr.data())\n@@ -145,8 +145,8 @@ public:\n \n \ttemplate<std::size_t N>\n \tconstexpr Span(const std::array<value_type, N> &arr,\n-\t\t std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n-\t\t\t\t\t\t\t element_type (*)[]> &&\n+\t\t std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n+\t\t\t\t\t\t\t element_type (*)[]>::value &&\n \t\t\t\t\tN == Extent,\n \t\t\t\t\tstd::nullptr_t> = nullptr) noexcept\n \t\t: data_(arr.data())\n@@ -157,9 +157,9 @@ public:\n \texplicit constexpr Span(Container &cont,\n \t\t\t\tstd::enable_if_t<!details::is_span<Container>::value &&\n \t\t\t\t\t\t !details::is_array<Container>::value &&\n-\t\t\t\t\t\t !std::is_array_v<Container> &&\n-\t\t\t\t\t\t std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n-\t\t\t\t\t\t\t\t element_type (*)[]>,\n+\t\t\t\t\t\t !std::is_array<Container>::value &&\n+\t\t\t\t\t\t std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n+\t\t\t\t\t\t\t\t element_type (*)[]>::value,\n \t\t\t\t\t\t std::nullptr_t> = nullptr)\n \t\t: data_(utils::data(cont))\n \t{\n@@ -169,9 +169,9 @@ public:\n \texplicit constexpr Span(const Container &cont,\n \t\t\t\tstd::enable_if_t<!details::is_span<Container>::value &&\n \t\t\t\t\t\t !details::is_array<Container>::value &&\n-\t\t\t\t\t\t !std::is_array_v<Container> &&\n-\t\t\t\t\t\t std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n-\t\t\t\t\t\t\t\t element_type (*)[]>,\n+\t\t\t\t\t\t !std::is_array<Container>::value &&\n+\t\t\t\t\t\t std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n+\t\t\t\t\t\t\t\t element_type (*)[]>::value,\n \t\t\t\t\t\t std::nullptr_t> = nullptr)\n \t\t: data_(utils::data(cont))\n \t{\n@@ -180,7 +180,7 @@ public:\n \n \ttemplate<class U, std::size_t N>\n \texplicit constexpr Span(const Span<U, N> &s,\n-\t\t\t\tstd::enable_if_t<std::is_convertible_v<U (*)[], element_type (*)[]> &&\n+\t\t\t\tstd::enable_if_t<std::is_convertible<U (*)[], element_type (*)[]>::value &&\n \t\t\t\t\t\t N == Extent,\n \t\t\t\t\t\t std::nullptr_t> = nullptr) noexcept\n \t\t: data_(s.data())\n@@ -293,8 +293,8 @@ public:\n \n \ttemplate<std::size_t N>\n \tconstexpr Span(element_type (&arr)[N],\n-\t\t std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n-\t\t\t\t\t\t\t element_type (*)[]>,\n+\t\t std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n+\t\t\t\t\t\t\t element_type (*)[]>::value,\n \t\t\t\t\tstd::nullptr_t> = nullptr) noexcept\n \t\t: data_(arr), size_(N)\n \t{\n@@ -302,8 +302,8 @@ public:\n \n \ttemplate<std::size_t N>\n \tconstexpr Span(std::array<value_type, N> &arr,\n-\t\t std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n-\t\t\t\t\t\t\t element_type (*)[]>,\n+\t\t std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],\n+\t\t\t\t\t\t\t element_type (*)[]>::value,\n \t\t\t\t\tstd::nullptr_t> = nullptr) noexcept\n \t\t: data_(utils::data(arr)), size_(N)\n \t{\n@@ -319,9 +319,9 @@ public:\n \tconstexpr Span(Container &cont,\n \t\t std::enable_if_t<!details::is_span<Container>::value &&\n \t\t\t\t\t!details::is_array<Container>::value &&\n-\t\t\t\t\t!std::is_array_v<Container> &&\n-\t\t\t\t\tstd::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n-\t\t\t\t\t\t\t element_type (*)[]>,\n+\t\t\t\t\t!std::is_array<Container>::value &&\n+\t\t\t\t\tstd::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n+\t\t\t\t\t\t\t element_type (*)[]>::value,\n \t\t\t\t\tstd::nullptr_t> = nullptr)\n \t\t: data_(utils::data(cont)), size_(utils::size(cont))\n \t{\n@@ -331,9 +331,9 @@ public:\n \tconstexpr Span(const Container &cont,\n \t\t std::enable_if_t<!details::is_span<Container>::value &&\n \t\t\t\t\t!details::is_array<Container>::value &&\n-\t\t\t\t\t!std::is_array_v<Container> &&\n-\t\t\t\t\tstd::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n-\t\t\t\t\t\t\t element_type (*)[]>,\n+\t\t\t\t\t!std::is_array<Container>::value &&\n+\t\t\t\t\tstd::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],\n+\t\t\t\t\t\t\t element_type (*)[]>::value,\n \t\t\t\t\tstd::nullptr_t> = nullptr)\n \t\t: data_(utils::data(cont)), size_(utils::size(cont))\n \t{\n@@ -341,7 +341,7 @@ public:\n \n \ttemplate<class U, std::size_t N>\n \tconstexpr Span(const Span<U, N> &s,\n-\t\t std::enable_if_t<std::is_convertible_v<U (*)[], element_type (*)[]>,\n+\t\t std::enable_if_t<std::is_convertible<U (*)[], element_type (*)[]>::value,\n \t\t\t\t\tstd::nullptr_t> = nullptr) noexcept\n \t\t: data_(s.data()), size_(s.size())\n \t{\n", "prefixes": [ "libcamera-devel", "v2", "2/2" ] }