change modulecomm.h use old version.

include/modulecomm.h

@@ -1,15 +1,11 @@
-#ifndef MODULECOMM_H
+#ifndef MODULECOMM_H
 #define MODULECOMM_H
 
-
 #include <QtCore/qglobal.h>
 #include <QDateTime>
 
 #include <functional>
 
-
-
-
 #if defined(MODULECOMM_LIBRARY)
 #  define MODULECOMMSHARED_EXPORT Q_DECL_EXPORT
 #else
@@ -18,45 +14,18 @@
 
 
 
-
-
-
 //#include <iostream>
 //#include <thread>
 
 //using namespace std::placeholders;
-
-#ifndef IV_MODULE_FUN
-
 typedef std::function<void(const char * ,const unsigned int , const unsigned int , QDateTime * ,const char *)> ModuleFun;
 typedef void (* SMCallBack)(const char * strdata,const unsigned int nSize,const unsigned int index,const QDateTime * dt,const char * strmemname);
-#define IV_MODULE_FUN
-#endif
 
 namespace iv {
 namespace modulecomm {
-
-enum ModuleComm_TYPE
-{
-    ModuleComm_SHAREMEM = 0,
-    ModuleComm_INTERIOR = 1,
-    ModuleComm_FASTRTPS = 2,
-    ModuleComm_FASTRTPS_TCP = 3
-};
-
-
-void * MODULECOMMSHARED_EXPORT RegisterSend(const char * strcommname,const unsigned int nBufSize,const unsigned int nMsgBufCount
-                                            ,ModuleComm_TYPE xmctype = ModuleComm_SHAREMEM,const unsigned short nport = 5100);
-void * MODULECOMMSHARED_EXPORT RegisterRecv(const char * strcommname,SMCallBack pCall,
-                                            ModuleComm_TYPE xmctype = ModuleComm_SHAREMEM,const char * strip = 0,const unsigned short = 5100);
-void * MODULECOMMSHARED_EXPORT RegisterRecvPlus(const char * strcommname,ModuleFun xFun,
-                                                ModuleComm_TYPE xmctype = ModuleComm_SHAREMEM,const char * strip = 0,const unsigned short = 5100);
-
-
 void * MODULECOMMSHARED_EXPORT RegisterSend(const char * strcommname,const unsigned int nBufSize,const unsigned int nMsgBufCount);
 void * MODULECOMMSHARED_EXPORT RegisterRecv(const char * strcommname,SMCallBack pCall);
 void * MODULECOMMSHARED_EXPORT RegisterRecvPlus(const char * strcommname,ModuleFun xFun);
-
 void MODULECOMMSHARED_EXPORT ModuleSendMsg(void * pHandle,const char * strdata,const unsigned int nDataLen);
 void MODULECOMMSHARED_EXPORT Unregister(void * pHandle);
 void MODULECOMMSHARED_EXPORT PauseComm(void * pHandle);
@@ -66,4 +35,6 @@ void MODULECOMMSHARED_EXPORT ContintuComm(void * pHandle);
 
 }
 
-#endif // MODULECOMM_H
+
+
+#endif 

src1/common/modulecomm/modulecomm.cpp

@@ -19,10 +19,6 @@ struct ModeduleInfo
 };
 
 
-void * RegisterSend(const char *strcommname, const unsigned int nBufSize, const unsigned int nMsgBufCount)
-{
-    return RegisterSend(strcommname,nBufSize,nMsgBufCount,ModuleComm_SHAREMEM);
-}
 
 void *  RegisterSend(const char * strcommname,const unsigned int nBufSize,const unsigned int nMsgBufCount,
                      ModuleComm_TYPE xmctype,const unsigned short nport)
@@ -71,11 +67,6 @@ void *  RegisterSend(const char * strcommname,const unsigned int nBufSize,const
 }
 
 
-void * RegisterRecv(const char *strcommname, SMCallBack pCall)
-{
-    return RegisterRecv(strcommname,pCall,ModuleComm_SHAREMEM);
-}
-
 void  *  RegisterRecv(const char * strcommname,SMCallBack pCall,ModuleComm_TYPE xmctype,const char * strip,
                       const unsigned short nPort)
 {
@@ -121,11 +112,6 @@ void  *  RegisterRecv(const char * strcommname,SMCallBack pCall,ModuleComm_TYPE
     return pmi;
 }
 
-void * RegisterRecvPlus(const char *strcommname, ModuleFun xFun)
-{
-    return RegisterRecvPlus(strcommname,xFun,ModuleComm_SHAREMEM);
-}
-
 void *  RegisterRecvPlus(const char * strcommname,ModuleFun xFun,
                                                 ModuleComm_TYPE xmctype,const char * strip,
                          const unsigned short nPort)

src1/common/modulecomm/modulecomm.h

@@ -52,11 +52,6 @@ void * MODULECOMMSHARED_EXPORT RegisterRecv(const char * strcommname,SMCallBack
 void * MODULECOMMSHARED_EXPORT RegisterRecvPlus(const char * strcommname,ModuleFun xFun,
                                                 ModuleComm_TYPE xmctype = ModuleComm_SHAREMEM,const char * strip = 0,const unsigned short = 5100);
 
-
-void * MODULECOMMSHARED_EXPORT RegisterSend(const char * strcommname,const unsigned int nBufSize,const unsigned int nMsgBufCount);
-void * MODULECOMMSHARED_EXPORT RegisterRecv(const char * strcommname,SMCallBack pCall);
-void * MODULECOMMSHARED_EXPORT RegisterRecvPlus(const char * strcommname,ModuleFun xFun);
-
 void MODULECOMMSHARED_EXPORT ModuleSendMsg(void * pHandle,const char * strdata,const unsigned int nDataLen);
 void MODULECOMMSHARED_EXPORT Unregister(void * pHandle);
 void MODULECOMMSHARED_EXPORT PauseComm(void * pHandle);