[{"id":13001,"web_url":"https://patchwork.libcamera.org/comment/13001/","msgid":"<07495d18-252e-4aac-bac2-2a2aa1fa3bfd@ideasonboard.com>","date":"2020-10-06T09:33:46","subject":"Re: [libcamera-devel] [PATCH] pipeline: ipa: raspberrypi: Switch to\n\tuse C++17 features where possible","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Naush,\n\nOn 06/10/2020 10:07, Naushir Patuck wrote:\n> With the recent change to use C++17, the following code changes can be\n> made:\n> - Use C++17 [[fallthough]] attribute instead of /* Fall through */.\n> - Swap boost::any to std::any.\n\nOhhhhh ;-)\n\n> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n\nSounds and looks good to me, and one less boost header ;-)\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  src/ipa/raspberrypi/controller/metadata.hpp        | 9 ++++-----\n>  src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n>  2 files changed, 5 insertions(+), 6 deletions(-)\n> \n> diff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.hpp\n> index f3a8dfab..4f44ffc6 100644\n> --- a/src/ipa/raspberrypi/controller/metadata.hpp\n> +++ b/src/ipa/raspberrypi/controller/metadata.hpp\n> @@ -8,13 +8,12 @@\n>  \n>  // A simple class for carrying arbitrary metadata, for example about an image.\n>  \n> +#include <any>\n>  #include <string>\n>  #include <mutex>\n>  #include <map>\n>  #include <memory>\n>  \n> -#include <boost/any.hpp>\n> -\n>  namespace RPiController {\n>  \n>  class Metadata\n> @@ -31,7 +30,7 @@ public:\n>  \t\tauto it = data_.find(tag);\n>  \t\tif (it == data_.end())\n>  \t\t\treturn -1;\n> -\t\tvalue = boost::any_cast<T>(it->second);\n> +\t\tvalue = std::any_cast<T>(it->second);\n>  \t\treturn 0;\n>  \t}\n>  \tvoid Clear()\n> @@ -53,7 +52,7 @@ public:\n>  \t\tauto it = data_.find(tag);\n>  \t\tif (it == data_.end())\n>  \t\t\treturn nullptr;\n> -\t\treturn boost::any_cast<T>(&it->second);\n> +\t\treturn std::any_cast<T>(&it->second);\n>  \t}\n>  \ttemplate<typename T>\n>  \tvoid SetLocked(std::string const &tag, T const &value)\n> @@ -69,7 +68,7 @@ public:\n>  \n>  private:\n>  \tmutable std::mutex mutex_;\n> -\tstd::map<std::string, boost::any> data_;\n> +\tstd::map<std::string, std::any> data_;\n>  };\n>  \n>  typedef std::shared_ptr<Metadata> MetadataPtr;\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 1052bdce..26dbd257 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -1494,7 +1494,7 @@ void RPiCameraData::handleState()\n>  \t\t * No break here, we want to try running the pipeline again.\n>  \t\t * The fallthrough clause below suppresses compiler warnings.\n>  \t\t */\n> -\t\t/* Fall through */\n> +\t\t[[fallthrough]];\n>  \n>  \tcase State::Idle:\n>  \t\ttryRunPipeline();\n>","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 38D39BEEDF\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue,  6 Oct 2020 09:33:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B883963B82;\n\tTue,  6 Oct 2020 11:33:51 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5FF0C6035A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  6 Oct 2020 11:33:50 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A8D503B;\n\tTue,  6 Oct 2020 11:33:49 +0200 (CEST)"],"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=\"Mu4R2ZRo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601976829;\n\tbh=ULv40zsBJyHV0Wq8JHeSmvJ9SsuKUiuZBT2mTT5/LfI=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=Mu4R2ZRotKBUsfx3ns0f3Bcc5aD49s2tv72vPsXOuMBUPsXgmz50lZZ5WDXezsvBa\n\tG9dLXispmpl5dsP0yN7DUypmyNbwQ4tkrheQgTRVQ+KJ6i+T0VSJCbClsAO12dYcQe\n\tGsH1I8AyuQjIDiBNKNlJ/0DYZRA05zYeDwpTBSFw=","To":"Naushir Patuck <naush@raspberrypi.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201006090731.185060-1-naush@raspberrypi.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<07495d18-252e-4aac-bac2-2a2aa1fa3bfd@ideasonboard.com>","Date":"Tue, 6 Oct 2020 10:33:46 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201006090731.185060-1-naush@raspberrypi.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH] pipeline: ipa: raspberrypi: Switch to\n\tuse C++17 features where possible","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>","Reply-To":"kieran.bingham@ideasonboard.com","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>"}},{"id":13028,"web_url":"https://patchwork.libcamera.org/comment/13028/","msgid":"<20201007020313.GG30598@pendragon.ideasonboard.com>","date":"2020-10-07T02:03:13","subject":"Re: [libcamera-devel] [PATCH] pipeline: ipa: raspberrypi: Switch to\n\tuse C++17 features where possible","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Naush,\n\nThank you for the patch.\n\nOn Tue, Oct 06, 2020 at 10:07:31AM +0100, Naushir Patuck wrote:\n> With the recent change to use C++17, the following code changes can be\n> made:\n> - Use C++17 [[fallthough]] attribute instead of /* Fall through */.\n> - Swap boost::any to std::any.\n> \n> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nI will push shortly.\n\n> ---\n>  src/ipa/raspberrypi/controller/metadata.hpp        | 9 ++++-----\n>  src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n>  2 files changed, 5 insertions(+), 6 deletions(-)\n> \n> diff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.hpp\n> index f3a8dfab..4f44ffc6 100644\n> --- a/src/ipa/raspberrypi/controller/metadata.hpp\n> +++ b/src/ipa/raspberrypi/controller/metadata.hpp\n> @@ -8,13 +8,12 @@\n>  \n>  // A simple class for carrying arbitrary metadata, for example about an image.\n>  \n> +#include <any>\n>  #include <string>\n>  #include <mutex>\n>  #include <map>\n>  #include <memory>\n>  \n> -#include <boost/any.hpp>\n> -\n>  namespace RPiController {\n>  \n>  class Metadata\n> @@ -31,7 +30,7 @@ public:\n>  \t\tauto it = data_.find(tag);\n>  \t\tif (it == data_.end())\n>  \t\t\treturn -1;\n> -\t\tvalue = boost::any_cast<T>(it->second);\n> +\t\tvalue = std::any_cast<T>(it->second);\n>  \t\treturn 0;\n>  \t}\n>  \tvoid Clear()\n> @@ -53,7 +52,7 @@ public:\n>  \t\tauto it = data_.find(tag);\n>  \t\tif (it == data_.end())\n>  \t\t\treturn nullptr;\n> -\t\treturn boost::any_cast<T>(&it->second);\n> +\t\treturn std::any_cast<T>(&it->second);\n>  \t}\n>  \ttemplate<typename T>\n>  \tvoid SetLocked(std::string const &tag, T const &value)\n> @@ -69,7 +68,7 @@ public:\n>  \n>  private:\n>  \tmutable std::mutex mutex_;\n> -\tstd::map<std::string, boost::any> data_;\n> +\tstd::map<std::string, std::any> data_;\n>  };\n>  \n>  typedef std::shared_ptr<Metadata> MetadataPtr;\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 1052bdce..26dbd257 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -1494,7 +1494,7 @@ void RPiCameraData::handleState()\n>  \t\t * No break here, we want to try running the pipeline again.\n>  \t\t * The fallthrough clause below suppresses compiler warnings.\n>  \t\t */\n> -\t\t/* Fall through */\n> +\t\t[[fallthrough]];\n>  \n>  \tcase State::Idle:\n>  \t\ttryRunPipeline();","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 D38A3BEEDF\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed,  7 Oct 2020 02:03:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 43E0263C1B;\n\tWed,  7 Oct 2020 04:03:57 +0200 (CEST)","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 EF47163BD5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed,  7 Oct 2020 04:03:55 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 51CB359E;\n\tWed,  7 Oct 2020 04:03:55 +0200 (CEST)"],"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=\"uET58au4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602036235;\n\tbh=J8bK418KbcoipdqZTY9IsdoB9LaZr2ai42oh3tAQ9oY=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=uET58au42AU+yGsi35buLIUCdbsCgal6JiQ3CTHIXwc8eU1akLSPNLPjYyhv+3stQ\n\tQ20QnO0p3LfLjZ0lA9qXuE0+e60IcG8U5RQetT3/F0+oY9VToYLK4zFJIWQn5Bs3Af\n\tU4VeHh/MpmchF2jx1F1mGBlo2ifcnIkOeClKgcVQ=","Date":"Wed, 7 Oct 2020 05:03:13 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Naushir Patuck <naush@raspberrypi.com>","Message-ID":"<20201007020313.GG30598@pendragon.ideasonboard.com>","References":"<20201006090731.185060-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201006090731.185060-1-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH] pipeline: ipa: raspberrypi: Switch to\n\tuse C++17 features where possible","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>","Cc":"libcamera-devel@lists.libcamera.org","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>"}}]