From patchwork Wed Feb 18 17:36:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 44790 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C85AF21554 for ; Wed, 18 Feb 2015 17:37:34 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id b15sf2262861eek.0 for ; Wed, 18 Feb 2015 09:37:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=8QV3pRDtJb5a3R4sKIQlIUlSVe2yvKnWkfBjFp8Cy5o=; b=CknYj26Y6sog72T4I04jhR8fcIIgDCPGlNI41cVTfFp5kJ9DFshX69u2zN4soBYHMy rUNy7QHyhlyS4z/ug3Wlnqn7wrsPjVffImCp4X+/KXCSuN+nIn1KzPY4t5rwCZ64dpGy 1D1aUGTw6dmwhEcOtCKJVwes4QgAA9i+HF9wgGyCS5/HN6KK/6XeGvxwSNlyqN3eKkpr XU9T5ycRz7LlEJEm0J1YnbLtDAimjPjJHJ2mkCYszp9H9x9DaPce7Bez5LVds2RiaOiI W/EsaXO7yKvc3XC7XODZOEfB8T8V3XWLUPW9XTkKeXHfENbZ1cI+W/mlECDE2S+qkG9j 80Lg== X-Gm-Message-State: ALoCoQkDrSMkPQKmXtHkC2W/4Y+QPOk/xgDhd6Y+29QSnxE6T6upIwua47l9uVgQtBOzmlSZYB95 X-Received: by 10.112.99.37 with SMTP id en5mr68229lbb.17.1424281053801; Wed, 18 Feb 2015 09:37:33 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.129 with SMTP id rc1ls50719lac.48.gmail; Wed, 18 Feb 2015 09:37:33 -0800 (PST) X-Received: by 10.152.191.135 with SMTP id gy7mr287400lac.91.1424281053542; Wed, 18 Feb 2015 09:37:33 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id jl10si12990985lbc.64.2015.02.18.09.37.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Feb 2015 09:37:33 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbjb6 with SMTP id b6so2606213lbj.12 for ; Wed, 18 Feb 2015 09:37:33 -0800 (PST) X-Received: by 10.112.40.201 with SMTP id z9mr260811lbk.117.1424281053405; Wed, 18 Feb 2015 09:37:33 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp2999643lbj; Wed, 18 Feb 2015 09:37:32 -0800 (PST) X-Received: by 10.140.131.9 with SMTP id 9mr2312574qhd.59.1424281051938; Wed, 18 Feb 2015 09:37:31 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id q204si13438641qha.74.2015.02.18.09.37.27 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 18 Feb 2015 09:37:31 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YO8Yu-0006eO-6b; Wed, 18 Feb 2015 17:37:24 +0000 Received: from mail-qg0-f54.google.com ([209.85.192.54]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YO8Yp-0006eI-B3 for lng-odp@lists.linaro.org; Wed, 18 Feb 2015 17:37:19 +0000 Received: by mail-qg0-f54.google.com with SMTP id z60so2054785qgd.13 for ; Wed, 18 Feb 2015 09:37:14 -0800 (PST) X-Received: by 10.229.64.67 with SMTP id d3mr3184194qci.9.1424281034127; Wed, 18 Feb 2015 09:37:14 -0800 (PST) Received: from mike-desktop.?.holmesfamily.ws (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by mx.google.com with ESMTPSA id e13sm18233143qaw.8.2015.02.18.09.37.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Feb 2015 09:37:13 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Wed, 18 Feb 2015 12:36:43 -0500 Message-Id: <1424281003-28195-1-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.1.0 X-Topics: timers patch Subject: [lng-odp] [PATCH V2] api: timer: Don't use "private" as struct member name (C++) X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mike.holmes@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Simon Kagstrom Signed-off-by: Simon Kagstrom Signed-off-by: Mike Holmes Reviewed-by: Bill Fischofer --- V2 Fixed compile example/timer/odp_timer_test.c | 2 +- include/odp/api/timer.h | 2 +- test/validation/odp_timer.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index fbadf8c..6b60ec4 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -387,7 +387,7 @@ int main(int argc, char *argv[]) tparams.min_tmo = args.min_us*ODP_TIME_USEC; tparams.max_tmo = args.max_us*ODP_TIME_USEC; tparams.num_timers = num_workers; /* One timer per worker */ - tparams.private = 0; /* Shared */ + tparams.priv = 0; /* Shared */ tparams.clk_src = ODP_CLOCK_CPU; tp = odp_timer_pool_create("timer_pool", &tparams); if (tp == ODP_TIMER_POOL_INVALID) { diff --git a/include/odp/api/timer.h b/include/odp/api/timer.h index 5b1490e..0dc9415 100644 --- a/include/odp/api/timer.h +++ b/include/odp/api/timer.h @@ -100,7 +100,7 @@ typedef struct { uint64_t min_tmo; /**< Minimum relative timeout in nanoseconds */ uint64_t max_tmo; /**< Maximum relative timeout in nanoseconds */ uint32_t num_timers; /**< (Minimum) number of supported timers */ - int private; /**< Shared (false) or private (true) timer pool */ + int priv; /**< Shared (false) or private (true) timer pool */ odp_timer_clk_src_t clk_src; /**< Clock source for timers */ } odp_timer_pool_param_t; diff --git a/test/validation/odp_timer.c b/test/validation/odp_timer.c index 57db959..b24c2c5 100644 --- a/test/validation/odp_timer.c +++ b/test/validation/odp_timer.c @@ -294,7 +294,7 @@ static void test_odp_timer_all(void) tparam.min_tmo = MIN; tparam.max_tmo = MAX; tparam.num_timers = num_workers * NTIMERS; - tparam.private = 0; + tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; tp = odp_timer_pool_create(NAME, &tparam); if (tp == ODP_TIMER_POOL_INVALID)