[Com0com-cvs] hub4com/plugins/tcp comio.cpp, 1.4, 1.5 comparams.cpp, 1.2, 1.3 comport.cpp, 1.6, 1.7
The virtual serial port driver for Windows.
Brought to you by:
vfrolov
From: Vyacheslav F. <vf...@us...> - 2008-11-13 07:41:13
|
Update of /cvsroot/com0com/hub4com/plugins/tcp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5992 Modified Files: comio.cpp comparams.cpp comport.cpp comport.h import.h port.cpp Log Message: Changed for staticaly linking Index: comport.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/comport.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** comport.cpp 22 Oct 2008 15:31:38 -0000 1.6 --- comport.cpp 13 Nov 2008 07:41:09 -0000 1.7 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.7 2008/11/13 07:41:09 vfrolov + * Changed for staticaly linking + * * Revision 1.6 2008/10/22 15:31:38 vfrolov * Fixed race condition *************** *** 41,49 **** #include "precomp.h" #include "comport.h" #include "comio.h" #include "comparams.h" #include "import.h" - /////////////////////////////////////////////////////////////// Listener::Listener(const struct sockaddr_in &_snLocal) --- 44,55 ---- #include "precomp.h" + #include "../plugins_api.h" + /////////////////////////////////////////////////////////////// + namespace PortTcp { + /////////////////////////////////////////////////////////////// #include "comport.h" #include "comio.h" #include "comparams.h" #include "import.h" /////////////////////////////////////////////////////////////// Listener::Listener(const struct sockaddr_in &_snLocal) *************** *** 100,104 **** SOCKET Listener::Accept() { ! return ::Accept(hSockListen); } /////////////////////////////////////////////////////////////// --- 106,110 ---- SOCKET Listener::Accept() { ! return PortTcp::Accept(hSockListen); } /////////////////////////////////////////////////////////////// *************** *** 551,552 **** --- 557,560 ---- } /////////////////////////////////////////////////////////////// + } // end namespace + /////////////////////////////////////////////////////////////// Index: comparams.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/comparams.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** comparams.cpp 6 Oct 2008 12:15:14 -0000 1.2 --- comparams.cpp 13 Nov 2008 07:41:09 -0000 1.3 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.3 2008/11/13 07:41:09 vfrolov + * Changed for staticaly linking + * * Revision 1.2 2008/10/06 12:15:14 vfrolov * Added --reconnect option *************** *** 29,34 **** #include "precomp.h" #include "comparams.h" - /////////////////////////////////////////////////////////////// ComParams::ComParams() --- 32,39 ---- #include "precomp.h" + /////////////////////////////////////////////////////////////// + namespace PortTcp { + /////////////////////////////////////////////////////////////// #include "comparams.h" /////////////////////////////////////////////////////////////// ComParams::ComParams() *************** *** 54,55 **** --- 59,62 ---- } /////////////////////////////////////////////////////////////// + } // end namespace + /////////////////////////////////////////////////////////////// Index: port.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/port.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** port.cpp 6 Oct 2008 12:15:14 -0000 1.6 --- port.cpp 13 Nov 2008 07:41:09 -0000 1.7 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.7 2008/11/13 07:41:09 vfrolov + * Changed for staticaly linking + * * Revision 1.6 2008/10/06 12:15:14 vfrolov * Added --reconnect option *************** *** 41,48 **** #include "precomp.h" #include "comparams.h" #include "comport.h" #include "import.h" - /////////////////////////////////////////////////////////////// static const char *GetParam(const char *pArg, const char *pPattern) --- 44,54 ---- #include "precomp.h" + #include "../plugins_api.h" + /////////////////////////////////////////////////////////////// + namespace PortTcp { + /////////////////////////////////////////////////////////////// #include "comparams.h" #include "comport.h" #include "import.h" /////////////////////////////////////////////////////////////// static const char *GetParam(const char *pArg, const char *pPattern) *************** *** 337,338 **** --- 343,346 ---- } /////////////////////////////////////////////////////////////// + } // end namespace + /////////////////////////////////////////////////////////////// Index: comport.h =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/comport.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** comport.h 6 Oct 2008 12:15:14 -0000 1.3 --- comport.h 13 Nov 2008 07:41:09 -0000 1.4 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.4 2008/11/13 07:41:09 vfrolov + * Changed for staticaly linking + * * Revision 1.3 2008/10/06 12:15:14 vfrolov * Added --reconnect option *************** *** 34,39 **** #define _COMPORT_H - #include "../plugins_api.h" - /////////////////////////////////////////////////////////////// class ComParams; --- 37,40 ---- Index: import.h =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/import.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** import.h 27 Mar 2008 17:19:18 -0000 1.1 --- import.h 13 Nov 2008 07:41:09 -0000 1.2 *************** *** 20,27 **** * * $Log$ * Revision 1.1 2008/03/27 17:19:18 vfrolov * Initial revision * - * */ --- 20,29 ---- * * $Log$ + * Revision 1.2 2008/11/13 07:41:09 vfrolov + * Changed for staticaly linking + * * Revision 1.1 2008/03/27 17:19:18 vfrolov * Initial revision * */ *************** *** 29,34 **** #define _IMPORT_H - #include "../plugins_api.h" - /////////////////////////////////////////////////////////////// extern ROUTINE_BUF_ALLOC *pBufAlloc; --- 31,34 ---- Index: comio.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/comio.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** comio.cpp 22 Oct 2008 15:31:38 -0000 1.4 --- comio.cpp 13 Nov 2008 07:41:09 -0000 1.5 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.5 2008/11/13 07:41:09 vfrolov + * Changed for staticaly linking + * * Revision 1.4 2008/10/22 15:31:38 vfrolov * Fixed race condition *************** *** 35,42 **** #include "precomp.h" #include "comio.h" #include "comport.h" #include "import.h" - /////////////////////////////////////////////////////////////// static void TraceError(DWORD err, const char *pFmt, ...) --- 38,48 ---- #include "precomp.h" + #include "../plugins_api.h" + /////////////////////////////////////////////////////////////// + namespace PortTcp { + /////////////////////////////////////////////////////////////// #include "comio.h" #include "comport.h" #include "import.h" /////////////////////////////////////////////////////////////// static void TraceError(DWORD err, const char *pFmt, ...) *************** *** 549,550 **** --- 555,558 ---- } /////////////////////////////////////////////////////////////// + } // end namespace + /////////////////////////////////////////////////////////////// |