{"id":2160,"url":"https://patchwork.libcamera.org/api/1.1/patches/2160/?format=json","web_url":"https://patchwork.libcamera.org/patch/2160/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20191011143027.23310-1-laurent.pinchart@ideasonboard.com>","date":"2019-10-11T14:30:27","name":"[libcamera-devel] libamera: pipeline: rkisp1: timeline: Fix compilation with gcc-[56]","commit_ref":"f3c53dbf53b60defc61948cdfb64f79e6983e071","pull_url":null,"state":"accepted","archived":false,"hash":"f3d04666861a76d9eb41a2050deab57b64832bef","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2160/mbox/","series":[{"id":530,"url":"https://patchwork.libcamera.org/api/1.1/series/530/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=530","date":"2019-10-11T14:30:27","name":"[libcamera-devel] libamera: pipeline: rkisp1: timeline: Fix compilation with gcc-[56]","version":1,"mbox":"https://patchwork.libcamera.org/series/530/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2160/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2160/checks/","tags":{},"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 EF80161565\n\tfor ;\n\tFri, 11 Oct 2019 16:30:32 +0200 (CEST)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7549633A;\n\tFri, 11 Oct 2019 16:30:32 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1570804232;\n\tbh=A8KtOtdvAMM2xe7lHocUTMPauTMfZUIrbIQkSV9lwpE=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=DS4sUBAZZuPLf2P2iau8IJU4Qp02GO80Cuj8PDakI4YVMx9h7j5/7iP2k5IAtMuTu\n\tm3Z6694yJNvm+yzOXotxh8AZk0w26/FRcZWCnmJe798TYHMaopCyTmcjDZeH1/VcFb\n\tGSZrzdGhe9kL/MSKqdxwt2ZbxAc6fnsKbO2ZMFuo=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 11 Oct 2019 17:30:27 +0300","Message-Id":"<20191011143027.23310-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libamera: pipeline: rkisp1: timeline: Fix\n\tcompilation 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 14:30:33 -0000"},"content":"With gcc 5 and 6, insertion in a std::multimap copies the pair passed as\nan argument to the insert() method. As the mapped type is a non-copyable\nstd::unique_ptr<>, this fails to compile.\n\nCompilation with newer gcc versions succeed due to support for C++-17\nand the fix described in https://cplusplus.github.io/LWG/issue2354. To\nsupport gcc 5 and 6, fix the issue by using std::multimap::emplace().\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/pipeline/rkisp1/timeline.cpp | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/timeline.cpp b/src/libcamera/pipeline/rkisp1/timeline.cpp\nindex 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","prefixes":["libcamera-devel"]}