diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-21 07:52:20 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-21 07:52:20 +0000 |
| commit | ce88cc5e23ae2fc5831b1a8ba3fb7c4feefc9b4e (patch) | |
| tree | 3fde2e453e973ecd49ce4789051c0ed19b41c605 | |
| parent | 16f2af50201b4af65871b8bca1e3b985b5276940 (diff) | |
| download | ATCD-ce88cc5e23ae2fc5831b1a8ba3fb7c4feefc9b4e.tar.gz | |
ChangeLogTag: Fri Apr 21 07:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 4 | ||||
| -rw-r--r-- | TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 42087096ef2..bd5b99d5a71 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -8,6 +8,10 @@ Fri Apr 21 07:38:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl: * orbsvcs/orbsvcs/Notify/ETCL_Filter.h: * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp: + * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp: + * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp: + * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp: + * tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp: Removed usage of ACE_NESTED_CLASS Thu Apr 20 14:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp index 1532085179d..8de0a3ed17d 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp @@ -42,7 +42,7 @@ Smart_Diamond_Top_Proxy::shape ( ACE_ENV_SINGLE_ARG_DECL) { ans = ACE_OS::strdup ( - ACE_NESTED_CLASS (Diamond,TAO_Diamond_Top_Smart_Proxy_Base)::shape ( + Diamond::TAO_Diamond_Top_Smart_Proxy_Base::shape ( ACE_ENV_SINGLE_ARG_PARAMETER ) ); |