diff options
-rw-r--r-- | ChangeLog-98a | 10 | ||||
-rw-r--r-- | ace/INET_Addr.cpp | 3 | ||||
-rw-r--r-- | ace/Svc_Handler.h | 19 | ||||
-rw-r--r-- | ace/config-mvs.h | 4 |
4 files changed, 25 insertions, 11 deletions
diff --git a/ChangeLog-98a b/ChangeLog-98a index 9c7b2479aa4..8a2f43433a4 100644 --- a/ChangeLog-98a +++ b/ChangeLog-98a @@ -1,3 +1,13 @@ +Sat Apr 11 12:46:08 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/config-mvs.h: Added some ACE_SIZEOF_* macros for MVS. + Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting + this. + + * ace/INET_Addr.cpp: Added a newline and a better explanation of + what went wrong if an error occurs. Thanks to Luca for + reporting this. + Sat Apr 11 11:52:29 1998 Douglas C. Schmidt <schmidt@cs.wustl.edu> * ACE version 4.4.38, released Sat Apr 11 11:52:29 1998. diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index 983f8725521..d6d6e3e8d41 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -339,7 +339,8 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); if (this->set (port_number, inet_address) == -1) ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); + ASYS_TEXT ("%p\n", + ASYS_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } // Creates a ACE_INET_Addr from a PORT_NAME and the remote diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h index bf5709125f8..30cba9a5b00 100644 --- a/ace/Svc_Handler.h +++ b/ace/Svc_Handler.h @@ -104,6 +104,10 @@ public: // Returns the underlying PEER_STREAM (used by // ACE_Acceptor::accept() and ACE_Connector::connect() factories). + void *operator new (size_t n); + // Overloaded new operator. This is used to unobtrusively detect + // when a Svc_Handler is allocated dynamically. + virtual void destroy (void); // Call this instead of <delete> to free up dynamically allocated // <Svc_Handlers> (otherwise you will get memory leaks). This @@ -111,9 +115,11 @@ public: // and can act accordingly (i.e., deleting it if it was allocated // dynamically, otherwise ignoring it). - void *operator new (size_t n); - // Overloaded new operator. This is used to unobtrusively detect - // when a Svc_Handler is allocated dynamically. + void operator delete (void *); + // This really should be private so that users are forced to call + // <destroy>. Unfortunately, the C++ standard doesn't allow there + // to be a public new and a private delete. It is a bad idea to + // call this method directly, so use <destroy> instead. void shutdown (void); // Close down the descriptor and unregister from the Reactor @@ -123,13 +129,6 @@ public: public: - void operator delete (void *); - // This really should be private so that users are forced to call - // destroy(). Unfortunately, the C++ standard doesn't allow there - // to be a public new and a private delete. - -public: - // Note: The following methods are not suppose to be public. But // because friendship is *not* inherited in C++, these methods have // to be public. diff --git a/ace/config-mvs.h b/ace/config-mvs.h index f0d2042c61f..3f219050613 100644 --- a/ace/config-mvs.h +++ b/ace/config-mvs.h @@ -106,5 +106,9 @@ # define ACE_NTRACE 1 #endif /* ACE_NTRACE */ +#define ACE_SIZEOF_FLOAT 4 +#define ACE_SIZEOF_DOUBLE 4 +#define ACE_SIZEOF_LONG_DOUBLE 4 + #endif /* ACE_CONFIG_H */ |