From fb3f4f606659af9cbf10b0b6710fb80fcaec5627 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 18 一月 2021 10:46:44 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/socket/shm_mod_socket.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index 9ec3044..73c91c3 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -12,6 +12,7 @@
#include "socket_def.h"
#define BUS_HEAD_SIZE (64 + 2 * sizeof(uint32_t))
+class BusServerSocket;
struct bus_head_t
{
@@ -22,14 +23,13 @@
class ShmModSocket {
+friend class BusServerSocket;
private:
shm_socket_t *shm_socket;
- socket_mod_t mod;
std::set<int> *bus_set;
private:
- inline int _recvfrom_(void **buf, int *size, int *key, struct timespec *timeout, int flags);
int _sub_( char *topic, int size, int key, struct timespec *timeout, int flags);
int _pub_( char *topic, int topic_size, void *content, int content_size, int key, struct timespec *timeout, int flags);
--
Gitblit v1.8.0