summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2004-11-30 20:40:18 +0000
committerbala <balanatarajan@users.noreply.github.com>2004-11-30 20:40:18 +0000
commita6da86ec2ea9741ced15e933b283f82829b24191 (patch)
treecaf9d9f93a1d7b0f6ad3a797def10928c5cc5683
parent6c84961e6f5cb834eb9eba2768c74fada28bc7a3 (diff)
downloadATCD-a6da86ec2ea9741ced15e933b283f82829b24191.tar.gz
ChangeLogTag:Tue Nov 30 20:39:26 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/CIDLC/ServantSourceGenerator.cpp6
-rw-r--r--TAO/CIAO/ChangeLog6
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index 816b777d210..3ff2fea01a7 100644
--- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -790,11 +790,11 @@ namespace
<< STRS[EXCP_SNGL] << endl
<< "{"
<< u.scoped_name () << "Connections *tmp_retv;"
- << "ACE_NEW_RETURN (" << endl
+ << "ACE_NEW_THROW_EX (" << endl
<< "tmp_retv," << endl
<< u.scoped_name () << "Connections (this->ciao_uses_"
<< u.name () << "_.current_size ())," << endl
- << "0);" << endl << endl
+ << "CORBA::NO_MEMORY ());" << endl << endl
<< u.scoped_name () << "Connections_var retv"
<< " = tmp_retv ;" << endl
<< "retv->length (this->ciao_uses_" << u.name ()
@@ -828,7 +828,7 @@ namespace
os << "ACE_NEW_RETURN (" << endl
<< "retv[i].ck," << endl
<< "CIAO::Map_Key_Cookie (entry.ext_id_)," << endl
- << "0);" << endl
+ << "CORBA::NO_MEMORY ());" << endl
<< "++i;" << endl
<< "}";
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index ff18c9eb4b4..3b6e4471fd3 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 30 20:39:26 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * CIDLC/ServantSourceGenerator.cpp (namespace):
+
+ Used ACE_NEW_THROW_EX instead of ACE_NEW_RETURN.
+
Tue Nov 30 20:22:19 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* CIDLC/ServantSourceGenerator.cpp (namespace):