diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 1997-03-05 22:00:09 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 1997-03-05 22:00:09 +0000 |
| commit | 406aee3ffa857ba44c72b9df78bc448ee3f84f3d (patch) | |
| tree | 95bcc28b56edf9ab89898d1cedc012f750718081 /TAO/IIOP | |
| parent | f48bbb501b1cda971fa44ce082c19149b3dce125 (diff) | |
| download | ATCD-406aee3ffa857ba44c72b9df78bc448ee3f84f3d.tar.gz | |
Merged in some changes from Brian Mendel enabling compilation on NT.
Modified Files:
connmgr.cpp connmgr.hh giop.hh
Diffstat (limited to 'TAO/IIOP')
| -rw-r--r-- | TAO/IIOP/lib/connmgr.cpp | 11 | ||||
| -rw-r--r-- | TAO/IIOP/lib/connmgr.hh | 2 | ||||
| -rw-r--r-- | TAO/IIOP/lib/giop.hh | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/TAO/IIOP/lib/connmgr.cpp b/TAO/IIOP/lib/connmgr.cpp index 5dd8c3a59da..a862a36377d 100644 --- a/TAO/IIOP/lib/connmgr.cpp +++ b/TAO/IIOP/lib/connmgr.cpp @@ -576,9 +576,14 @@ server_endpoint::block_for_connection ( list->refcount++; return list; } - FD_SET (list->fd, &read_fdset); +#if defined(_WIN32) +# define FDSET_CAST (SOCKET) +#else +# define FDSET_CAST +#endif + FD_SET (FDSET_CAST list->fd, &read_fdset); if (list->fd > max_fd) - max_fd = list->fd; + max_fd = FDSET_CAST list->fd; } } @@ -724,7 +729,7 @@ server_endpoint::block_for_connection ( void server_endpoint::shutdown_connections ( - void (*close_conn) (int &, void *), + void (*close_conn) (ACE_HANDLE &, void *), void *info ) { diff --git a/TAO/IIOP/lib/connmgr.hh b/TAO/IIOP/lib/connmgr.hh index 3949da3d6d1..fd90b04a69c 100644 --- a/TAO/IIOP/lib/connmgr.hh +++ b/TAO/IIOP/lib/connmgr.hh @@ -113,7 +113,7 @@ class server_endpoint { void shutdown_connections ( // add a flag saying some, all? void (*close_conn)( - int &fd, + ACE_HANDLE &fd, void *info ), void *info diff --git a/TAO/IIOP/lib/giop.hh b/TAO/IIOP/lib/giop.hh index 0647cadbac8..70431ab9e7b 100644 --- a/TAO/IIOP/lib/giop.hh +++ b/TAO/IIOP/lib/giop.hh @@ -307,14 +307,14 @@ class GIOP { // namespace static CORBA_Boolean send_message ( CDR &stream, - int &connection + ACE_HANDLE &connection ); // // Reads message, returns message type from header // static MsgType read_message ( - int &connection, + ACE_HANDLE &connection, CDR &msg, CORBA_Environment &env ); |