summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-03-30 23:12:14 +0000
committerdengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-03-30 23:12:14 +0000
commite1893026d7003edf48b84db7f21e9cc80a0e6bcc (patch)
treed6e2bf6e3236d2414a6aedf04222633d8410ff24
parente88dcbae56d9a5c136ce87bf3b36e3bed9be7234 (diff)
downloadATCD-e1893026d7003edf48b84db7f21e9cc80a0e6bcc.tar.gz
Fri Mar 30 23:10:24 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu>
-rw-r--r--CIAO/ChangeLog9
-rw-r--r--CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp4
-rw-r--r--CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h1
3 files changed, 9 insertions, 5 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index c9315712669..0619fcb192a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Mar 30 23:10:24 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu>
+
+ * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp:
+ * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h:
+
+ Removed the declaration and definition of the virtual
+ destructor since a virtual destructor has been defined
+ in the base class.
+
Fri Mar 30 18:23:43 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu>
* DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp
index 7084bf568e7..6b45f0b2042 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp
@@ -10,10 +10,6 @@ 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)
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h
index f9491efdfe7..880d6bcb171 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h
@@ -32,7 +32,6 @@ namespace CIAO
*/
virtual const char * launch_plan (const ::Deployment::DeploymentPlan &plan);
- virtual ~Plan_Launcher_Benchmark_i ();
protected:
};