diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-12-02 16:35:58 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-12-02 16:35:58 +0000 |
| commit | 64aa7aa7af9f46fbd6d2c25c5201f0797e096a27 (patch) | |
| tree | 96fb0121de2a3e5804fb9d4f87b9ddffe4396fda | |
| parent | 10136b9c0c09a571374c9fffb7574529319a1cff (diff) | |
| download | ATCD-64aa7aa7af9f46fbd6d2c25c5201f0797e096a27.tar.gz | |
(inet_aton): removed CHORUS specialization.
| -rw-r--r-- | ace/OS.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp index 061eb718422..e72f3fe73e6 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -91,15 +91,15 @@ ACE_Cleanup_Info::ACE_Cleanup_Info (void) { } -int +int ACE_Cleanup_Info::operator== (const struct ACE_Cleanup_Info &o) const { - return o.object_ == this->object_ + return o.object_ == this->object_ && o.cleanup_hook_ == this->cleanup_hook_ && o.param_ == this->param_; } -int +int ACE_Cleanup_Info::operator!= (const struct ACE_Cleanup_Info &o) const { return !(*this == o); @@ -3031,9 +3031,6 @@ ACE_Thread_ID::operator!= (const ACE_Thread_ID &rhs) int ACE_OS::inet_aton (const char *host_name, struct in_addr *addr) { -#if defined (CHORUS) - return ::inet_aton(host_name, addr); -#else ACE_UINT32 ip_addr = ACE_OS::inet_addr (host_name); if (ip_addr == (ACE_UINT32) htonl ((ACE_UINT32) ~0) // Broadcast addresses are weird... @@ -3046,7 +3043,6 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr) } else return 1; -#endif /* CHORUS */ } ssize_t |