summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-03-01 07:35:40 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-03-01 07:35:40 +0000
commit7f07e5bd6fa05631d65c9eb4ca35468a4928d4da (patch)
tree9a0d321a17f582455b0e379cfbdbb85e8bcf7ec3
parent26c6bbc34b93412edfb70f487353f4bcb1d6efe3 (diff)
downloadATCD-7f07e5bd6fa05631d65c9eb4ca35468a4928d4da.tar.gz
ChangelogTag: Wed Mar 1 07:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--examples/Reactor/TP_Reactor/AcceptHandler.cpp3
-rw-r--r--examples/Reactor/TP_Reactor/server.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/Reactor/TP_Reactor/AcceptHandler.cpp b/examples/Reactor/TP_Reactor/AcceptHandler.cpp
index aefb022eaed..1e1d2c3aab0 100644
--- a/examples/Reactor/TP_Reactor/AcceptHandler.cpp
+++ b/examples/Reactor/TP_Reactor/AcceptHandler.cpp
@@ -63,7 +63,8 @@ int AcceptHandler::handle_input(ACE_HANDLE) {
ACE_INET_Addr clientAddr;
// create a new ReadHandler
- ReadHandler *reader = new (std::nothrow) ReadHandler();
+ ReadHandler *reader = 0;
+ ACE_NEW_NORETURN (reader, ReadHandler());
if (reader == 0)
ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to allocate " \
"reader. (errno = %i: %m)\n"), errno), -1);
diff --git a/examples/Reactor/TP_Reactor/server.cpp b/examples/Reactor/TP_Reactor/server.cpp
index c49222ff1eb..a028c67fcf4 100644
--- a/examples/Reactor/TP_Reactor/server.cpp
+++ b/examples/Reactor/TP_Reactor/server.cpp
@@ -41,7 +41,8 @@ int ACE_TMAIN(int, ACE_TCHAR **) {
ACE_Reactor reactor(&tpReactor);
// create a new accept handler using that reactor
- AcceptHandler *acceptHandler = new (std::nothrow) AcceptHandler(&reactor);
+ AcceptHandler *acceptHandler = 0;
+ ACE_NEW_NORETURN (acceptHandler, AcceptHandler(&reactor));
if (acceptHandler == 0)
ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to allocate " \
"accept handler. (errno = %i: %m)\n"), errno), -1);