diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 15:10:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 15:10:36 +0000 |
| commit | a8193601b6c28afee96003e871a63ca97a65e2e6 (patch) | |
| tree | b858f23c5e57a79838e419f55c11f938f31550d2 | |
| parent | e2ff09bae7aaa47121bc5ef7ecdf4fa2f6773ad7 (diff) | |
| download | ATCD-a8193601b6c28afee96003e871a63ca97a65e2e6.tar.gz | |
ChangeLogTag: Wed Apr 19 15:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 6dfbe805e7c..f463d346b96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 19 15:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_2368_Regression_Test.cpp: + Fixed compile error and compile warning + Wed Apr 19 14:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_sys_sendfile.h: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 29d1d92a8a3..63ba4bddad2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -166,8 +166,8 @@ public: /// Destructor ~TAO_CEC_ProxyPushConsumer_Guard (void); - /// Returns 1 if the reference count successfully acquired - int locked (void) const; + /// Returns true if the reference count successfully acquired + bool locked (void) const; private: /// The lock used to protect the reference count |