From 695953440565103964e816e7326c66f3d171c3e0 Mon Sep 17 00:00:00 2001
From: jimi-wzq <wangzhengquan85@gmail.com>
Date: 星期六, 01 八月 2020 10:48:18 +0800
Subject: [PATCH] fix conflict

---
 src/queue/include/hashtable.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/queue/include/hashtable.h b/src/queue/include/hashtable.h
index c1fba98..b8edaa3 100755
--- a/src/queue/include/hashtable.h
+++ b/src/queue/include/hashtable.h
@@ -31,7 +31,7 @@
  * });
  * 
 */
-void hashtable_foreach(hashtable_t *hashtable, hashtable_foreach_cb cb);
+void hashtable_foreach(hashtable_t *hashtable, std::function<void(int, void *)>  cb);
 
 // void hashtable_printall(hashtable_t *hashtable);
 

--
Gitblit v1.8.0