summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2007-02-28 12:36:14 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2007-02-28 12:36:14 +0000
commit98aabd19d04a82de10b1f41513171e29d9600f05 (patch)
tree17bbd4fd44fd2debfe21ad5a4b4cb93348de400e
parent805fd6288367c5c70bfdba17cc13b122e2453c8d (diff)
downloadATCD-98aabd19d04a82de10b1f41513171e29d9600f05.tar.gz
ChangeLogTag: Wed Feb 28 12:34:55 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1917839d0e3..443c8b11c83 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 28 12:34:55 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
+
+ * tao/CodecFactory/CDR_Encaps_Codec.cpp:
+
+ Removed an ACE_THROW_RETURN that somehow made it back in.
+
Wed Feb 28 10:05:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/AnyTypeCode/append.cpp:
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index 55505a44a48..007595e64e7 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -198,7 +198,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
if (!unk)
- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ throw CORBA::INTERNAL ();
// We don't want unk's rd_ptr to move, in case we are shared by
// another Any, so we use this to copy the state, not the buffer.