diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-17 13:28:58 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-17 13:28:58 +0100 |
| commit | 6e71c039a2d09ef7a49e5fbf13055eb24f942b13 (patch) | |
| tree | 4ac12b62dd6738ef267a312aa5b77d5cdbb5ec4e | |
| parent | 0e5a2427fbbbc09f39398af052ce1a179a9aa188 (diff) | |
| download | ATCD-6e71c039a2d09ef7a49e5fbf13055eb24f942b13.tar.gz | |
Use unique_ptr
* ACE/examples/Logger/Acceptor-server/server_loggerd.cpp:
* ACE/examples/Logger/simple-server/Logging_Handler.cpp:
| -rw-r--r-- | ACE/examples/Logger/Acceptor-server/server_loggerd.cpp | 6 | ||||
| -rw-r--r-- | ACE/examples/Logger/simple-server/Logging_Handler.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp index 73374a72c5b..10b599142a9 100644 --- a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -13,7 +13,6 @@ #include "ace/SOCK_Acceptor.h" #include "ace/Singleton.h" #include "ace/CDR_Stream.h" -#include "ace/Auto_Ptr.h" #include "ace/Test_and_Set.h" // FUZZ: disable check_for_streams_include @@ -23,6 +22,7 @@ #include "ace/Test_and_Set.h" #include "server_loggerd.h" +#include <memory> // ---------------------------------------- @@ -111,7 +111,7 @@ Logging_Handler::handle_input (ACE_HANDLE) ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE), -1); - auto_ptr <ACE_Message_Block> header (header_p); + std::unique_ptr <ACE_Message_Block> header (header_p); // Align the Message Block for a CDR stream ACE_CDR::mb_align (header.get ()); @@ -158,7 +158,7 @@ Logging_Handler::handle_input (ACE_HANDLE) ACE_NEW_RETURN (payload_p, ACE_Message_Block (length), -1); - auto_ptr <ACE_Message_Block> payload (payload_p); + std::unique_ptr <ACE_Message_Block> payload (payload_p); // Ensure there's sufficient room for log record payload. ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length); diff --git a/ACE/examples/Logger/simple-server/Logging_Handler.cpp b/ACE/examples/Logger/simple-server/Logging_Handler.cpp index b063bb4921f..a7776fcaf87 100644 --- a/ACE/examples/Logger/simple-server/Logging_Handler.cpp +++ b/ACE/examples/Logger/simple-server/Logging_Handler.cpp @@ -3,7 +3,7 @@ #include "ace/Log_Record.h" #include "ace/OS_NS_string.h" #include "ace/CDR_Stream.h" -#include "ace/Auto_Ptr.h" +#include <memory> #include "Logging_Handler.h" #include "Reactor_Singleton.h" @@ -62,7 +62,7 @@ Logging_Handler::handle_input (ACE_HANDLE) ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE), -1); - auto_ptr <ACE_Message_Block> header (header_p); + std::unique_ptr <ACE_Message_Block> header (header_p); // Align the Message Block for a CDR stream ACE_CDR::mb_align (header.get ()); @@ -109,7 +109,7 @@ Logging_Handler::handle_input (ACE_HANDLE) ACE_NEW_RETURN (payload_p, ACE_Message_Block (length), -1); - auto_ptr <ACE_Message_Block> payload (payload_p); + std::unique_ptr <ACE_Message_Block> payload (payload_p); // Ensure there's sufficient room for log record payload. ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length); |