summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-10-17 17:27:41 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-10-17 17:27:41 +0000
commitf197954370d4c101d2c57de5c24bd5a76f39943e (patch)
tree5352d0fc2f0cad4b0353db2b4213a4dfffb12c2b
parent8d65458f59a0e0628470bb8b08491ec6ad49d201 (diff)
downloadATCD-f197954370d4c101d2c57de5c24bd5a76f39943e.tar.gz
Mon Oct 17 17:27:17 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* dance/Plan_Launcher/Plan_Launcher.mpc: stab at a static linking problem. * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp: warnings.
-rw-r--r--DAnCE/ChangeLog9
-rw-r--r--DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc3
-rw-r--r--DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp16
3 files changed, 19 insertions, 9 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 386e20d7c57..8636b75706f 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,12 @@
+Mon Oct 17 17:27:17 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
+
+ * dance/Plan_Launcher/Plan_Launcher.mpc:
+ stab at a static linking problem.
+
+ * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp:
+
+ warnings.
+
Mon Oct 17 06:15:45 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc:
diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc b/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc
index 2a5bc4cc6d8..9763dc7403d 100644
--- a/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc
+++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc
@@ -22,8 +22,7 @@ project(DAnCE_Plan_Launcher_Impl) : install_lib, dance_lib, dance_logger, dance_
}
}
-project(Plan_Launcher_Exec) : install, dance_exe, dance_plan_launcher, \
- dance_domain_validator {
+project(Plan_Launcher_Exec) : dance_domain_validator, install, dance_exe, dance_plan_launcher {
exename = dance_plan_launcher
Source_Files {
Plan_Launcher.cpp
diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
index 6edd7e53242..b8101e3bd82 100644
--- a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
+++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
@@ -113,6 +113,8 @@ DAnCE_Domain_Validator_i::create_node_table (void)
this->node_map_ [destination] = ior;
}
+
+ return true;
}
::CORBA::Boolean
@@ -296,9 +298,9 @@ DAnCE_Domain_Validator_i::block_for_node (const char * node_name,
(LM_EMERGENCY, DLINFO, ACE_TEXT ("Plan_Launcher - ")
ACE_TEXT ("Unable to validate connection to Manager: %C\n"),
last_error.c_str ()));
- return 0;
+ return false;
}
-
+ return true;
}
::CORBA::Boolean
@@ -330,7 +332,6 @@ DAnCE_Domain_Validator_i::block_for_domain (const ::DAnCE::Time_Value & max_bloc
ACE_Time_Value tv = this->convert_time_value (max_block_time);
ACE_Time_Value timeout (ACE_OS::gettimeofday () + ACE_Time_Value (tv));
- bool retval = false;
late_nodes = new ::CORBA::StringSeq (0);
NODE_LIST untried_list;
@@ -480,11 +481,12 @@ DAnCE_Domain_Validator_i::validate_plan (const ::Deployment::DeploymentPlan & pl
}
::CORBA::Boolean
-DAnCE_Domain_Validator_i::block_for_plan (const ::Deployment::DeploymentPlan & plan,
- const ::DAnCE::Time_Value & max_block_time,
- ::CORBA::StringSeq_out late_nodes)
+DAnCE_Domain_Validator_i::block_for_plan (const ::Deployment::DeploymentPlan & ,
+ const ::DAnCE::Time_Value & ,
+ ::CORBA::StringSeq_out )
{
// Add your implementation here
- ACE_Time_Value tv = this->convert_time_value (max_block_time);
+ // ACE_Time_Value tv = this->convert_time_value (max_block_time);
+ throw CORBA::NO_IMPLEMENT ();
}