Merge "citrix" branch into "master".

[openvswitch] / lib / shash.h

diff --git a/lib/shash.h b/lib/shash.h
index fd8b9d8e92f9be2b91e1264b53a4649e4b066274..3a6e2778861503aa7604a3f0ce296682739a20e8 100644 (file)
--- a/lib/shash.h
+++ b/lib/shash.h
@@ -19,6 +19,10 @@
 
 #include "hmap.h"
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 struct shash_node {
     struct hmap_node node;
     char *name;
@@ -41,6 +45,7 @@ struct shash {
 void shash_init(struct shash *);
 void shash_destroy(struct shash *);
 void shash_swap(struct shash *, struct shash *);
+void shash_moved(struct shash *);
 void shash_clear(struct shash *);
 bool shash_is_empty(const struct shash *);
 size_t shash_count(const struct shash *);
@@ -54,4 +59,8 @@ struct shash_node *shash_first(const struct shash *);
 const struct shash_node **shash_sort(const struct shash *);
 bool shash_equal_keys(const struct shash *, const struct shash *);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* shash.h */