diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-02-21 14:33:15 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-02-21 14:33:15 +0000 |
| commit | b02008a36dd1a219406f979662899644778c93b9 (patch) | |
| tree | 748e7e1212707f77538f24b3ffbb2d3f6865c7d4 | |
| parent | aa918986907043cebbee8817661b23e8b007705e (diff) | |
| download | ATCD-b02008a36dd1a219406f979662899644778c93b9.tar.gz | |
ChangeLogTag:Sat Feb 21 08:30:53 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ace/CDR_Base.cpp | 14 | ||||
| -rw-r--r-- | ace/CDR_Base.h | 2 | ||||
| -rw-r--r-- | ace/DEV_IO.i | 10 |
4 files changed, 19 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index 51faa979d33..38214443592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Feb 21 08:30:53 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * ace/CDR_Base.h: + * ace/CDR_Base.cpp: + Reverted this change "Fri Feb 20 17:14:46 2004 Irfan Pyarali + <irfan@oomworks.com>" as I work aout a way to handle + this. + Fri Feb 20 18:21:39 2004 Steve Huston <shuston@riverace.com> * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: @@ -10,7 +18,7 @@ Fri Feb 20 18:21:39 2004 Steve Huston <shuston@riverace.com> Fri Feb 20 17:14:46 2004 Irfan Pyarali <irfan@oomworks.com> - * ace/CDR_Base (NonNative LongLong and LongDouble): + * ace/CDR_Base.{h,cpp} (NonNative LongLong and LongDouble): Added assignment operators for these two types. diff --git a/ace/CDR_Base.cpp b/ace/CDR_Base.cpp index ad4d399e83f..dc3211c0ece 100644 --- a/ace/CDR_Base.cpp +++ b/ace/CDR_Base.cpp @@ -556,14 +556,6 @@ ACE_CDR::LongLong::operator!= (const ACE_CDR::LongLong &rhs) const return this->l != rhs.l || this->h != rhs.h; } -ACE_CDR::LongLong & -ACE_CDR::LongLong::operator= (const ACE_CDR::LongLong &rhs) -{ - this->l = rhs.l; - this->h = rhs.h; - - return *this; -} #endif /* NONNATIVE_LONGLONG */ #if defined (NONNATIVE_LONGDOUBLE) @@ -579,12 +571,6 @@ ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const return ACE_OS::memcmp (this->ld, rhs.ld, 16) != 0; } -ACE_CDR::LongDouble & -ACE_CDR::LongDouble::operator= (const ACE_CDR::LongDouble &rhs) -{ - ACE_OS::memcpy (this->ld, rhs.ld, 16); - return *this; -} #endif /* NONNATIVE_LONGDOUBLE */ #if defined(_UNICOS) && !defined(_CRAYMPP) diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h index a87b746ec51..45fde40d4bb 100644 --- a/ace/CDR_Base.h +++ b/ace/CDR_Base.h @@ -213,7 +213,6 @@ public: //@{ int operator== (const LongLong &rhs) const; int operator!= (const LongLong &rhs) const; - LongLong &operator= (const LongLong &rhs); //@} }; # endif /* no native 64 bit integer type */ @@ -276,7 +275,6 @@ public: char ld[16]; int operator== (const LongDouble &rhs) const; int operator!= (const LongDouble &rhs) const; - LongDouble &operator= (const LongDouble &rhs); // @@ also need other comparison operators. }; # endif /* ACE_SIZEOF_LONG_DOUBLE != 16 */ diff --git a/ace/DEV_IO.i b/ace/DEV_IO.i index b491d130e80..29b30d71807 100644 --- a/ace/DEV_IO.i +++ b/ace/DEV_IO.i @@ -26,11 +26,21 @@ ACE_DEV_IO::recv_n (void *buf, size_t n, size_t *bt) const { ACE_TRACE ("ACE_DEV_IO::recv_n"); +#if defined (ACE_WIN32) + ACE_UNUSED_ARG (timeout); + + return ACE::read_n (this->get_handle (), + buf, + n, + bt); +#else + return ACE::recv_n (this->get_handle (), buf, n, timeout, bt); +#endif /*ACE_WIN32*/ } ASYS_INLINE ssize_t |