diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-03-30 18:06:21 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-03-30 18:06:21 +0000 |
| commit | 95ea5b6fa560765e7f7131726227f7efb5e50c76 (patch) | |
| tree | 234abb3bb4b81d0127b74b17098fc356bdf94b72 | |
| parent | e203717f2bc054b3555605014c3555af97e360eb (diff) | |
| download | ATCD-95ea5b6fa560765e7f7131726227f7efb5e50c76.tar.gz | |
Fri Mar 30 18:05:06 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu>
| -rw-r--r-- | CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp | 12 | ||||
| -rw-r--r-- | CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h | 2 | ||||
| -rw-r--r-- | CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp | 4 | ||||
| -rw-r--r-- | CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h | 1 |
5 files changed, 24 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 3f49386b32f..5d13f809f61 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Fri Mar 30 18:05:06 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h + + Added virtual destructors into the class. + Fri Mar 30 14:15:58 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu> * DAnCE/ExecutionManager/Execution_Manager.cpp diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp index 1f042353ea1..d9f8acb3fdb 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp @@ -10,6 +10,10 @@ namespace CIAO { namespace Plan_Launcher { + Plan_Launcher_Benchmark_i::~Plan_Launcher_Benchmark_i () + { + } + const char * Plan_Launcher_Benchmark_i::launch_plan ( const ::Deployment::DeploymentPlan &plan) @@ -182,7 +186,7 @@ namespace CIAO stats.samples_count ());*/ } - catch (Deployment::ResourceNotAvailable, ex) + catch (Deployment::ResourceNotAvailable& ex) { ACE_ERROR ((LM_ERROR, "EXCEPTION: ResourceNotAvaiable exception caught: %s,\n" @@ -197,7 +201,7 @@ namespace CIAO ex.resourceName.in ())); throw (Deployment_Failure ("")); } - catch (Deployment::StartError, ex) + catch (Deployment::StartError& ex) { ACE_ERROR ((LM_ERROR, "EXCEPTION: StartError exception caught: %s, %s\n", @@ -205,7 +209,7 @@ namespace CIAO ex.reason.in ())); throw (Deployment_Failure ("")); } - catch (Deployment::InvalidProperty, ex) + catch (Deployment::InvalidProperty ex) { ACE_ERROR ((LM_ERROR, "EXCEPTION: InvalidProperty exception caught: %s, %s\n", @@ -213,7 +217,7 @@ namespace CIAO ex.reason.in ())); throw (Deployment_Failure ("")); } - catch (Deployment::InvalidConnection, ex) + catch (Deployment::InvalidConnection& ex) { ACE_ERROR ((LM_ERROR, "EXCEPTION: InvalidConnection exception caught: %s, %s\n", diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h index ddc3ac22ff0..f9491efdfe7 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h @@ -31,6 +31,8 @@ namespace CIAO * @returns a string containing the UUID of the plan. Null indicates failure. */ virtual const char * launch_plan (const ::Deployment::DeploymentPlan &plan); + + virtual ~Plan_Launcher_Benchmark_i (); protected: }; diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp index bf032f96825..79ad17402dc 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp @@ -39,6 +39,10 @@ namespace CIAO { } + Plan_Launcher_i::~Plan_Launcher_i () + { + } + bool Plan_Launcher_i::init (const char *em_ior, CORBA::ORB_ptr orb, diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h index ac3957f74bc..09505463d85 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h @@ -38,6 +38,7 @@ namespace CIAO }; Plan_Launcher_i (); + ~Plan_Launcher_i (); bool init (const char *em_ior, CORBA::ORB_ptr orb, |