summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2003-04-24 03:15:19 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2003-04-24 03:15:19 +0000
commit9c6416b8a8b8896f252f4c1504aef77fd30ac181 (patch)
tree64b04507c84b193f3853addd2103dc33ea00d838
parentc1f0e5f83d0c934af51aab789a1f1285a4ed610b (diff)
downloadATCD-9c6416b8a8b8896f252f4c1504aef77fd30ac181.tar.gz
ChangeLogTag:Wed Apr 23 22:12:37 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tao/CDR_Encaps_Codec.cpp38
-rw-r--r--TAO/tao/PortableServer/POA.cpp6
3 files changed, 25 insertions, 25 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6b1ed3c938b..6860f883b10 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -25,8 +25,8 @@ Wed Apr 23 18:12:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* tao/DynamicInterface/ExceptionList.h:
Changed the declaration of CORBA::is_nil and CORBA::release
- for ContextList and ExceptionList to use
- TAO_NAMESPACE_INLINE_FUNCTION instead of
+ for ContextList and ExceptionList to use
+ TAO_NAMESPACE_INLINE_FUNCTION instead of
TAO_DynamicInterface_Export, which was causing multiple definitions
in builds with __ACE_INLINE__ defined.
@@ -66,7 +66,7 @@ Wed Apr 23 17:05:10 2003 Irfan Pyarali <irfan@oomworks.com>
now that config-win32-msvc-6.h file has been updated and the -GR
flag has been added to the project files.
- * tests\RTCORBA\RTCORBA-test-configurations.xls:
+ * tests\RTCORBA\RTCORBA-test-configurations.xls:
Updated test configuration details.
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp
index b6c4df58c10..2308492f8fb 100644
--- a/TAO/tao/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CDR_Encaps_Codec.cpp
@@ -135,7 +135,7 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
return safe_any._retn ();
}
- ACE_THROW_RETURN (IOP::Codec::FormatMismatch (),
+ ACE_THROW_RETURN (IOP::Codec::FormatMismatch (),
0);
}
@@ -166,18 +166,18 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
ACE_Message_Block * mb = data._tao_get_cdr ();
if (mb == 0)
- {
- ACE_NEW_THROW_EX (mb,
- ACE_Message_Block,
- CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
+ {
+ ACE_NEW_THROW_EX (mb,
+ ACE_Message_Block,
+ CORBA::NO_MEMORY ());
+ ACE_CHECK_RETURN (0);
- TAO_OutputCDR out;
- CORBA::Any any (data);
- any.impl ()->marshal_value (out);
+ TAO_OutputCDR out;
+ CORBA::Any any (data);
+ any.impl ()->marshal_value (out);
- ACE_CDR::consolidate (mb, out.begin ());
- }
+ ACE_CDR::consolidate (mb, out.begin ());
+ }
TAO_InputCDR input (mb,
data._tao_byte_order (),
@@ -216,8 +216,8 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
i = i->cont ())
{
size_t len = i->length ();
- ACE_OS_String::memcpy (buf,
- i->rd_ptr (),
+ ACE_OS_String::memcpy (buf,
+ i->rd_ptr (),
len);
buf += len;
}
@@ -225,7 +225,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
return safe_octet_seq._retn ();
}
- ACE_THROW_RETURN (CORBA::MARSHAL (),
+ ACE_THROW_RETURN (CORBA::MARSHAL (),
0);
}
@@ -246,8 +246,8 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
ACE_Message_Block mb (data.length () + 2 * ACE_CDR::MAX_ALIGNMENT);
ACE_CDR::mb_align (&mb);
- ACE_OS::memcpy (mb.rd_ptr (),
- data.get_buffer (),
+ ACE_OS::memcpy (mb.rd_ptr (),
+ data.get_buffer (),
data.length ());
// @todo How do we check for a type mismatch so that we can
@@ -320,7 +320,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
// the data, not if it does match.
if (size != sequence_length - 1)
{
- ACE_THROW_RETURN (IOP::Codec::TypeMismatch (),
+ ACE_THROW_RETURN (IOP::Codec::TypeMismatch (),
0);
}
@@ -355,12 +355,12 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
}
else
{
- ACE_THROW_RETURN (IOP::Codec::TypeMismatch (),
+ ACE_THROW_RETURN (IOP::Codec::TypeMismatch (),
0);
}
}
- ACE_THROW_RETURN (IOP::Codec::FormatMismatch (),
+ ACE_THROW_RETURN (IOP::Codec::FormatMismatch (),
0);
}
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 6c366740c15..9071bd7997a 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -2441,9 +2441,9 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
if (this->active_object_map ().find_servant_and_system_id_using_user_id (
id,
- servant,
- system_id.out (),
- priority) == 0)
+ servant,
+ system_id.out (),
+ priority) == 0)
{
// Create object key.
TAO::ObjectKey_var key = this->create_object_key (system_id.in ());