From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
kevin.laatz@intel.com, cristian.dumitrescu@intel.com,
stable@dpdk.org, Jerin Jacob <jerin.jacob@caviumnetworks.com>,
Gavin Hu <gavin.hu@arm.com>
Subject: [PATCH v2 5/7] table: fix missing explicit casts for C++ build
Date: Thu, 10 Feb 2022 12:02:55 +0000 [thread overview]
Message-ID: <20220210120257.585822-6-bruce.richardson@intel.com> (raw)
In-Reply-To: <20220210120257.585822-1-bruce.richardson@intel.com>
Since C++ doesn't support automatic casting from void * to other types,
we need to explicitly add the casts to any header files in DPDK.
Fixes: ea7be0a0386e ("lib/librte_table: add hash function headers")
Cc: kevin.laatz@intel.com
Cc: cristian.dumitrescu@intel.com
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/table/rte_table_hash_func.h | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/table/rte_table_hash_func.h b/lib/table/rte_table_hash_func.h
index c4c35cc06a..a962ec2f68 100644
--- a/lib/table/rte_table_hash_func.h
+++ b/lib/table/rte_table_hash_func.h
@@ -58,8 +58,8 @@ static inline uint64_t
rte_table_hash_crc_key8(void *key, void *mask, __rte_unused uint32_t key_size,
uint64_t seed)
{
- uint64_t *k = key;
- uint64_t *m = mask;
+ uint64_t *k = (uint64_t *)key;
+ uint64_t *m = (uint64_t *)mask;
uint64_t crc0;
crc0 = rte_crc32_u64(seed, k[0] & m[0]);
@@ -72,8 +72,8 @@ static inline uint64_t
rte_table_hash_crc_key16(void *key, void *mask, __rte_unused uint32_t key_size,
uint64_t seed)
{
- uint64_t *k = key;
- uint64_t *m = mask;
+ uint64_t *k = (uint64_t *)key;
+ uint64_t *m = (uint64_t *)mask;
uint64_t k0, crc0, crc1;
k0 = k[0] & m[0];
@@ -91,8 +91,8 @@ static inline uint64_t
rte_table_hash_crc_key24(void *key, void *mask, __rte_unused uint32_t key_size,
uint64_t seed)
{
- uint64_t *k = key;
- uint64_t *m = mask;
+ uint64_t *k = (uint64_t *)key;
+ uint64_t *m = (uint64_t *)mask;
uint64_t k0, k2, crc0, crc1;
k0 = k[0] & m[0];
@@ -113,8 +113,8 @@ static inline uint64_t
rte_table_hash_crc_key32(void *key, void *mask, __rte_unused uint32_t key_size,
uint64_t seed)
{
- uint64_t *k = key;
- uint64_t *m = mask;
+ uint64_t *k = (uint64_t *)key;
+ uint64_t *m = (uint64_t *)mask;
uint64_t k0, k2, crc0, crc1, crc2, crc3;
k0 = k[0] & m[0];
@@ -139,8 +139,8 @@ static inline uint64_t
rte_table_hash_crc_key40(void *key, void *mask, __rte_unused uint32_t key_size,
uint64_t seed)
{
- uint64_t *k = key;
- uint64_t *m = mask;
+ uint64_t *k = (uint64_t *)key;
+ uint64_t *m = (uint64_t *)mask;
uint64_t k0, k2, crc0, crc1, crc2, crc3;
k0 = k[0] & m[0];
@@ -165,8 +165,8 @@ static inline uint64_t
rte_table_hash_crc_key48(void *key, void *mask, __rte_unused uint32_t key_size,
uint64_t seed)
{
- uint64_t *k = key;
- uint64_t *m = mask;
+ uint64_t *k = (uint64_t *)key;
+ uint64_t *m = (uint64_t *)mask;
uint64_t k0, k2, k5, crc0, crc1, crc2, crc3;
k0 = k[0] & m[0];
@@ -192,8 +192,8 @@ static inline uint64_t
rte_table_hash_crc_key56(void *key, void *mask, __rte_unused uint32_t key_size,
uint64_t seed)
{
- uint64_t *k = key;
- uint64_t *m = mask;
+ uint64_t *k = (uint64_t *)key;
+ uint64_t *m = (uint64_t *)mask;
uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5;
k0 = k[0] & m[0];
@@ -222,8 +222,8 @@ static inline uint64_t
rte_table_hash_crc_key64(void *key, void *mask, __rte_unused uint32_t key_size,
uint64_t seed)
{
- uint64_t *k = key;
- uint64_t *m = mask;
+ uint64_t *k = (uint64_t *)key;
+ uint64_t *m = (uint64_t *)mask;
uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5;
k0 = k[0] & m[0];
--
2.32.0
next prev parent reply other threads:[~2022-02-10 12:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220204174209.440207-1-bruce.richardson@intel.com>
[not found] ` <20220210120257.585822-1-bruce.richardson@intel.com>
2022-02-10 12:02 ` [PATCH v2 1/7] eal: fix header build with C++ Bruce Richardson
2022-02-10 12:57 ` David Marchand
2022-02-10 14:07 ` Bruce Richardson
2022-02-10 12:02 ` [PATCH v2 2/7] eventdev: " Bruce Richardson
2022-02-10 12:02 ` [PATCH v2 3/7] graph: fix missing explicit cast for C++ build Bruce Richardson
2022-02-10 12:02 ` [PATCH v2 4/7] ipsec: " Bruce Richardson
2022-02-10 12:42 ` Ananyev, Konstantin
2022-02-10 12:02 ` Bruce Richardson [this message]
2022-02-10 12:02 ` [PATCH v2 6/7] vhost: fix incompatible header includes for C++ Bruce Richardson
[not found] ` <20220210140355.586399-1-bruce.richardson@intel.com>
2022-02-10 14:03 ` [PATCH v3 1/7] eal: fix header build with C++ Bruce Richardson
2022-02-10 14:03 ` [PATCH v3 2/7] eventdev: " Bruce Richardson
2022-02-10 14:03 ` [PATCH v3 3/7] graph: fix missing explicit cast for C++ build Bruce Richardson
2022-02-10 14:03 ` [PATCH v3 4/7] ipsec: " Bruce Richardson
2022-02-10 14:03 ` [PATCH v3 5/7] table: fix missing explicit casts " Bruce Richardson
2022-02-10 14:03 ` [PATCH v3 6/7] vhost: fix incompatible header includes for C++ Bruce Richardson
[not found] ` <20220210154239.587185-1-bruce.richardson@intel.com>
2022-02-10 15:42 ` [PATCH v4 1/7] eal: fix header build with C++ Bruce Richardson
2022-02-14 9:30 ` Joyce Kong
2022-02-10 15:42 ` [PATCH v4 2/7] eventdev: " Bruce Richardson
2022-02-10 15:42 ` [PATCH v4 3/7] graph: fix missing explicit cast for C++ build Bruce Richardson
2022-02-10 15:42 ` [PATCH v4 4/7] ipsec: " Bruce Richardson
2022-02-10 15:42 ` [PATCH v4 5/7] table: fix missing explicit casts " Bruce Richardson
2022-02-10 15:42 ` [PATCH v4 6/7] vhost: fix incompatible header includes for C++ Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220210120257.585822-6-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=cristian.dumitrescu@intel.com \
--cc=dev@dpdk.org \
--cc=gavin.hu@arm.com \
--cc=jerin.jacob@caviumnetworks.com \
--cc=kevin.laatz@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).