Thu Aug 2 08:39:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

15 files changed, 20 insertions, 20 deletions

diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index c0933bc659c..b4c77aefb65 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -115,7 +115,7 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc)
 {
   char *buf = 0;
 
-  // @@todo: Need to use a memory pool. But certain things need to
+  // @todo: Need to use a memory pool. But certain things need to
   // change a bit in this class for that. Till then.
 
   // Just allocate and copy data that needs to be sent, no point
diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp
index 06e17912045..09f7cb1b5b2 100644
--- a/TAO/tao/Condition.cpp
+++ b/TAO/tao/Condition.cpp
@@ -19,7 +19,7 @@ TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m)
     delete_lock_ (0),
     cond_ (0)
 {
-  // @@todo: Need to add the allocatore here..
+  // @todo: Need to add the allocatore here..
   ACE_NEW (this->cond_,
            TAO_SYNCH_CONDITION (*this->mutex_));
 }
@@ -31,7 +31,7 @@ TAO_Condition<MUTEX>::TAO_Condition (void)
       cond_ (0)
 
 {
-  // @@todo: Need to add the allocatore here..
+  // @todo: Need to add the allocatore here..
 
   ACE_NEW (this->mutex_,
            MUTEX);
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index cf811ee13c9..a3204010c33 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -28,7 +28,7 @@ TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core)
     transport_ (0),
     connection_pending_ (false)
 {
-  // @@todo: We need to have a distinct option/ method in the resource
+  // @todo: We need to have a distinct option/ method in the resource
   // factory for this and TAO_Transport.
   this->lock_ =
     this->orb_core_->resource_factory ()->create_cached_connection_lock ();
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 551f190f48d..4efe90f8229 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -519,7 +519,7 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
     }
   else
     {
-      // @@todo: Need to abstract this out to a seperate method...
+      // @todo: Need to abstract this out to a seperate method...
       size_t copy_len = qd->missing_data ();
 
       if (copy_len > incoming.length ())
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index f7fdbcb02fd..22498333f55 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -96,7 +96,7 @@ TAO_IIOP_Connector::TAO_IIOP_Connector (void)
 int
 TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
-  // @@todo: The functionality of the following two statements could
+  // @todo: The functionality of the following two statements could
   // be done in the constructor, but that involves changing the
   // interface of the pluggable transport factory.
 
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index 43723315271..eff593ff590 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -107,7 +107,7 @@ TAO_Muxed_TMS::unbind_dispatcher (CORBA::ULong request_id)
                     -1);
   TAO_Reply_Dispatcher *rd = 0;
 
-  // @@TODO: WTH are we sending the rd in? We can just unbind using
+  // @todo: WTH are we sending the rd in? We can just unbind using
   // the request_id
   return this->dispatcher_table_.unbind (request_id, rd);
 }
diff --git a/TAO/tao/Queued_Data.cpp b/TAO/tao/Queued_Data.cpp
index 3547e990914..cad8076267d 100644
--- a/TAO/tao/Queued_Data.cpp
+++ b/TAO/tao/Queued_Data.cpp
@@ -143,7 +143,7 @@ TAO_Queued_Data::release (TAO_Queued_Data *qd)
       return;
     }
 
-  // @@todo: Need to be removed at some point of time!
+  // @todo: Need to be removed at some point of time!
   if (TAO_debug_level == 4)
     {
       // This debug is for testing purposes!
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index 883b8b69b17..d53f6abfa41 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -41,7 +41,7 @@ TAO_SCIOP_Connector::~TAO_SCIOP_Connector (void)
 int
 TAO_SCIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
-  // @@todo: The functionality of the following two statements could
+  // @todo: The functionality of the following two statements could
   // be  done in the constructor, but that involves changing the
   // interface of the pluggable transport factory.
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index a4b7f899f2e..3246460473a 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -40,7 +40,7 @@ TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core)
   this->orb_core (orb_core);
 
   // The SHMIOP always uses a blocked connect strategy
