summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-04-11 02:57:41 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-04-11 02:57:41 +0000
commitb0721921d40b5f6c49346563cf875315a5b9b35f (patch)
tree99ad140a3eb7ecc89ed269c3267b074dab931daf
parent1a408b7a13cf54da32c6fe9f5a0ff1fbd45bcdc3 (diff)
downloadATCD-b0721921d40b5f6c49346563cf875315a5b9b35f.tar.gz
Mon Apr 11 02:57:16 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* dance/Plan_Launcher/LM_Launcher.h: * dance/Plan_Launcher/Plan_Launcher.cpp: Fuzz and bugfixes.
-rw-r--r--DAnCE/ChangeLog7
-rw-r--r--DAnCE/dance/Plan_Launcher/LM_Launcher.h2
-rw-r--r--DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp6
3 files changed, 11 insertions, 4 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index ef193c8a0bc..00662c1620c 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 11 02:57:16 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
+
+ * dance/Plan_Launcher/LM_Launcher.h:
+ * dance/Plan_Launcher/Plan_Launcher.cpp:
+
+ Fuzz and bugfixes.
+
Sun Apr 10 19:38:22 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* dance/Plan_Launcher/LM_Launcher.h:
diff --git a/DAnCE/dance/Plan_Launcher/LM_Launcher.h b/DAnCE/dance/Plan_Launcher/LM_Launcher.h
index 8a569af8bed..d20d93b575c 100644
--- a/DAnCE/dance/Plan_Launcher/LM_Launcher.h
+++ b/DAnCE/dance/Plan_Launcher/LM_Launcher.h
@@ -1,5 +1,5 @@
/**
- * @file EM_Launcher.h
+ * @file LM_Launcher.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
*
* $Id$
diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp b/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp
index 373d08b7ecf..7c2569002ed 100644
--- a/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp
+++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp
@@ -292,12 +292,12 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
/// Sanity checking on the options.
// In all cases, we need to have a EM/NM IOR specified, but only one.
- if ((!options.em_ior_ && !options.nm_ior_) ||
- (options.em_ior_ && options.nm_ior_))
+ if ((!options.em_ior_ && !options.nm_ior_ && !options.lm_ior_) ||
+ (options.em_ior_ && options.nm_ior_ && options.lm_ior_))
{
DANCE_ERROR (DANCE_LOG_EMERGENCY,
(LM_ERROR, DLINFO ACE_TEXT ("Plan_launcher::parse_args - ")
- ACE_TEXT ("Error: Must specify either EM IOR or NM IOR\n")));
+ ACE_TEXT ("Error: Must specify either EM IOR, NM IOR, LM IOR\n")));
return false;
}