summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/tao/Any.cpp10
-rw-r--r--TAO/tao/Connect.cpp2
-rw-r--r--TAO/tao/Exception.cpp10
-rw-r--r--TAO/tao/Exception.h2
-rw-r--r--TAO/tao/GIOP.cpp18
-rw-r--r--TAO/tao/GIOP.h2
-rw-r--r--TAO/tao/IIOP_ORB.cpp2
-rw-r--r--TAO/tao/IIOP_Object.cpp4
-rw-r--r--TAO/tao/NVList.cpp4
-rw-r--r--TAO/tao/ORB_Core.cpp2
-rw-r--r--TAO/tao/Operation_Table.cpp6
-rw-r--r--TAO/tao/Servant_Base.cpp2
-rw-r--r--TAO/tao/decode.cpp6
13 files changed, 35 insertions, 35 deletions
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 71cbc9fbd13..c47debb254d 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -89,7 +89,7 @@ CORBA_Any::CORBA_Any (const CORBA_Any &src)
size = this->type_->size (env);
// allocate sufficient memory and deep copy the data
- // XXXTAO - the following allocation to be addressed by our memory management
+ // @@ - the following allocation to be addressed by our memory management
// scheme
this->value_ = (char *) ACE_OS::calloc (1, size);
(void) DEEP_COPY (this->type_, src.value_, this->value_, env);
@@ -113,7 +113,7 @@ CORBA_Any::operator= (const CORBA_Any &src)
if (this->any_owns_data_)
{
DEEP_FREE (this->type_, this->value_, 0, env);
- // XXXTAO: The following needs to be addressed properly. We need to make
+ // @@: The following needs to be addressed properly. We need to make
// sure if we use "delete" or "free"
// delete this->value_;
}
@@ -129,7 +129,7 @@ CORBA_Any::operator= (const CORBA_Any &src)
size = this->type_->size (env);
// allocate sufficient storage and deep copy the data
- // XXXTAO - address the following
+ // @@ - address the following
this->value_ = (char *) ACE_OS::calloc (1, size);
(void) DEEP_COPY (this->type_, src.value_, this->value_, env);
return *this;
@@ -154,7 +154,7 @@ CORBA_Any::~CORBA_Any (void)
{
// we own the data. So first do a deep free and then deallocate it.
DEEP_FREE (this->type_, this->value_, 0, env);
- // XXXTAO - address the following
+ // @@ - address the following
// delete this->value_;
}
@@ -175,7 +175,7 @@ CORBA_Any::replace (CORBA::TypeCode_ptr tc,
if (this->value_)
{
DEEP_FREE (this->type_, this->value_, 0, env);
- // XXXTAO - to be addressed
+ // @@ - to be addressed
// delete this->value_;
}
}
diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp
index 8c073796106..01d548e39e8 100644
--- a/TAO/tao/Connect.cpp
+++ b/TAO/tao/Connect.cpp
@@ -277,7 +277,7 @@ TAO_Server_Connection_Handler::handle_request (const TAO_GIOP_RequestHeader &hdr
env);
svr_req.release ();
#if 0
- // XXXTAO (ASG) - this commented out code must remain here since the DSI will use
+ // @@ (ASG) - this commented out code must remain here since the DSI will use
// it. Please keep it here until I have figured out the best way out 03/22/98.
// If no reply is necessary (i.e., oneway), then return!
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 10594a1df15..645ac44cb9b 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -370,7 +370,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr tcp,
// Declare static storage for these ... the buffer is "naturally"
// aligned and overwritten.
//
-// XXXTAO this actually doesn't guarantee "natural" alignment, but
+// @@ this actually doesn't guarantee "natural" alignment, but
// it works that way in most systems.
#define TAO_SYSTEM_EXCEPTION(name) \
@@ -510,17 +510,17 @@ CORBA::Environment::print_exception (const char *info,
ACE_DEBUG ((LM_ERROR, "(%P|%t) EXCEPTION, %s\n", info));
- // XXXTAO get rid of this logic, and rely on some member function on
+ // @@ get rid of this logic, and rely on some member function on
// Exception to say if it's user or system exception.
if (ACE_OS::strncmp ((char *) id, "IDL:omg.org/CORBA/", 10) == 0
&& ACE_OS::strncmp ((char *) id, "IDL:omg.org/CORBA/TypeCode/", 19) != 0)
{
- // XXXTAO this should be a QueryInterface call instead.
+ // @@ this should be a QueryInterface call instead.
CORBA::SystemException *x2 =
(CORBA::SystemException *) this->exception_;
- // XXXTAO there are a other few "user exceptions" in the CORBA
+ // @@ there are a other few "user exceptions" in the CORBA
// scope, they're not all standard/system exceptions ... really
// need to either compare exhaustively against all those IDs
// (yeech) or (preferably) to represent the exception type
@@ -538,7 +538,7 @@ CORBA::Environment::print_exception (const char *info,
"garbage"));
}
else
- // XXXTAO we can use the exception's typecode to dump all the data
+ // @@ we can use the exception's typecode to dump all the data
// held within it ...
ACE_DEBUG ((LM_ERROR,
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index b1f432f5aa5..596354b3910 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -163,7 +163,7 @@ private:
// Declarations for all of the CORBA standard exceptions.
//
-// XXXTAO - shouldn't have a default minor code, at least for code that's
+// @@ - shouldn't have a default minor code, at least for code that's
// inside the ORB. All minor codes should be symbolically catalogued.
#define TAO_SYSTEM_EXCEPTION(name) \
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index ace8c2ebada..bde044bf630 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -38,7 +38,7 @@
// ORB client is not allowed to rely on semantic implications of such
// a model.
//
-// XXXTAO there is lots of unverified I/O here. In all cases, if an
+// @@ there is lots of unverified I/O here. In all cases, if an
// error is detected when marshaling or unmarshaling, it should be
// reported.
@@ -137,7 +137,7 @@ TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
// On error or EOF, report the fault, close the connection, and
// mark it as unusable/defunct.
//
- // XXXTAO on client side write errors, we may hit the case that the
+ // @@ on client side write errors, we may hit the case that the
// server did a clean shutdown but we've not yet read the
// GIOP::CloseConnection message. If we get an error, we need
// to see if there is such a message waiting for us, and if so
@@ -211,7 +211,7 @@ TAO_GIOP::close_connection (TAO_Client_Connection_Handler *&handler,
// It's important that we use a reliable shutdown after we send this
// message, so we know it's received.
//
- // XXXTAO should recv and discard queued data for portability; note
+ // @@ should recv and discard queued data for portability; note
// that this won't block (long) since we never set SO_LINGER
TAO_GIOP::dump_msg ("send",
@@ -342,7 +342,7 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
connection.get_handle ()));
ACE_TIMEPROBE (" -> GIOP::recv_request - EOF");
return TAO_GIOP::EndOfFile;
- // XXXTAO should probably find some way to report this without
+ // @@ should probably find some way to report this without
// an exception, since for most servers it's not an error.
// Is it _never_ an error? Not sure ...
/* NOTREACHED */
@@ -815,13 +815,13 @@ TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions,
this->handler_ = 0;
//
- // XXXTAO highly desirable to know whether we wrote _any_ data; if
+ // @@ highly desirable to know whether we wrote _any_ data; if
// we wrote none, then there's no chance the call completed and
// applications don't have to deal with those nasty
// indeterminate states where they can't immediatly tell if
// what's safe to do.
//
- // XXXTAO also, there might have been a GIOP::CloseConnection
+ // @@ also, there might have been a GIOP::CloseConnection
// message in the input queue. If so, this request should be
// treated as a (full) "rebind" case. Can't do that from this
// point in the code however! Some minor restructuring needs to
@@ -852,7 +852,7 @@ TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions,
// evidence that locking at the level of requests loses on at least
// some platforms.
//
- // XXXTAO In all MT environments, there's a cancellation point lurking
+ // @@ In all MT environments, there's a cancellation point lurking
// here; need to investigate. Client threads would frequently be
// canceled sometime during recv_request ... the correct action to
// take on being canceled is to issue a CancelRequest message to the
@@ -1114,7 +1114,7 @@ TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions,
// reusing memory where practical. Then delete the forwarded
// objref, retaining only its profile.
//
- // XXXTAO add and use a "forward count", to prevent loss of data
+ // @@ add and use a "forward count", to prevent loss of data
// in forwarding chains during concurrent calls -- only a
// forward that's a response to the current fwd_profile should
// be recorded here. (This is just an optimization, and is not
@@ -1133,7 +1133,7 @@ TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions,
// Make sure a new connection is used next time.
this->handler_->close ();
- this->handler_ = 0; // XXXTAO not sure this is correct!
+ this->handler_ = 0; // @@ not sure this is correct!
// We may not need to do this since TAO_GIOP_Invocations
// get created on a per-call basis. For now we'll play it safe.
}
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
index 9099182ec74..7d1ede74e24 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -154,7 +154,7 @@ public:
// requirements (like 8 byte boundaries); hence the size of it may not
// match the size of the header on the wire.
//#define TAO_GIOP_HEADER_LEN sizeof (TAO_GIOP_MessageHeader)
-// XXXTAO - I made this explicitly 12 (ASG)
+// @@ - I made this explicitly 12 (ASG)
#define TAO_GIOP_HEADER_LEN 12
// Support for Implicit ORB Service Context.
diff --git a/TAO/tao/IIOP_ORB.cpp b/TAO/tao/IIOP_ORB.cpp
index 50792a5e66b..667c8dbc679 100644
--- a/TAO/tao/IIOP_ORB.cpp
+++ b/TAO/tao/IIOP_ORB.cpp
@@ -34,7 +34,7 @@ IIOP_ORB::object_to_string (CORBA::Object_ptr obj,
// ORB implementations ...
char *bytes;
- // XXXTAO Is BUFSIZ the right size here?
+ // @@ Is BUFSIZ the right size here?
char buf [BUFSIZ];
CDR cdr (buf, sizeof buf, TAO_ENCAP_BYTE_ORDER);
diff --git a/TAO/tao/IIOP_Object.cpp b/TAO/tao/IIOP_Object.cpp
index 0594fc8e89c..64a2f27f9a5 100644
--- a/TAO/tao/IIOP_Object.cpp
+++ b/TAO/tao/IIOP_Object.cpp
@@ -50,7 +50,7 @@ IIOP::Profile::set (const char *h,
return -1;
// Enough room as to print a <void *>.
- // XXXTAO The following "32" should not be a magic #...
+ // @@ The following "32" should not be a magic #...
const int bufs = 32;
char buffer[bufs];
@@ -531,7 +531,7 @@ IIOP_Object::do_static_call (CORBA::Environment &env, // exception reporting
// first release the "in" memory
if (pdp->mode == PARAM_INOUT)
{
- // XXXTAO - add others as we test each case
+ // @@ - add others as we test each case
// (ASG) will do 03/22/98.
switch (pdp->tc->kind (env))
{
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index e744d929981..580d828cce5 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -215,7 +215,7 @@ CORBA_NVList::add_value_consume (char * /*name*/,
// not implemented because we need to see how we can consume the value
// One soln is to make the any_ member of NamedValue to be a Any_ptr or
// Any_var
- // XXXTAO (ASG) - TODO
+ // @@ (ASG) - TODO
return 0;
}
@@ -224,7 +224,7 @@ void
CORBA_NVList::remove (CORBA::ULong /*n*/, CORBA::Environment &/*env*/)
{
// not implemented
- // XXXTAO (ASG) - TODO
+ // @@ (ASG) - TODO
}
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index d11e8355de7..f6e9a6d5eaf 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -70,7 +70,7 @@ TAO_ORB_Core::init (int& argc, char** argv)
// as the ACE_Service_Config or the RootPOA.
// Prepare a copy of the argument vector
- char **svc_config_argv; // XXXTAO Should this be a data member?
+ char **svc_config_argv; // @@ Should this be a data member?
// Probably, but there's no object in which to scope it.
int svc_config_argc = 0;
diff --git a/TAO/tao/Operation_Table.cpp b/TAO/tao/Operation_Table.cpp
index ed3f5019f3f..9d90e31508b 100644
--- a/TAO/tao/Operation_Table.cpp
+++ b/TAO/tao/Operation_Table.cpp
@@ -33,7 +33,7 @@ TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry
// bind the operation name to its corresponding skeleton
for (CORBA::ULong i=0; i < dbsize; i++)
{
- // XXXTAO (ASG): what happens if bind fails ???
+ // @@ (ASG): what happens if bind fails ???
(void)this->bind (db[i].opname_, db[i].skel_ptr_);
}
}
@@ -84,7 +84,7 @@ TAO_Linear_OpTable::TAO_Linear_OpTable (const TAO_operation_db_entry *db,
// skeleton.
for (CORBA::ULong i=0; i < dbsize; i++)
- // XXXTAO (ASG): what happens if bind fails ???
+ // @@ (ASG): what happens if bind fails ???
(void)this->bind (db[i].opname_, db[i].skel_ptr_);
}
@@ -156,7 +156,7 @@ TAO_Active_Demux_OpTable::TAO_Active_Demux_OpTable (const
// database and bind the operation name to its corresponding
// skeleton.
for (CORBA::ULong i=0; i < dbsize; i++)
- // XXXTAO (ASG): what happens if bind fails ???
+ // @@ (ASG): what happens if bind fails ???
(void) this->bind (db[i].opname_, db[i].skel_ptr_);
}
diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp
index c8d23ae0ca7..1b2b865c7c7 100644
--- a/TAO/tao/Servant_Base.cpp
+++ b/TAO/tao/Servant_Base.cpp
@@ -62,7 +62,7 @@ TAO_ServantBase::_dispatch (CORBA::ServerRequest &req,
void *context,
CORBA::Environment &env)
{
- // XXXTAO (ASG) - we should check here if the call was for _non_existant, else
+ // @@ (ASG) - we should check here if the call was for _non_existant, else
// issue an error. For the time being we issue an error
CORBA::String opname = req.op_name ();
ACE_UNUSED_ARG (context);
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
index 739a300de78..42d77a3c1cc 100644
--- a/TAO/tao/decode.cpp
+++ b/TAO/tao/decode.cpp
@@ -607,13 +607,13 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr,
str.setup_encapsulation (ACE_reinterpret_cast(char*,buf), tmp);
- // XXXTAO Does IIOP_Object duplicate 'type_hint' below so
+ // @@ Does IIOP_Object duplicate 'type_hint' below so
// that we can safely free it? It does now!
ACE_NEW_RETURN (objdata,
IIOP_Object (type_hint),
CORBA::TypeCode::TRAVERSE_STOP);
- // XXXTAO The IIOP_Object created here has a String_var
+ // @@ The IIOP_Object created here has a String_var
// member to keep the string, this member is constructed using
// type_hint, at that time a plain (char*). Hence the string
// is *not* copied and it cannot be released, so the following
@@ -1091,7 +1091,7 @@ TAO_Marshal_Sequence::decode (CORBA::TypeCode_ptr tc,
// Allocate the buffer using the virtual
// _allocate_buffer method, hence the right
// constructors are invoked and size for the array
- // is OK. XXXTAO Who will free this memory? (coryan):
+ // is OK. @@ Who will free this memory? (coryan):
// the sequence will release it, since its release_
// field is 1.
seq->_allocate_buffer (bounds);
View Lorry Controller Status