From 73c4fa813ca5dba5724b2de2102f314d52baccd6 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 30 七月 2020 10:06:31 +0800
Subject: [PATCH] fix conflict
---
src/queue/hashtable.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/queue/hashtable.c b/src/queue/hashtable.c
index eaa3ca6..84d0964 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) {
@@ -276,6 +276,7 @@
+
std::set<int> * hashtable_keyset(hashtable_t *hashtable) {
std::set<int> *keyset = new std::set<int>;
tailq_entry_t *item;
@@ -306,5 +307,3 @@
SemUtil::inc(hashtable->wlock);
return key;
}
-
-
--
Gitblit v1.8.0