diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-08-20 12:09:24 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-08-20 12:09:24 +0000 |
| commit | 3fd2aaf3aa09d0e0ec5579abfa5f145a65291589 (patch) | |
| tree | 1094963494890d712208cdc3b831179c533a2425 | |
| parent | 312782ce2ac8de7803f2bcbb3c75aad939479307 (diff) | |
| download | ATCD-3fd2aaf3aa09d0e0ec5579abfa5f145a65291589.tar.gz | |
ChangeLogTag: Fri Aug 20 12:09:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/PortableServer/ORTRework.txt | 6 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/POA.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/TAO/tao/PortableServer/ORTRework.txt b/TAO/tao/PortableServer/ORTRework.txt index 0003384e3c1..8f67798f5b4 100644 --- a/TAO/tao/PortableServer/ORTRework.txt +++ b/TAO/tao/PortableServer/ORTRework.txt @@ -1,3 +1,9 @@ +Fri Aug 20 12:09:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/PortableServer/POA.cpp: + Removed some commented out code and removed comment after include of + IORInfoC.h, no good idea yet how to prevent this + Fri Aug 20 12:05:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PortableServer/POAManager.cpp: diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index 206b1971473..72fbbe0cee4 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -14,7 +14,7 @@ ACE_RCSID (PortableServer, #include "tao/StringSeqC.h" -#include "tao/IORInterceptor/IORInfoC.h" // needed for the HOLDING and other state constants, would like to zap this +#include "tao/IORInterceptor/IORInfoC.h" #include "tao/PortableServer/Default_Acceptor_Filter.h" #include "tao/PortableServer/ObjectReferenceTemplate_Adapter.h" #include "tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h" @@ -746,8 +746,6 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, PortableInterceptor::ObjectReferenceTemplate *child_at = child_poa->get_adapter_template (); - //CORBA::add_ref (child_at); - // Add it to the sequence of object reference templates that // will be destroyed. array_obj_ref_template.size (i + 1); |