-  // @@todo: There are better ways of doing this. Let it be like this
+  // @todo: There are better ways of doing this. Let it be like this
   // for the  present.
   ACE_NEW_RETURN (this->active_connect_strategy_,
                   TAO_Blocked_Connect_Strategy (orb_core),
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index 3dad3441c1b..6552de0463d 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -80,7 +80,7 @@ TAO_Thread_Lane_Resources::acceptor_registry (void)
   // Double check.
   if (this->acceptor_registry_ == 0)
     {
-      // @@todo: Wouldnt this crash big time if you happen to
+      // @todo: Wouldnt this crash big time if you happen to
       // dereference a null-pointer? Needs fixing.
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         ace_mon,
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index b0c34264667..5c7a0fe69d2 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -749,7 +749,7 @@ int
 TAO_Transport::send_synch_message_helper_i (TAO_Synch_Queued_Message &synch_message,
                                             ACE_Time_Value * /*max_wait_time*/)
 {
-  // @@todo: Need to send timeouts for writing..
+  // @todo: Need to send timeouts for writing..
   int const n = this->drain_queue_i ();
 
   if (n == -1)
@@ -2445,7 +2445,7 @@ TAO_Transport::notify_reactor (void)
 
   if (retval < 0 && TAO_debug_level > 2)
     {
-      // @@todo: need to think about what is the action that
+      // @todo: need to think about what is the action that
       // we can take when we get here.
       ACE_DEBUG ((LM_DEBUG,
          ACE_TEXT ("TAO (%P|%t) - Transport[%d]::notify_reactor, ")
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index 894878d8782..90d4d1f3203 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -230,7 +230,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
 
   if (TAO_OBV_GIOP_Flags::is_indirection_tag (valuetag))
     {
-      //@@TODO: read indirection value.
+      //@todo: read indirection value.
         if (TAO_debug_level > 0)
           {
             ACE_ERROR ((LM_ERROR,
@@ -462,7 +462,7 @@ CORBA::ValueBase::_tao_write_special_value (TAO_OutputCDR &strm,
   {
     return strm.write_long (TAO_OBV_GIOP_Flags::Null_tag);
   }
-  //@@TODO: Check if the value is already written to stream. If it is then
+  //@todo: Check if the value is already written to stream. If it is then
   //        put indirection and return successful, otherwise does nothing
   //        and returns false.
   else
@@ -815,12 +815,12 @@ CORBA::ValueBase::_tao_read_repository_id_list (ACE_InputCDR& strm,
 
   if (num_ids == TAO_OBV_GIOP_Flags::Indirection_tag)
     {
-      //@@TODO: read indirection repository ids and return true.
+      //@todo: read indirection repository ids and return true.
       return false;
     }
   else
     {
-      //@@TODO: map repository id for indirection
+      //@todo: map repository id for indirection
       for (CORBA::Long i = 0; i < num_ids; ++i)
         {
           if (!_tao_read_repository_id (strm,ids))
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index b9e2aaa057b..8f67dde01fe 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -47,7 +47,7 @@ TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
   this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
 #endif /* TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY */
 
-  // @@todo: will be changed when other strategies are implemented.
+  // @todo: will be changed when other strategies are implemented.
   this->connect_strategy_ = TAO_LEADER_FOLLOWER_CONNECT;
 }
 
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 2b458fffcc0..06962279627 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -282,7 +282,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
       {
         ++curarg;
 
-        // @@todo: This needs to be removed after a few betas. The
+        // @todo: This needs to be removed after a few betas. The
         // note is being written during 1.2.3 timeframe.
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("(%P|%t) This option would be deprecated \n")
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index c4439ba74e9..4de3c41df8d 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -800,7 +800,7 @@ enum TAO_Policy_Scope
 # endif /* TAO_MIN_IPV6_IIOP_MINOR */
 #endif /* ACE_HAS_IPV6 */
 
-// @@todo this needs to be deprecated. Use TAO_MAXBUFSIZE instead.
+// @todo this needs to be deprecated. Use TAO_MAXBUFSIZE instead.
 #if !defined (TAO_CONNECTION_HANDLER_STACK_BUF_SIZE)
 #   define TAO_CONNECTION_HANDLER_STACK_BUF_SIZE 1024
 #endif /*TAO_CONNECTION_HANDLER_STACK_BUF_SIZE */