summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp28
1 files changed, 12 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index be2af5fe269..98a17c5dc68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -1,19 +1,17 @@
// $Id$
-#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
+#include "ECG_CDR_Message_Sender.h"
#include "tao/CDR.h"
#include "ace/SOCK_Dgram.h"
#include "ace/INET_Addr.h"
#include "ace/ACE.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_CDR_Message_Sender.i"
+#include "ECG_CDR_Message_Sender.i"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, ECG_CDR_Message_Sender, "$Id$")
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
void
TAO_ECG_CDR_Message_Sender::init (
TAO_ECG_Refcounted_Endpoint endpoint_rptr
@@ -81,7 +79,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr,
iov[iovcnt].iov_base = rd_ptr;
iov[iovcnt].iov_len = l;
fragment_size += l;
- ++iovcnt;
+ iovcnt++;
while (fragment_size > max_fragment_payload)
{
// This fragment is full, we have to send it...
@@ -102,7 +100,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr,
iovcnt
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- ++fragment_id;
+ fragment_id++;
fragment_offset += max_fragment_payload;
// Reset, but don't forget that the last Message_Block
@@ -130,7 +128,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr,
iovcnt
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- ++fragment_id;
+ fragment_id++;
fragment_offset += max_fragment_payload;
iovcnt = 1;
@@ -151,7 +149,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr,
iovcnt
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- ++fragment_id;
+ fragment_id++;
fragment_offset += fragment_size;
iovcnt = 1;
@@ -175,7 +173,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr,
iovcnt
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- ++fragment_id;
+ fragment_id++;
fragment_offset += fragment_size;
// reset, not needed here...
@@ -303,11 +301,11 @@ TAO_ECG_CDR_Message_Sender::compute_fragment_count (const ACE_Message_Block* beg
CORBA::ULong l = b->length ();
total_length += l;
fragment_size += l;
- ++iovcnt;
+ iovcnt++;
while (fragment_size > max_fragment_payload)
{
// Ran out of space, must create a fragment...
- ++fragment_count;
+ fragment_count++;
// The next iovector will contain what remains of this
// buffer, but also consider
@@ -317,14 +315,14 @@ TAO_ECG_CDR_Message_Sender::compute_fragment_count (const ACE_Message_Block* beg
}
if (fragment_size == max_fragment_payload)
{
- ++fragment_count;
+ fragment_count++;
iovcnt = 1;
fragment_size = 0;
}
if (iovcnt >= iov_size)
{
// Ran out of space in the iovector....
- ++fragment_count;
+ fragment_count++;
iovcnt = 1;
fragment_size = 0;
}
@@ -332,9 +330,7 @@ TAO_ECG_CDR_Message_Sender::compute_fragment_count (const ACE_Message_Block* beg
if (iovcnt != 1)
{
// Send the remaining data in another fragment
- ++fragment_count;
+ fragment_count++;
}
return fragment_count;
}
-
-TAO_END_VERSIONED_NAMESPACE_DECL