From patchwork Thu Dec 5 09:23:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 22170 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 78BA7BDB1C for ; Thu, 5 Dec 2024 09:23:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B3ECD660E4; Thu, 5 Dec 2024 10:23:07 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=protonmail.com header.i=@protonmail.com header.b="MHPZAkku"; dkim-atps=neutral Received: from mail-10630.protonmail.ch (mail-10630.protonmail.ch [79.135.106.30]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DB52B618B3 for ; Thu, 5 Dec 2024 10:23:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1733390584; x=1733649784; bh=/HBCYxzo/mYXXrnROpMGyNTt7kYNk/XpF633OeIROQQ=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=MHPZAkku6DbOlzt2bZFZAgkLKxoRxDoThjYEjqJbVHmWUq8hJLMDxrRW3oLoZwbfT +WB7aGrFtF//BQ8Mcy4PHjZ4XiMVNpf3F9uCse3V4JrPl2QpfmxB7It+ksyziGx7BC ZGP3gBKEA+fj2uuVuIMz3aPP5qVMSoNBWYkSJYXb6Zalq/2wlxAH05+PxnZFRmVNvA SZpbKWE7ZOVEBdPEoS+9u6wPZ4JgTo6QrrBNoUfFGNdeUNslfKq61/7eTG3B73a1pd /uCc6UmzN4diGKylk8g5jLyOCeIT/ZktT2pPOEE+wzqPUc8VJI6AGQp4xCd/pd4YDj m0OqXnw6OuVKA== Date: Thu, 05 Dec 2024 09:23:00 +0000 To: libcamera-devel@lists.libcamera.org From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= Subject: [PATCH v2 1/2] libcamera: utils: StringSplitter: Inline some trivial methods Message-ID: <20241205092258.1058077-1-pobrn@protonmail.com> Feedback-ID: 20568564:user:proton X-Pm-Message-ID: ea303a1fe8ad60eaf8f7ea36f3cac943db67a375 MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Inline some of the more trivial methods so that they can be inlined by the compiler. Signed-off-by: Barnabás Pőcze Reviewed-by: Laurent Pinchart --- include/libcamera/base/utils.h | 17 ++++++++++++++--- src/libcamera/base/utils.cpp | 15 --------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/include/libcamera/base/utils.h b/include/libcamera/base/utils.h index 957150cb..c4a06660 100644 --- a/include/libcamera/base/utils.h +++ b/include/libcamera/base/utils.h @@ -204,7 +204,11 @@ public: iterator &operator++(); std::string operator*() const; - bool operator!=(const iterator &other) const; + + bool operator!=(const iterator &other) const + { + return pos_ != other.pos_; + } private: const StringSplitter *ss_; @@ -212,8 +216,15 @@ public: std::string::size_type next_; }; - iterator begin() const; - iterator end() const; + iterator begin() const + { + return { this, 0 }; + } + + iterator end() const + { + return { this, std::string::npos }; + } private: std::string str_; diff --git a/src/libcamera/base/utils.cpp b/src/libcamera/base/utils.cpp index 67e5a896..bcfc1941 100644 --- a/src/libcamera/base/utils.cpp +++ b/src/libcamera/base/utils.cpp @@ -276,21 +276,6 @@ std::string details::StringSplitter::iterator::operator*() const return ss_->str_.substr(pos_, count); } -bool details::StringSplitter::iterator::operator!=(const details::StringSplitter::iterator &other) const -{ - return pos_ != other.pos_; -} - -details::StringSplitter::iterator details::StringSplitter::begin() const -{ - return iterator(this, 0); -} - -details::StringSplitter::iterator details::StringSplitter::end() const -{ - return iterator(this, std::string::npos); -} - /** * \fn template \ * std::string utils::join(const Container &items, const std::string &sep, UnaryOp op)