diff options
| -rw-r--r-- | ChangeLog-99b | 7 | ||||
| -rw-r--r-- | TAO/ChangeLog-99c | 8 | ||||
| -rw-r--r-- | ace/SOCK_Dgram.cpp | 12 | ||||
| -rw-r--r-- | ace/SOCK_Dgram.h | 14 |
4 files changed, 20 insertions, 21 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 8cb3e7cd47c..ef45bb518eb 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,10 @@ +Tue Jul 27 14:26:37 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/SOCK_Dgram: Removed the QoS_Params from open() and + ACE_SOCK_Dgram since they don't appear to be useful. Thanks to + Vidya Narayanan <CVN065@lmpsil02.comm.mot.com> for suggesting + this. + Tue Jul 27 14:41:26 1999 Steve Huston <shuston@riverace.com> * ace/Codeset_IBM1047.cpp: Added a static variable only for HP aC++ diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 239c80583d8..4c588033024 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,7 @@ +Tue Jul 27 13:57:20 1999 Nanbor Wang <nanbor@cs.wustl.edu> + + * orbsvcs/orbsvcs/orbsvcs_static.dsp: Fixed broken custom build + Tue Jul 27 14:28:14 1999 Nanbor Wang <nanbor@cs.wustl.edu> * version_tests.dsw: Event_Service was missing from the @@ -13,8 +17,8 @@ Tue Jul 27 13:48:26 1999 David L. Levine <levine@cs.wustl.edu> Tue Jul 27 13:48:25 1999 Darrell Brunsch <brunsch@cs.wustl.edu> * examples/Quoter/Quoter_i.cpp (copy): rearranged logic - to avoid Green Hills warning about function not returning - a value. + to avoid Green Hills warning about function not returning a + value. Tue Jul 27 11:00:00 1999 David L. Levine <levine@cs.wustl.edu> diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index 497392a3cd2..ea499be700d 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -120,7 +120,6 @@ ACE_SOCK_Dgram::shared_open (const ACE_Addr &local, int ACE_SOCK_Dgram::open (const ACE_Addr &local, - const ACE_QoS_Params &qos_params, int protocol_family, int protocol, ACE_Protocol_Info *protocolinfo, @@ -140,14 +139,7 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local, protocol_family) == -1) return -1; else - // Pass the QoS parameters. - return ACE_OS::join_leaf (this->get_handle (), - ACE_reinterpret_cast (const sockaddr *, - local.get_addr ()), - local.get_size (), - qos_params) == ACE_INVALID_HANDLE - ? -1 - : 0; + return 0; } // Here's the general-purpose open routine. @@ -189,7 +181,6 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, } ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, - const ACE_QoS_Params &qos_params, int protocol_family, int protocol, ACE_Protocol_Info *protocolinfo, @@ -199,7 +190,6 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, { ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram"); if (this->open (local, - qos_params, protocol_family, protocol, protocolinfo, diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h index 61d3f5af8b7..111434a3d7e 100644 --- a/ace/SOCK_Dgram.h +++ b/ace/SOCK_Dgram.h @@ -43,10 +43,9 @@ public: // dgram that will accept datagrams at the <local> address. ACE_SOCK_Dgram (const ACE_Addr &local, - const ACE_QoS_Params &qos_params, - int protocol_family = PF_INET, - int protocol = 0, - ACE_Protocol_Info *protocolinfo = 0, + int protocol_family, + int protocol, + ACE_Protocol_Info *protocolinfo, ACE_SOCK_GROUP g = 0, u_long flags = 0, int reuse_addr = 0); @@ -62,10 +61,9 @@ public: // dgram that will accept datagrams at the <local> address. int open (const ACE_Addr &local, - const ACE_QoS_Params &qos_params, - int protocol_family = PF_INET, - int protocol = 0, - ACE_Protocol_Info *protocolinfo = 0, + int protocol_family, + int protocol, + ACE_Protocol_Info *protocolinfo, ACE_SOCK_GROUP g = 0, u_long flags = 0, int reuse_addr = 0); |