From: Ben Pfaff <blp@nicira.com>
Date: Fri, 26 Apr 2013 18:10:53 +0000 (-0700)
Subject: hmap: Make HMAP_INITIALIZER a valid initializer for a const hmap.
X-Git-Tag: sliver-openvswitch-1.10.90-3~17^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e37726e467cf5523161c1b932b979a8818c76b25;p=sliver-openvswitch.git

hmap: Make HMAP_INITIALIZER a valid initializer for a const hmap.

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@nicira.com>
---

diff --git a/lib/hmap.h b/lib/hmap.h
index 2867bfa0b..9b6d8c7b3 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 *);