From b7228c8620a6a0b593f1d8b82af5aac7ba456a85 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 17:12:17 +0800
Subject: [PATCH] fix conflict
---
src/queue/hashtable.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/queue/hashtable.c b/src/queue/hashtable.c
index eaa3ca6..86001ef 100755
--- a/src/queue/hashtable.c
+++ b/src/queue/hashtable.c
@@ -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