summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-04-14 14:05:38 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-04-14 14:05:38 +0000
commit52399831386792581062b8c95a8f766612530467 (patch)
tree9b9391be0fef0a4303b50b38cabe8ffb19d33f0f
parent8b2da0809e79737bf2b1a055a83e788a82d29880 (diff)
downloadATCD-52399831386792581062b8c95a8f766612530467.tar.gz
Thu Apr 14 14:05:16 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* dance/Logger/Logger_Service.cpp: * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: Errors.
-rw-r--r--DAnCE/ChangeLog7
-rw-r--r--DAnCE/dance/Logger/Logger_Service.cpp4
-rw-r--r--DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp3
3 files changed, 10 insertions, 4 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index af2c280160c..120e8694fb9 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 14 14:05:16 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
+
+ * dance/Logger/Logger_Service.cpp:
+ * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp:
+
+ Errors.
+
Wed Apr 13 16:54:52 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* dance/NodeManager/NodeManager_Impl.cpp:
diff --git a/DAnCE/dance/Logger/Logger_Service.cpp b/DAnCE/dance/Logger/Logger_Service.cpp
index 66430b936b1..b95ba64b59b 100644
--- a/DAnCE/dance/Logger/Logger_Service.cpp
+++ b/DAnCE/dance/Logger/Logger_Service.cpp
@@ -103,8 +103,8 @@ namespace DAnCE
{
DANCE_ERROR (DANCE_LOG_EMERGENCY,
(LM_EMERGENCY, DLINFO
- "Logger_Service::init - "
- "Unable to load backend %s\n",
+ ACE_TEXT ("Logger_Service::init - ")
+ ACE_TEXT ("Unable to load backend %s\n"),
this->backend_.c_str ()));
return -1;
}
diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp
index e19aa628c0b..d326bac7ffe 100644
--- a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp
+++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp
@@ -577,8 +577,7 @@ Plan_Launcher_Base_Impl< Manager, AppManager, Application>
template <typename Manager, typename AppManager, typename Application>
void
-Plan_Launcher_Base_Impl< Manager, AppManager, Application>
-::destroy_app_manager(CORBA::Object_ptr am_obj)
+Plan_Launcher_Base_Impl< Manager, AppManager, Application>::destroy_app_manager(CORBA::Object_ptr am_obj)
{
DANCE_TRACE ("Plan_Launcher_Base_Impl::destroy_app_manager");