[complement-svn] SF.net SVN: complement: [1699] trunk/complement/explore

[<com...@us...>]

Revision: 1699
          http://complement.svn.sourceforge.net/complement/?rev=1699&view=rev
Author:   complement
Date:     2007-08-23 01:46:41 -0700 (Thu, 23 Aug 2007)

Log Message:
-----------
explicitly inhibit copy of basic_sockmgr and sockmgr_stream_MP.
libsockios: Version 1.12.1

Modified Paths:
--------------
    trunk/complement/explore/include/sockios/sockmgr.h
    trunk/complement/explore/lib/sockios/ChangeLog
    trunk/complement/explore/lib/sockios/Makefile.inc

Modified: trunk/complement/explore/include/sockios/sockmgr.h
===================================================================
--- trunk/complement/explore/include/sockios/sockmgr.h	2007-08-18 05:13:06 UTC (rev 1698)
+++ trunk/complement/explore/include/sockios/sockmgr.h	2007-08-23 08:46:41 UTC (rev 1699)
@@ -102,6 +102,10 @@
       }
 
   private:
+    basic_sockmgr( const basic_sockmgr& );
+    basic_sockmgr& operator =( const basic_sockmgr& );
+
+  private:
     sock_base::socket_type _fd;    // master socket
     unsigned long _mode;  // open mode
     unsigned long _state; // state flags
@@ -190,6 +194,11 @@
     ~sockmgr_stream_MP()
       { loop_id.join(); }
 
+  private:
+    sockmgr_stream_MP( const sockmgr_stream_MP<Connect>& );
+    sockmgr_stream_MP<Connect>& operator =( const sockmgr_stream_MP<Connect>& );
+
+  public:
     void open( const in_addr& addr, int port, sock_base::stype t = sock_base::sock_stream );
     void open( unsigned long addr, int port, sock_base::stype t = sock_base::sock_stream );
     void open( int port, sock_base::stype t = sock_base::sock_stream );
@@ -315,7 +324,7 @@
     bool _shift_fd();
     static void _close_by_signal( int );
     bool _is_follow() const
-      { MT_REENTRANT( _flock, _1 ); return _follow; }
+      { xmt::scoped_lock lk( _flock ); bool tmp = _follow; return tmp; }
 };
 
 #endif // !__FIT_NO_POLL

Modified: trunk/complement/explore/lib/sockios/ChangeLog
===================================================================
--- trunk/complement/explore/lib/sockios/ChangeLog	2007-08-18 05:13:06 UTC (rev 1698)
+++ trunk/complement/explore/lib/sockios/ChangeLog	2007-08-23 08:46:41 UTC (rev 1699)
@@ -1,3 +1,10 @@
+2007-08-23  Petr Ovtchenkov  <pt...@is...>
+
+	* sockmgr.h: explicitly inhibit copy of basic_sockmgr and
+	sockmgr_stream_MP.
+
+	* libsockios: Version 1.12.1.
+
 2007-08-03  Petr Ovtchenkov  <pt...@is...>
 
 	* include/sockios/sockstream: workaround for file openmode

Modified: trunk/complement/explore/lib/sockios/Makefile.inc
===================================================================
--- trunk/complement/explore/lib/sockios/Makefile.inc	2007-08-18 05:13:06 UTC (rev 1698)
+++ trunk/complement/explore/lib/sockios/Makefile.inc	2007-08-23 08:46:41 UTC (rev 1699)
@@ -3,7 +3,7 @@
 LIBNAME = sockios
 MAJOR = 1
 MINOR = 12
-PATCH = 0
+PATCH = 1
 SRC_CC = _sockstream.cc _sockmgr.cc
 SRC_C = freebsd/getaddrinfo.c \
         freebsd/ns_parse.c \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.