diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-16 20:11:06 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-16 20:11:06 +0000 |
| commit | 5b3b5d8ccfd4b94b35ffef4ffc228594471dae78 (patch) | |
| tree | 73173c18fcc15ab911b1431227ba916b9a2e4093 | |
| parent | 45ec717dc16c3ba1693bcc3b3a934be8e72995ec (diff) | |
| download | ATCD-5b3b5d8ccfd4b94b35ffef4ffc228594471dae78.tar.gz | |
Mon Mar 16 20:11:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* DAnCE/RedirectionService/CCMObjectLocator.h:
Made destructor virtual
* DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc:
* DAnCE/tests/RedirectionServiceTest/DummyImpl.h:
Layout changes
* tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc:
Added naming
| -rw-r--r-- | CIAO/ChangeLog | 12 | ||||
| -rw-r--r-- | CIAO/DAnCE/RedirectionService/CCMObjectLocator.h | 6 | ||||
| -rw-r--r-- | CIAO/DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc | 22 | ||||
| -rw-r--r-- | CIAO/DAnCE/tests/RedirectionServiceTest/DummyImpl.h | 1 | ||||
| -rw-r--r-- | CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc | 2 |
5 files changed, 26 insertions, 17 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 97ed72ea417..3fe53a02da8 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,15 @@ +Mon Mar 16 20:11:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/RedirectionService/CCMObjectLocator.h: + Made destructor virtual + + * DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc: + * DAnCE/tests/RedirectionServiceTest/DummyImpl.h: + Layout changes + + * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: + Added naming + Sun Mar 15 19:28:54 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * MPC/config/ciao_executor.mpb: diff --git a/CIAO/DAnCE/RedirectionService/CCMObjectLocator.h b/CIAO/DAnCE/RedirectionService/CCMObjectLocator.h index 127d940bfa2..8012b091aa3 100644 --- a/CIAO/DAnCE/RedirectionService/CCMObjectLocator.h +++ b/CIAO/DAnCE/RedirectionService/CCMObjectLocator.h @@ -55,15 +55,13 @@ namespace DAnCE CCMObjectLocator (CORBA::ORB_ptr orb, PortableServer::POA_ptr parent_poa, const char * poa_name); - - ~CCMObjectLocator(); + virtual ~CCMObjectLocator(); virtual ::PortableServer::Servant preinvoke ( const ::PortableServer::ObjectId & oid, ::PortableServer::POA_ptr adapter, const char * operation, - ::PortableServer::ServantLocator::Cookie & the_cookie - ); + ::PortableServer::ServantLocator::Cookie & the_cookie); virtual void postinvoke ( const ::PortableServer::ObjectId & /*oid*/, diff --git a/CIAO/DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc b/CIAO/DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc index 7fbc416c358..f4cc9f3e31e 100644 --- a/CIAO/DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc +++ b/CIAO/DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc @@ -1,21 +1,21 @@ // $Id$ project (ObjectLocatorTestServer): dance, taoserver, iortable, dance_redirection_service, dance_logger { - exename = ObjectLocatorTestServer + exename = ObjectLocatorTestServer - IDL_Files { - Dummy.idl - } + IDL_Files { + Dummy.idl + } - Source_Files { - srv_main.cpp - DummyC.cpp - DummyS.cpp - DummyImpl.cpp - } + Source_Files { + srv_main.cpp + DummyC.cpp + DummyS.cpp + DummyImpl.cpp + } } project (ObjectLocatorTestClient): dance, taoclient, anytypecode, dance_logger, portableserver { - + after += ObjectLocatorTestServer exename = ObjectLocatorTestClient diff --git a/CIAO/DAnCE/tests/RedirectionServiceTest/DummyImpl.h b/CIAO/DAnCE/tests/RedirectionServiceTest/DummyImpl.h index fdf370bdb40..272611eedba 100644 --- a/CIAO/DAnCE/tests/RedirectionServiceTest/DummyImpl.h +++ b/CIAO/DAnCE/tests/RedirectionServiceTest/DummyImpl.h @@ -6,7 +6,6 @@ namespace Test { - class DummyImpl : public virtual POA_Test::Dummy { diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc index 3c7af456b25..8effb54af3d 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc @@ -52,7 +52,7 @@ project(TSEC_CheckPoint_svnt) : ciao_servant, event, avoids_ace_for_tao { } -project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt, ciao_session_container, avoids_ace_for_tao { +project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt, ciao_session_container, avoids_ace_for_tao, naming { after += TSEC_CheckPoint_svnt after += ENW_skel ENW_stub |