Merge branch 'master' of https://shmqueue

wangzhengquan

2020-08-23 3c4b18f39e06a09a05a13476f212d4deaa1e4707

 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
#endif