[{"id":2865,"web_url":"https://patchwork.libcamera.org/comment/2865/","msgid":"<20191011154633.GH23166@bigcity.dyn.berto.se>","date":"2019-10-11T15:46:33","subject":"Re: [libcamera-devel] [PATCH] libamera: pipeline: rkisp1: timeline:\n\tFix compilation with gcc-[56]","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for spotting this.\n\nOn 2019-10-11 17:30:27 +0300, Laurent Pinchart wrote:\n> With gcc 5 and 6, insertion in a std::multimap copies the pair passed as\n> an argument to the insert() method. As the mapped type is a non-copyable\n> std::unique_ptr<>, this fails to compile.\n> \n> Compilation with newer gcc versions succeed due to support for C++-17\n> and the fix described in https://cplusplus.github.io/LWG/issue2354. To\n> support gcc 5 and 6, fix the issue by using std::multimap::emplace().\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/libcamera/pipeline/rkisp1/timeline.cpp | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/timeline.cpp b/src/libcamera/pipeline/rkisp1/timeline.cpp\n> index b98a16689fa9..f6c6434d7b53 100644\n> --- a/src/libcamera/pipeline/rkisp1/timeline.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/timeline.cpp\n> @@ -123,7 +123,7 @@ void Timeline::scheduleAction(std::unique_ptr action)\n> \t\t\t<< \", run now \" << utils::time_point_to_string(now);\n> \t\taction->run();\n> \t} else {\n> -\t\tactions_.insert({ deadline, std::move(action) });\n> +\t\tactions_.emplace(deadline, std::move(action));\n> \t\tupdateDeadline();\n> \t}\n> }\n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","headers":{"Return-Path":"","Received":["from mail-lf1-x144.google.com (mail-lf1-x144.google.com\n\t[IPv6:2a00:1450:4864:20::144])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B56EB61565\n\tfor ;\n\tFri, 11 Oct 2019 17:46:35 +0200 (CEST)","by mail-lf1-x144.google.com with SMTP id r2so7360746lfn.8\n\tfor ;\n\tFri, 11 Oct 2019 08:46:35 -0700 (PDT)","from localhost (h-93-159.A463.priv.bahnhof.se. [46.59.93.159])\n\tby smtp.gmail.com with ESMTPSA id\n\t207sm1483270lfj.25.2019.10.11.08.46.33\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 11 Oct 2019 08:46:34 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=PY2/gPNRueXLvh2IJ1s6UuL1uFDUAtXkMZ54KoZd4x4=;\n\tb=1mJgtkNtBsnOD0W4F3N0zNUy1/ACmu6Yjl1q42WMDW56WI8nKLZPPrb7mWt5B81R7A\n\t6LgNJ1rUFgF0EqfsrZNC/ZRPW7nBVx84rce+C0VKU21lsKnZjIJWbi+zRl5NyZiD61cS\n\tA2qsAl6ylwS5spfku63X2+xl2EIHM2OwUm0w3hRgfp9LLBEVwjOv4jYEhjICxMAxtJ6r\n\tAPPIo0VKsiab+lrz78OudrU5+tq7VhLJpXmu/BHpSmis+e7e7yJXY7z2KCZAiw1FO7pX\n\tCVJRnTK7w1n8z58NMeihtuhCFA9XYE7Dq1ACUTO1wD4A3KGSkEAdj0C4R987Tk8+m8nS\n\tTlAg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=PY2/gPNRueXLvh2IJ1s6UuL1uFDUAtXkMZ54KoZd4x4=;\n\tb=IOlPw6SIKasDbPSanR3pbaHFf169Tfqs44iayzZubh9a5Ehax9N6stQ50WOMHnsXXz\n\t0W1qLDf1ovbJV1LpaKmYF1Nx05BdHGQ8n6yYAtYfRF7SFekQPjwDhWGyT1jdpCBdc6Hk\n\tCx6HcmcX2Xn2Zu8CcEf8i9BDGxs8sVRJyIPRfncpUSY6PLLvulSIqFxDQYSn/DNGi/PO\n\t48etdUQ13I7/mwhcSalSSJD87AgZYWnG00BGaXwXurLjAyuBjKNPWTTKHR1SITegI6/5\n\t0q9pV15HA+VBRCdNIByxOxD4zad4LKG0caSSj3dLpUFTDsw9oCv06cOZAKYUSiXcvWvH\n\tYKJA==","X-Gm-Message-State":"APjAAAXbtnCVXhMwzaDh3fnkO78TXMF8wxqrakmUakxkaXu4kvfujZ7v\n\tYWPqrL/B2AXZ4lp7pI7aRNe5+AHKG3Y=","X-Google-Smtp-Source":"APXvYqwopj1xqmvYImev5hpmFUOFXnWDqsxpUqg6h7SZsJklzAyD/bons8DpjAUv76w51BwPZKcrAg==","X-Received":"by 2002:ac2:4c83:: with SMTP id d3mr9252869lfl.102.1570808795109;\n\tFri, 11 Oct 2019 08:46:35 -0700 (PDT)","Date":"Fri, 11 Oct 2019 17:46:33 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191011154633.GH23166@bigcity.dyn.berto.se>","References":"<20191011143027.23310-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20191011143027.23310-1-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH] libamera: pipeline: rkisp1: timeline:\n\tFix compilation with gcc-[56]","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 11 Oct 2019 15:46:35 -0000"}},{"id":2906,"web_url":"https://patchwork.libcamera.org/comment/2906/","msgid":"","date":"2019-10-15T10:38:35","subject":"Re: [libcamera-devel] [PATCH] libamera: pipeline: rkisp1: timeline:\n\tFix compilation with gcc-[56]","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Re $SUBJECT:\n\ns/libamera/libcamera/\n\nBut I'm too late... it's already merged. Ooops oh well.\n\nPerhaps we should add some sort of commit title checking to\ncheckstyle.py ... but that might be overkill.\n\nGetting spell checking in there should cover it.\n\n--\nKieran\n\n\nOn 11/10/2019 15:30, Laurent Pinchart wrote:\n> With gcc 5 and 6, insertion in a std::multimap copies the pair passed as\n> an argument to the insert() method. As the mapped type is a non-copyable\n> std::unique_ptr<>, this fails to compile.\n> \n> Compilation with newer gcc versions succeed due to support for C++-17\n> and the fix described in https://cplusplus.github.io/LWG/issue2354. To\n> support gcc 5 and 6, fix the issue by using std::multimap::emplace().\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> src/libcamera/pipeline/rkisp1/timeline.cpp | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/timeline.cpp b/src/libcamera/pipeline/rkisp1/timeline.cpp\n> index b98a16689fa9..f6c6434d7b53 100644\n> --- a/src/libcamera/pipeline/rkisp1/timeline.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/timeline.cpp\n> @@ -123,7 +123,7 @@ void Timeline::scheduleAction(std::unique_ptr action)\n> \t\t\t<< \", run now \" << utils::time_point_to_string(now);\n> \t\taction->run();\n> \t} else {\n> -\t\tactions_.insert({ deadline, std::move(action) });\n> +\t\tactions_.emplace(deadline, std::move(action));\n> \t\tupdateDeadline();\n> \t}\n> }\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AC66460E1B\n\tfor ;\n\tTue, 15 Oct 2019 12:38:39 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E25CB324;\n\tTue, 15 Oct 2019 12:38:38 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1571135919;\n\tbh=jc50BAfPM4TvIVWOe9c6RUE8J4AiXBtpH8C/N0mlaWg=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=Kjolw4vnlJpNovuY2Eo3Q1IsxmCUbdR/Asbnudt8ND0pD+OaZa+QYBNRnVFmUlGFY\n\t9ie9L2B5TYCXA8ZoqPGH4cryN9YXvobOiTYXZPNj/kcCAYMQf7nIhkvBe6qFXGUQi8\n\t4e8CDG0dc6P3B3d4SVyiK0v25vIid1ELpCrl8S4o=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20191011143027.23310-1-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Tue, 15 Oct 2019 11:38:35 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.8.0","MIME-Version":"1.0","In-Reply-To":"<20191011143027.23310-1-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH] libamera: pipeline: rkisp1: timeline:\n\tFix compilation with gcc-[56]","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 15 Oct 2019 10:38:39 -0000"}}]