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/hashtable.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/queue/hashtable.c b/src/queue/hashtable.c
index eaa3ca6..a7a82ed 100755
--- a/src/queue/hashtable.c
+++ b/src/queue/hashtable.c
@@ -231,7 +231,7 @@
-static inline void _hashtable_foreach(hashtable_t *hashtable, std::function<void(int, void *)> cb) {
+static inline void _hashtable_foreach(hashtable_t *hashtable, std::function<void(int, void *)> cb) {
tailq_entry_t *item;
for (int i = 0; i < MAPSIZE; i++) {
tailq_header_t *my_tailq_head = hashtable->array[i] ;
@@ -247,7 +247,7 @@
}
-void hashtable_foreach(hashtable_t *hashtable, hashtable_foreach_cb cb) {
+void hashtable_foreach(hashtable_t *hashtable, std::function<void(int, void *)> cb) {
SemUtil::dec(hashtable->mutex);
hashtable->readcnt++;
if (hashtable->readcnt == 1) {
@@ -273,7 +273,6 @@
SemUtil::inc(hashtable->mutex);
}
-
std::set<int> * hashtable_keyset(hashtable_t *hashtable) {
@@ -306,5 +305,3 @@
SemUtil::inc(hashtable->wlock);
return key;
}
-
-
--
Gitblit v1.8.0