ChangeLogTag: Sun Aug 1 15:18:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 22 insertions, 23 deletions

diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index cd5b4e7f4f9..de7704a453f 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -62,7 +62,7 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
     this->last_time_ = current_time;
   }
 
-  const CORBA::Float request_count = this->interceptor_->request_count ();
+  const CORBA::Long request_count = this->interceptor_->request_count ();
 
   CosLoadBalancing::LoadList * tmp;
   ACE_NEW_THROW_EX (tmp,
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index 187f05e5dab..6c4fd3a47b3 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -124,7 +124,7 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               "Calling BasicLog::get_n_records...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-  CORBA::Long retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULongLong retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 #else
   CORBA::Long retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
@@ -154,7 +154,7 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
   for (; j < rec_list->length();++j)  //dhanvey added info
 #ifndef ACE_LACKS_LONGLONG_T
   ACE_DEBUG ((LM_DEBUG,
-              "id = %Q, time= %Q\n", 
+              "id = %Q, time= %Q\n",
               rec_list[j].id, rec_list[j].time));
 
 #else
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index f518d96a672..fc2d84cbe72 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -102,16 +102,16 @@ Supplier::run (int argc, char* argv[])
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-  
+
       ACE_DEBUG ((LM_DEBUG,
                   "Create returned logid = %d\n",logid));
 
-      CosEventChannelAdmin::SupplierAdmin_var supplier_admin = 
+      CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
         event_log->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-      this->consumer_ = 
+      this->consumer_ =
         supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  
+
       CosEventComm::PushSupplier_var supplier =
         this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
@@ -133,7 +133,7 @@ Supplier::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_n_records...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-      CORBA::Long retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULongLong retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       CORBA::Long retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
@@ -160,10 +160,10 @@ Supplier::run (int argc, char* argv[])
         event_log->query (QUERY_LANG, QUERY_1, iter_out);
 
       CORBA::ULong j = 0;
-      for (; j < rec_list->length();++j)  
+      for (; j < rec_list->length();++j)
 #ifndef ACE_LACKS_LONGLONG_T
       ACE_DEBUG ((LM_DEBUG,
-                  "id = %Q, time= %Q\n", 
+                  "id = %Q, time= %Q\n",
                   rec_list[j].id, rec_list[j].time));
 #else
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index e92e991515b..14dcf3155d8 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -205,7 +205,7 @@ Supplier::run (int argc, char* argv[])
                   "Calling NotifyLog get_n_records...\n"));
 
 #ifndef ACE_LACKS_LONGLONG_T
-      CORBA::Long retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULongLong retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       CORBA::Long retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
@@ -232,10 +232,10 @@ Supplier::run (int argc, char* argv[])
         notify_log_->query (QUERY_LANG, QUERY_1, iter_out);
 
       CORBA::ULong j = 0;
-      for (; j < rec_list->length();++j)  
+      for (; j < rec_list->length();++j)
 #ifndef ACE_LACKS_LONGLONG_T
        ACE_DEBUG ((LM_DEBUG,
-                   "id = %Q, time= %Q\n", 
+                   "id = %Q, time= %Q\n",
                    rec_list[j].id, rec_list[j].time));
 #else
        ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index ef78ceafc32..8af49c7efc9 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -134,7 +134,7 @@ Supplier::run (int argc, char* argv[])
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-  
+
       ACE_DEBUG ((LM_DEBUG,
                   "Create returned logid = %d\n",logid));
 
@@ -190,7 +190,7 @@ Supplier::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_n_records...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-      CORBA::Long retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULongLong retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       CORBA::Long retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
@@ -217,10 +217,10 @@ Supplier::run (int argc, char* argv[])
         event_log->query (QUERY_LANG, QUERY_1, iter_out);
 
       CORBA::ULong j = 0;
-      for (; j < rec_list->length();++j)  
+      for (; j < rec_list->length();++j)
 #ifndef ACE_LACKS_LONGLONG_T
       ACE_DEBUG ((LM_DEBUG,
-                  "id = %Q, time= %Q\n", 
+                  "id = %Q, time= %Q\n",
                   rec_list[j].id, rec_list[j].time));
 #else
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
index 1cf043c8482..d06f83a5b20 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
@@ -34,9 +34,6 @@
 
 #include "tao/Invocation_Endpoint_Selectors.h"
 
-class TAO_MProfile;
-class TAO_Endpoint;
-
 /**
  * @class TAO_RT_Invocation_Endpoint_Selector
  *
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
index 5c551089457..6f159a4f387 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -88,7 +88,7 @@ protected:
 
 
 public:
-  /// @@TODO: These methods IMHO should have more meaningful
+  /// @todo These methods IMHO should have more meaningful
   /// names. The names seem to indicate nothing.
   virtual int send_request (TAO_Stub *stub,
                             TAO_ORB_Core *orb_core,
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index 05f3c61a4b3..2c73a281074 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -140,7 +140,7 @@ namespace CORBA
     CORBA::Boolean is_local_;
 
     /// Our equivalent CORBA::Object version
-    /// @@todo: We may at some point of time should probably cache a
+    /// @todo We may at some point of time should probably cache a
     /// version of  CORBA::ValueBase
     CORBA::Object_var equivalent_obj_;
   };
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index 6450fec2c71..1dbce84b49b 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -63,8 +63,10 @@ public:
   /// the socket on which it is waiting to non-blocking mode or not.
   virtual int non_blocking (void) = 0;
 
-  /// Get/Set method for the flag
+  /// Get method for the flag
   int is_registered (void);
+
+  /// Set method for the flag
   void is_registered (int flag);
 
 protected: