[ovs-dev] [const 3/9] hmap: Make HMAP_INITIALIZER a valid initializer for a const hmap.

Ben Pfaff blp at nicira.com
Wed May 1 18:21:00 UTC 2013


Without this change, an initialization such as
    const struct hmap map = HMAP_INITIALIZER(&map);
yields a compiler warning "initialization discards qualifiers from pointer
target type".

Signed-off-by: Ben Pfaff <blp at nicira.com>
---
 lib/hmap.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/hmap.h b/lib/hmap.h
index 2867bfa..9b6d8c7 100644
--- a/lib/hmap.h
+++ b/lib/hmap.h
@@ -65,7 +65,8 @@ struct hmap {
 };
 
 /* Initializer for an empty hash map. */
-#define HMAP_INITIALIZER(HMAP) { &(HMAP)->one, NULL, 0, 0 }
+#define HMAP_INITIALIZER(HMAP) \
+    { (struct hmap_node **const) &(HMAP)->one, NULL, 0, 0 }
 
 /* Initialization. */
 void hmap_init(struct hmap *);
-- 
1.7.2.5




More information about the dev mailing list