diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-03-02 07:40:19 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-03-02 07:40:19 +0100 |
| commit | c9d1e750ed4b7f20ef9a15c6e001104797fb9e73 (patch) | |
| tree | 89049372c2b4e5d70d0918bba1f7e90fe6fa20d0 | |
| parent | 7c0406b34ff014242860fbea62fc8c33b05f7696 (diff) | |
| parent | 04e2ce79365b3a1fe2569b71eb21469228626f6d (diff) | |
| download | ATCD-c9d1e750ed4b7f20ef9a15c6e001104797fb9e73.tar.gz | |
Merge pull request #19 from jwillemsen/master
Fixed Coverity reported issues
| -rw-r--r-- | ACE/ace/Log_Record.cpp | 2 | ||||
| -rw-r--r-- | ACE/examples/Reactor/TP_Reactor/client.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp index bbf28618d5d..1c6a67294db 100644 --- a/ACE/ace/Log_Record.cpp +++ b/ACE/ace/Log_Record.cpp @@ -360,7 +360,7 @@ operator>> (ACE_InputCDR &cdr, && (cdr >> buffer_len)) { ACE_TCHAR *log_msg; ACE_NEW_RETURN (log_msg, ACE_TCHAR[buffer_len + 1], -1); - auto_ptr<ACE_TCHAR> log_msg_p (log_msg); + ACE_Auto_Array_Ptr<ACE_TCHAR> log_msg_p (log_msg); log_record.type (type); log_record.pid (pid); log_record.time_stamp (ACE_Time_Value (ACE_Utils::truncate_cast<time_t> (sec), diff --git a/ACE/examples/Reactor/TP_Reactor/client.cpp b/ACE/examples/Reactor/TP_Reactor/client.cpp index a946d6bef07..eb6deecf8ee 100644 --- a/ACE/examples/Reactor/TP_Reactor/client.cpp +++ b/ACE/examples/Reactor/TP_Reactor/client.cpp @@ -51,8 +51,8 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) { ACE_TEXT ("%N:%l: Failed to allocate ") ACE_TEXT ("data buffer.\n")), -1); - // put someData in an auto_ptr so it gets deleted automatically - auto_ptr<char> pSomeData(someData); + // put someData in a kind of auto_ptr so it gets deleted automatically + ACE_Auto_Array_Ptr<char> pSomeData(someData); // parse the <count> argument if available if ((argc == 3) && (((count = ACE_OS::strtol(argv[2], 0, 10)) < 1) || |