summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2004-10-04 12:00:24 +0000
committerbala <balanatarajan@users.noreply.github.com>2004-10-04 12:00:24 +0000
commitc53e11224b9091ebf6816259c2a9cd5f6a58a0de (patch)
tree9c474395ffd27b16d30b43f833b04f3fcdf36648 /TAO
parent1d30ae56ad471cc23327bdb29354c7a1dbb4b222 (diff)
downloadATCD-c53e11224b9091ebf6816259c2a9cd5f6a58a0de.tar.gz
ChangeLogTag:Mon Oct 4 11:59:43 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h3
3 files changed, 19 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b4cc1a0eafe..8696528e0e5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct 4 11:59:43 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h:
+
+ Replicated the changes mentioned below to the above wait
+ strategy.
+
Sun Oct 3 20:24:51 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* tao/Wait_On_Leader_Follower.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
index 7bc53a8f457..ec0fb2df4dd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -22,10 +22,16 @@ TAO_UIPMC_Wait_Never::register_handler (void)
return -1;
}
-int
-TAO_UIPMC_Wait_Never::non_blocking (void)
+bool
+TAO_UIPMC_Wait_Never::non_blocking (void) const
+{
+ return true;
+}
+
+bool
+TAO_UIPMC_Wait_Never::can_process_upcalls (void) const
{
- return 1;
+ return false;
}
int
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
index ee56d1b822a..799d09e2e64 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
@@ -46,7 +46,8 @@ 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;
};
#include /**/ "ace/post.h"