From 3c4b18f39e06a09a05a13476f212d4deaa1e4707 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期日, 23 八月 2020 13:10:15 +0800
Subject: [PATCH] Merge branch 'master' of https://shmqueue
---
src/queue/include/hashtable.h | 1 +
src/socket/include/dmod_socket.h | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/queue/include/hashtable.h b/src/queue/include/hashtable.h
index b8edaa3..30affe2 100755
--- a/src/queue/include/hashtable.h
+++ b/src/queue/include/hashtable.h
@@ -2,6 +2,7 @@
#define __HASHTABLE_H__
#include <sys/queue.h>
+#include <functional>
#include <set>
#define MAPSIZE 100
diff --git a/src/socket/include/dmod_socket.h b/src/socket/include/dmod_socket.h
index b57c6b3..ecf92e7 100644
--- a/src/socket/include/dmod_socket.h
+++ b/src/socket/include/dmod_socket.h
@@ -18,7 +18,7 @@
#define BUS_MAP_KEY 1
//typedef std::basic_string<char, std::char_traits<char>, SHM_STL_Allocator<char> > SHMString;
typedef std::set<int, std::less<int>, SHM_STL_Allocator<int> > SHMKeySet;
-typedef std::map<SHMString, SHMKeySet *, std::less<SHMString>, SHM_STL_Allocator<std::pair<SHMString, SHMKeySet *> > > SHMTopicSubMap;
+typedef std::map<SHMString, SHMKeySet *, std::less<SHMString>, SHM_STL_Allocator<std::pair<const SHMString, SHMKeySet *> > > SHMTopicSubMap;
enum socket_mod_t
{
@@ -156,4 +156,4 @@
};
-#endif
\ No newline at end of file
+#endif
--
Gitblit v1.8.0