diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-10-12 11:19:20 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-10-12 11:19:20 +0000 |
| commit | ab3f2a2e8608150296505ca0eb9837f348cd2b75 (patch) | |
| tree | 8118090b68da5cf812020134952a36e5da8022c0 | |
| parent | 6ef1d4954e01de06ff00651fc0c4460702a702f0 (diff) | |
| download | ATCD-ab3f2a2e8608150296505ca0eb9837f348cd2b75.tar.gz | |
Fri Oct 12 11:18:36 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* dance/LocalityManager/Handler/Inst_Handler_Impl.cpp:
Fixed incorrect else
* dance/Plan_Launcher/EM_Launcher.cpp:
* dance/Plan_Launcher/LM_Launcher.cpp:
* dance/Plan_Launcher/NM_Launcher.cpp:
Layout changes
| -rw-r--r-- | DAnCE/ChangeLog | 10 | ||||
| -rw-r--r-- | DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp | 18 | ||||
| -rw-r--r-- | DAnCE/dance/Plan_Launcher/EM_Launcher.cpp | 4 | ||||
| -rw-r--r-- | DAnCE/dance/Plan_Launcher/LM_Launcher.cpp | 3 | ||||
| -rw-r--r-- | DAnCE/dance/Plan_Launcher/NM_Launcher.cpp | 3 |
5 files changed, 19 insertions, 19 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index 0d34b9de93c..f95718c3ca3 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,13 @@ +Fri Oct 12 11:18:36 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * dance/LocalityManager/Handler/Inst_Handler_Impl.cpp: + Fixed incorrect else + + * dance/Plan_Launcher/EM_Launcher.cpp: + * dance/Plan_Launcher/LM_Launcher.cpp: + * dance/Plan_Launcher/NM_Launcher.cpp: + Layout changes + Fri Oct 12 10:52:52 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * NEWS: diff --git a/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp b/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp index a18c321451a..396f8f38848 100644 --- a/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp +++ b/DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp @@ -153,15 +153,15 @@ namespace DAnCE { deps.insert (id); } - } - else - { - DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR, - (LM_ERROR, DLINFO - ACE_TEXT ("Inst_Handler_Impl::install_instance - ") - ACE_TEXT ("Unable to extract dependency order from string"))); - throw ::Deployment::StartError (idd.name.in (), - "Unable to extract dependency order from string"); + else + { + DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR, + (LM_ERROR, DLINFO + ACE_TEXT ("Inst_Handler_Impl::install_instance - ") + ACE_TEXT ("Unable to extract dependency order from string"))); + throw ::Deployment::StartError (idd.name.in (), + "Unable to extract dependency order from string"); + } } } diff --git a/DAnCE/dance/Plan_Launcher/EM_Launcher.cpp b/DAnCE/dance/Plan_Launcher/EM_Launcher.cpp index 68e6e91fc1a..1af0d78880c 100644 --- a/DAnCE/dance/Plan_Launcher/EM_Launcher.cpp +++ b/DAnCE/dance/Plan_Launcher/EM_Launcher.cpp @@ -10,11 +10,8 @@ namespace DAnCE { } - - EM_Launcher::~EM_Launcher (void) { - } bool @@ -67,5 +64,4 @@ namespace DAnCE return false; } - } diff --git a/DAnCE/dance/Plan_Launcher/LM_Launcher.cpp b/DAnCE/dance/Plan_Launcher/LM_Launcher.cpp index de595a0672c..dce9f3a88be 100644 --- a/DAnCE/dance/Plan_Launcher/LM_Launcher.cpp +++ b/DAnCE/dance/Plan_Launcher/LM_Launcher.cpp @@ -10,11 +10,8 @@ namespace DAnCE { } - - LM_Launcher::~LM_Launcher (void) { - } /* diff --git a/DAnCE/dance/Plan_Launcher/NM_Launcher.cpp b/DAnCE/dance/Plan_Launcher/NM_Launcher.cpp index e13614250cc..05515a3e049 100644 --- a/DAnCE/dance/Plan_Launcher/NM_Launcher.cpp +++ b/DAnCE/dance/Plan_Launcher/NM_Launcher.cpp @@ -10,10 +10,7 @@ namespace DAnCE { } - - NM_Launcher::~NM_Launcher (void) { - } } |