summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2007-02-26 23:51:04 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2007-02-26 23:51:04 +0000
commit1b6737811da47fb1135807062b83d2288ace348c (patch)
treed436c86c6237b804164ce5f6f39268e0aca5c49d
parent72d25451e85add56fffe761eda70c26ddcc55caa (diff)
downloadATCD-1b6737811da47fb1135807062b83d2288ace348c.tar.gz
ChangeLogTag:Mon Feb 26 23:27:03 UTC 2007 Ossama Othman <ossama_othman at symantec dot com>
-rw-r--r--TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp4
-rw-r--r--TAO/tao/Transport.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index a57a0da8f9d..17c751db626 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -9,6 +9,7 @@
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/Any.h"
#include "tao/CDR.h"
+#include "tao/SystemException.h"
#if ! defined (__ACE_INLINE__)
#include "orbsvcs/ETCL/ETCL_Constraint.inl"
@@ -94,6 +95,9 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
TAO::Unknown_IDL_Type *unk =
dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+ if (!unk)
+ 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.
TAO_InputCDR for_reading (unk->_tao_get_cdr ());
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 54fd38db5f0..ce44d35eb47 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -1070,7 +1070,7 @@ TAO_Transport::cleanup_queue_i ()
this->id ()));
}
- int byte_count = 0;
+ size_t byte_count = 0;
int msg_count = 0;
// Cleanup all messages
@@ -1097,7 +1097,7 @@ TAO_Transport::cleanup_queue_i ()
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue_i, ")
- ACE_TEXT ("discarded %d messages, %d bytes.\n"),
+ ACE_TEXT ("discarded %d messages, %u bytes.\n"),
this->id (), msg_count, byte_count));
}
}