diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-07-19 08:30:25 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-07-19 08:30:25 +0000 |
| commit | 1d6b76bfeffd1f6918b5392b19a7263037b23c48 (patch) | |
| tree | b7f2ef7f393d2651933c82bf44751f67ea552e5e | |
| parent | 84eb9901537a0b3c8ecb02ba4b8a079b95cf083e (diff) | |
| download | ATCD-1d6b76bfeffd1f6918b5392b19a7263037b23c48.tar.gz | |
| -rw-r--r-- | CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp index cd76a9b2022..ec616d35005 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp @@ -117,7 +117,8 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan) try { - DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - Starting...\n"))); + DANCE_DEBUG ((LM_DEBUG, DLINFO + ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - Starting...\n"))); if (CORBA::is_nil (this->em_.in ())) { DANCE_ERROR ( (LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher_Base_Impl::launch_plan - ") @@ -520,7 +521,7 @@ Plan_Launcher_Base_Impl::stop_plan() DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") ACE_TEXT("Stopping plan \"%C\"\n"), this->plan_uuid_)); - if (!this->teardown_plan((const char *)this->plan_uuid_)) + if (!this->teardown_plan(this->plan_uuid_)) { DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") ACE_TEXT("tear down assembly failed: unknown plan uuid.\n"))); @@ -696,14 +697,14 @@ Plan_Launcher_Base_Impl::write_cdr_plan_file(const char * filename, { try { - TAO_OutputCDR cdr; - cdr << plan; - size_t buf_size = cdr.total_length(); FILE * file = ACE_OS::fopen (filename, "w"); if (0 == file) { throw Deployment_Failure ("write_cdr_plan_file : failed to open file."); } + TAO_OutputCDR cdr; + cdr << plan; + size_t buf_size = cdr.total_length(); ACE_OS::fwrite (&buf_size, sizeof (buf_size), 1, file); for (const ACE_Message_Block *i = cdr.begin (); i != 0; @@ -761,7 +762,7 @@ Plan_Launcher_Base_Impl::check_mode_consistentness() ACE_CString Plan_Launcher_Base_Impl::expand_env_vars (const ACE_TCHAR * s) { - ACE_CString src((const char *)s); + ACE_CString src(s); ACE_CString res; size_t pos_done = 0; while (pos_done < (size_t) src.length()) |