ChangeLogTag:Sun Oct 3 20:24:51 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

8 files changed, 25 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1bb9daaf1cc..b4cc1a0eafe 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Sun Oct  3 20:24:51 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/Wait_On_Leader_Follower.cpp:
+	* tao/Wait_On_Leader_Follower.h:
+	* tao/Wait_On_Reactor.cpp:
+	* tao/Wait_On_Reactor.h:
+	* tao/Wait_On_Read.cpp:
+	* tao/Wait_On_Read.h:
+	* tao/Wait_Strategy.h:
+
+	  Changed the method non_blocking () to return a boolean and
+	  improved its const correctness.
+
 Sun Oct  3 19:28:08 2004  Olli Savia  <ops@iki.fi>
 
         * utils/catior/catior.cpp:
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index 062e75e4805..393dacadef7 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -30,10 +30,10 @@ TAO_Wait_On_Leader_Follower::register_handler (void)
   return 1;
 }
 
-int
-TAO_Wait_On_Leader_Follower::non_blocking (void)
+bool
+TAO_Wait_On_Leader_Follower::non_blocking (void) const
 {
-  return 1;
+  return true;
 }
 
 int
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
index 1093187b28e..367a7496d07 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.h
@@ -51,7 +51,7 @@ public:
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
   virtual int register_handler (void);
-  virtual int non_blocking (void);
+  virtual bool non_blocking (void) const;
   virtual bool can_process_upcalls (void) const;
 };
 
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
index 818a8e045c7..deba786785b 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -103,10 +103,10 @@ TAO_Wait_On_Reactor::register_handler (void)
   return 1;
 }
 
-int
-TAO_Wait_On_Reactor::non_blocking (void)
+bool
+TAO_Wait_On_Reactor::non_blocking (void) const
 {
-  return 1;
+  return true;
 }
 
 bool
diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h
index 08d4e8788c2..c8af5477fba 100644
--- a/TAO/tao/Wait_On_Reactor.h
+++ b/TAO/tao/Wait_On_Reactor.h
@@ -43,7 +43,7 @@ public:
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
   virtual int register_handler (void);
-  virtual int non_blocking (void);
+  virtual bool non_blocking (void) const;
   virtual bool can_process_upcalls (void) const;
 };
 
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index 3239ba392cc..6d5ae896527 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -75,8 +75,8 @@ TAO_Wait_On_Read::register_handler (void)
   return 0;
 }
 
-int
-TAO_Wait_On_Read::non_blocking (void)
+bool
+TAO_Wait_On_Read::non_blocking (void) const
 {
   return 0;
 }
@@ -84,6 +84,5 @@ TAO_Wait_On_Read::non_blocking (void)
 bool
 TAO_Wait_On_Read::can_process_upcalls (void) const
 {
-  // Just don't think twice..
   return true;
 }
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index f3a7aa609aa..d2de502871f 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -42,7 +42,7 @@ public:
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
   virtual int register_handler (void);
-  virtual int non_blocking (void);
+  virtual bool non_blocking (void) const;
   virtual bool can_process_upcalls (void) const;
 };
 
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index bd41faebd2d..c9800344ac2 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -61,7 +61,7 @@ public:
 
   /// Returns a value to indicate whether the transport needs to set
   /// the socket on which it is waiting to non-blocking mode or not.
-  virtual int non_blocking (void) = 0;
+  virtual bool non_blocking (void) const = 0;
 
   /// Flag that indicates whether we can process requests while
   /// waiting for the reply.