diff options
| author | Olli Savia <ops@iki.fi> | 2004-09-16 21:32:37 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2004-09-16 21:32:37 +0000 |
| commit | 1049327b848591e6c2771fb4e793f0509636fd6a (patch) | |
| tree | 4e11f562d4644ffc6a4a1ea572fa96d86f749489 | |
| parent | b8142b70e84d0fb82fab1e68744c3e98ff29e64e (diff) | |
| download | ATCD-1049327b848591e6c2771fb4e793f0509636fd6a.tar.gz | |
ChangeLogTag: Fri Sep 17 00:25:17 2004 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ace/IOStream_T.h | 12 | ||||
| -rw-r--r-- | ace/Object_Manager.cpp | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index d78a83d74af..7801fab126d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Sep 17 00:25:17 2004 Olli Savia <ops@iki.fi> + + * ace/IOStream_T.h: + * ace/Object_Manager.cpp: + Changed NULL to 0 to silence compile time warning. + Thu Sep 16 14:14:31 2004 J.T. Conklin <jtc@acorntoolworks.com> * bin/MakeProjectCreator/config/event_serv.mpb: diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h index dfcc5689f09..e6577e041d8 100644 --- a/ace/IOStream_T.h +++ b/ace/IOStream_T.h @@ -58,17 +58,17 @@ public: virtual ssize_t recv (char *buf, ssize_t len, - ACE_Time_Value *tv = NULL); + ACE_Time_Value *tv = 0); virtual ssize_t recv (char *buf, ssize_t len, int flags, - ACE_Time_Value * tv = NULL); + ACE_Time_Value * tv = 0); virtual ssize_t recv_n (char *buf, ssize_t len, int flags = 0, - ACE_Time_Value *tv = NULL); + ACE_Time_Value *tv = 0); protected: virtual ACE_HANDLE get_handle (void); @@ -262,15 +262,15 @@ public: ssize_t send_n (char *buf, ssize_t len); ssize_t recv (char *buf, ssize_t len, - ACE_Time_Value *tv = NULL); + ACE_Time_Value *tv = 0); ssize_t recv (char *buf, ssize_t len, int flags, - ACE_Time_Value *tv = NULL); + ACE_Time_Value *tv = 0); ssize_t recv_n (char *buf, ssize_t len, int flags = 0, - ACE_Time_Value *tv = NULL); + ACE_Time_Value *tv = 0); int get_remote_addr (ACE_INET_Addr &addr) const; protected: diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index c911792a188..fe1ad9d359e 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -259,7 +259,7 @@ ACE_Object_Manager::init (void) # endif /* ! ACE_LACKS_ACE_SVCCONF */ // Open the main thread's ACE_Log_Msg. - if (NULL == ACE_LOG_MSG) + if (0 == ACE_LOG_MSG) return -1; } |