{"id":22452,"url":"https://patchwork.libcamera.org/api/patches/22452/?format=json","web_url":"https://patchwork.libcamera.org/patch/22452/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20250103-nodiscard-redef-v1-1-aa7559c8ebe3@baylibre.com>","date":"2025-01-03T14:02:50","name":"libcamera: base: Don't redefine __nodiscard","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8aaf4d7140e447caea5962d6ac4f898efecf95a4","submitter":{"id":153,"url":"https://patchwork.libcamera.org/api/people/153/?format=json","name":"Mattijs Korpershoek","email":"mkorpershoek@baylibre.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22452/mbox/","series":[{"id":4928,"url":"https://patchwork.libcamera.org/api/series/4928/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4928","date":"2025-01-03T14:02:50","name":"libcamera: base: Don't redefine __nodiscard","version":1,"mbox":"https://patchwork.libcamera.org/series/4928/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22452/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22452/checks/","tags":{},"headers":{"Return-Path":"","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 89413BDB1C\n\tfor ;\n\tFri, 3 Jan 2025 14:03:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A5297684DF;\n\tFri, 3 Jan 2025 15:02:59 +0100 (CET)","from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com\n\t[IPv6:2a00:1450:4864:20::42e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F2582684D0\n\tfor ;\n\tFri, 3 Jan 2025 15:02:57 +0100 (CET)","by mail-wr1-x42e.google.com with SMTP id\n\tffacd0b85a97d-385e0e224cbso6168591f8f.2\n\tfor ;\n\tFri, 03 Jan 2025 06:02:57 -0800 (PST)","from [192.168.1.20] ([2a01:cb19:95ba:5000:d6dd:417f:52ac:335b])\n\tby smtp.gmail.com with ESMTPSA id\n\tffacd0b85a97d-38a1c829120sm41879238f8f.6.2025.01.03.06.02.56\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 03 Jan 2025 06:02:56 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=baylibre-com.20230601.gappssmtp.com\n\theader.i=@baylibre-com.20230601.gappssmtp.com\n\theader.b=\"z0IRqQg/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1735912977;\n\tx=1736517777; darn=lists.libcamera.org; \n\th=cc:to:message-id:content-transfer-encoding:mime-version:subject\n\t:date:from:from:to:cc:subject:date:message-id:reply-to;\n\tbh=Lzv6R5L8ZxGVeeOnn8wbXFB7GeDmV2RzI+JYHrzegJI=;\n\tb=z0IRqQg/z4wYl95KX8bXSTgzFcF44TI6olb2u9ShBKXHmF/P6NZioT3krE//TfTz1T\n\tt68CYT1cHDNIz/7EFDZ1Hl7DLJEKeNQVO08LBv6fjjfx2k8lBvm2MpvT4XRsJdiShjas\n\tq2SNyHOeHruIBzZDU8EdlyfDU7i7zgXaTrunxZCR+xCMqTas5dPGamvMC6P0ob0L8i87\n\tXDKVFpes4/XuHIt4DVontk/QQOMPJVkKgn5VvyXaxjAsWimRObU/0Xhb8JssYI/1x2nf\n\tzRPaCh3qR77mgcoIQz7MftbU0JI9R0G08wHDjFGT+clTC8siuwolKwWMjsBEVRXTSq7x\n\tRrvA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1735912977; x=1736517777;\n\th=cc:to:message-id:content-transfer-encoding:mime-version:subject\n\t:date:from:x-gm-message-state:from:to:cc:subject:date:message-id\n\t:reply-to;\n\tbh=Lzv6R5L8ZxGVeeOnn8wbXFB7GeDmV2RzI+JYHrzegJI=;\n\tb=IAOC7Th0VUCOJtZ1edZown52RdIQSbmoOc5GnhiY6sZwTFJZJMv1h97K0/yAEW1AiN\n\tvJ/BHkFTS7Aev4xT9RK/tKAwJ00fwAxVkrX+N56drUunGVeq/z6XQsthblexBxbpG5r4\n\t19hZtysON3IOtPZqk5EZ+Iaq50tTLxnPre5hm3ZvW9D4E5/WgUWcWWeyivagywmcmkDu\n\tfnH1vxW4V7JlA4xaEJr0SITBUC5u+3rGJ2vsQyGdvhzPHMCks1HKwc/Og0G+YbMv4aX4\n\tM/x4ALHXsMlfk4F1BJzIOiKcfBF+juzi5HetWfUj6m5IpoJLR9gzAMYg02qQ9NGJRuIa\n\tOk4Q==","X-Gm-Message-State":"AOJu0YycuAsXPw36i6nlbjypKbMuh4r0Vre+NZwWqcOVl72h5nnfTH3H\n\txreGPbt1iGV/bMlTgupT/NSfEOJt61VDcuk3xImmV1ZPbaGy5c5eRhkCvNP70CxnMFocJl/8h/e\n\tk","X-Gm-Gg":"ASbGncuQMyeMB8OPvsmeAGpxSZGi+kR5uQZ/x1zW8psRca3U8QbRTvk4hjC2mXlD32q\n\tIzmI9QdGrt+SedYpewDmi+n1jKBJjcPoItXglfWzOdkjzd5V+oKFaPrXMJvcH92belVNs8W6cPw\n\tCkvQhLjD0pFz0FV0aT9Cd0eZMAmGgAHtkeBsZXi4MM2RCnrXRAtgeDuc88g40yiriS0m2sSjjtP\n\tigsuA132OjZnJT89xfGk1N19nNJAaFwFH01Wj9yHcdwqmgBOG/BxFmCcOcIwIJjKIetEbX6","X-Google-Smtp-Source":"AGHT+IH8kP3CfBidp+M/Jjz+TUSKhZBTGfjwmdwow5pi+BG+bBdGlfMWaLk3aJMzL0uc/lhdlWFMkA==","X-Received":"by 2002:a05:6000:481e:b0:382:49f9:74bb with SMTP id\n\tffacd0b85a97d-38a2220120dmr44244438f8f.35.1735912977198; \n\tFri, 03 Jan 2025 06:02:57 -0800 (PST)","From":"Mattijs Korpershoek ","Date":"Fri, 03 Jan 2025 15:02:50 +0100","Subject":"[PATCH] libcamera: base: Don't redefine __nodiscard","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20250103-nodiscard-redef-v1-1-aa7559c8ebe3@baylibre.com>","X-B4-Tracking":"v=1; b=H4sIAAnud2cC/x3MTQqAIBBA4avErBP8QbCuEi3CGWs2GiNEIN49a\n\tfkt3mtQSZgqrFMDoYcrlzxg5gnideSTFOMwWG29NtqpXJBrPASVEFJSi/GBQsLokodR3UKJ3/+\n\t47b1/8xw+rmEAAAA=","X-Change-ID":"20250103-nodiscard-redef-9158e8fdc3f5","To":"libcamera-devel@lists.libcamera.org","Cc":"Guillaume La Roque , \n\tMattijs Korpershoek ","X-Mailer":"b4 0.14.3-dev-86319","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Some libc implementations (like bionic) already define the __nodiscard\nmacro [1].\n\nBuilding with bionic results in compiler error since libcamera redefines\nthe __nodiscard macro.\n\nDon't redefine __nodiscard if it's already defined.\n\n[1] https://android-review.googlesource.com/c/platform/bionic/+/3254860\n\nSigned-off-by: Mattijs Korpershoek \n---\nHi, it's been a while. I've found a (trivial) build issue when\nbuilding against recent bionic versions.\n\nI hope this is the right fix. Thanks for your review!\n---\n include/libcamera/base/compiler.h | 2 ++\n 1 file changed, 2 insertions(+)\n\n\n---\nbase-commit: 35ed4b91291d9f3d08e4b51acfb51163e65df8f8\nchange-id: 20250103-nodiscard-redef-9158e8fdc3f5\n\nBest regards,","diff":"diff --git a/include/libcamera/base/compiler.h b/include/libcamera/base/compiler.h\nindex fda8fdfdc543f86c5554e38ef790c00d72d60389..946e20d835b216446e4099b6ab6865638d9aaf26 100644\n--- a/include/libcamera/base/compiler.h\n+++ b/include/libcamera/base/compiler.h\n@@ -7,8 +7,10 @@\n \n #pragma once\n \n+#ifndef __nodiscard\n #if __cplusplus >= 201703L\n #define __nodiscard\t\t[[nodiscard]]\n #else\n #define __nodiscard\n #endif\n+#endif\n","prefixes":[]}