diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-08-09 08:18:09 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-08-09 08:18:09 +0000 |
| commit | f39c18fb381d5ad466cb397e61f71db1567f8387 (patch) | |
| tree | e58997e38c7c849ce6294340aa6d024af81235a6 | |
| parent | 2365aa13070f808ac4bfae8d15bd690bba4d2526 (diff) | |
| download | ATCD-f39c18fb381d5ad466cb397e61f71db1567f8387.tar.gz | |
Wed Aug 9 08:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/RTCORBA.pidl | 2 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c073f0922cb..c07300757b4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Aug 9 08:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/RTCORBA/RT_Protocol_Hooks.cpp: + Use true instead of 1 + + * tao/RTCORBA/RTCORBA.pidl: + Doxygen changes + Tue Aug 8 14:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tao/BiDIR_GIOP/BiDir_PolicyFactory.cpp: diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl index 703ae6c7732..1523826b809 100644 --- a/TAO/tao/RTCORBA/RTCORBA.pidl +++ b/TAO/tao/RTCORBA/RTCORBA.pidl @@ -219,8 +219,8 @@ module RTCORBA { void lock (); void unlock (); + /// if max_wait = 0 then return immediately boolean try_lock (in TimeBase::TimeT max_wait); - // if max_wait = 0 then return immediately }; // RTORB. diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index ec2c6cfbfeb..bcb82f8efbf 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -656,7 +656,7 @@ TAO_RT_Protocols_Hooks::get_selector_hook ( if (priority_model_policy->get_priority_model () == RTCORBA::CLIENT_PROPAGATED) { - is_client_propagated = 1; + is_client_propagated = true; } if (!is_client_propagated) |