summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-05-05 11:26:03 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-05-05 11:26:03 +0000
commit2e55f071e661bd39bcc797d62a4e1f6bb1fce2d9 (patch)
treec1d17cbc166d4d59e8574a4219896e795e63e576
parent1920d521386dcd4b8a2895450cd70847ed19627b (diff)
downloadATCD-2e55f071e661bd39bcc797d62a4e1f6bb1fce2d9.tar.gz
ChangeLogTag: Fri May 5 08:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/tao/Asynch_Queued_Message.cpp2
-rw-r--r--TAO/tao/Asynch_Queued_Message.h2
-rw-r--r--TAO/tao/DynamicInterface/Request.h4
-rw-r--r--TAO/tao/GIOP_Message_Base.cpp2
-rw-r--r--TAO/tao/Synch_Queued_Message.cpp2
-rw-r--r--TAO/tao/Synch_Queued_Message.h2
-rw-r--r--TAO/tao/Unbounded_Octet_Sequence_T.h4
7 files changed, 7 insertions, 11 deletions
diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index fd7187e4919..212dd6ef809 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -20,7 +20,7 @@ TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message (
const ACE_Message_Block *contents,
TAO_ORB_Core *oc,
ACE_Allocator *alloc,
- int is_heap_allocated)
+ bool is_heap_allocated)
: TAO_Queued_Message (oc, alloc, is_heap_allocated)
, size_ (contents->total_length ())
, offset_ (0)
diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h
index 62b7afb84cd..045f3dcd4fd 100644
--- a/TAO/tao/Asynch_Queued_Message.h
+++ b/TAO/tao/Asynch_Queued_Message.h
@@ -47,7 +47,7 @@ public:
TAO_Asynch_Queued_Message (const ACE_Message_Block *contents,
TAO_ORB_Core *oc,
ACE_Allocator *alloc = 0,
- int is_heap_allocated = 0);
+ bool is_heap_allocated = false);
/// Destructor
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 21b59006fad..ce0a31ac8ce 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -93,10 +93,6 @@ namespace CORBA
/// does not implement Contexts, this will always be 0.
CORBA::ContextList_ptr contexts (void);
- // @deprecated Return the <Environment> for this request.
- // CORBA::Environment_ptr env (void);
-
-
/**
* @name Argument manipulation helper functions.
*
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 7a044309c89..626e432684a 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -668,7 +668,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
- // Initialze an output CDR on the stack
+ // Initialize an output CDR on the stack
// NOTE: Don't jump to a conclusion as to why we are using the
// input_cdr and hence the global pool here. These pools will move
// to the lanes anyway at some point of time. Further, it would have
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index f72ae27e1b4..a991a38dda9 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -17,7 +17,7 @@ TAO_Synch_Queued_Message::TAO_Synch_Queued_Message (
const ACE_Message_Block *contents,
TAO_ORB_Core *oc,
ACE_Allocator *alloc,
- int is_heap_allocated)
+ bool is_heap_allocated)
: TAO_Queued_Message (oc, alloc, is_heap_allocated)
, contents_ (const_cast<ACE_Message_Block*> (contents))
, current_block_ (contents_)
diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h
index 09b96f3b6ba..9dc77c54cc1 100644
--- a/TAO/tao/Synch_Queued_Message.h
+++ b/TAO/tao/Synch_Queued_Message.h
@@ -57,7 +57,7 @@ public:
TAO_Synch_Queued_Message (const ACE_Message_Block *contents,
TAO_ORB_Core *oc,
ACE_Allocator *alloc = 0,
- int is_heap_allocated = 0);
+ bool is_heap_allocated = false);
/// Destructor
virtual ~TAO_Synch_Queued_Message (void);
diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h
index a2c0122218f..04a043f9417 100644
--- a/TAO/tao/Unbounded_Octet_Sequence_T.h
+++ b/TAO/tao/Unbounded_Octet_Sequence_T.h
@@ -83,7 +83,7 @@ public:
, release_ (false)
, mb_(0) {
// Get the message block flags.
- ACE_Message_Block::Message_Flags flg = mb->self_flags ();
+ ACE_Message_Block::Message_Flags const flg = mb->self_flags ();
// If the DONT_DELETE flag is disabled just a duplicate would
// help. If the DONT_DELETE flag is enabled a deep copy is needed as
@@ -287,7 +287,7 @@ bool
operator== (const TAO::unbounded_value_sequence<CORBA::Octet> & lhs,
const TAO::unbounded_value_sequence<CORBA::Octet> & rhs)
{
- const CORBA::ULong rlen = rhs.length ();
+ CORBA::ULong const rlen = rhs.length ();
if (rlen != lhs.length ())
{