[openrtm-commit:01219] r2414 - branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-02-06 12:57:04 +0900 (Thu, 06 Feb 2014)
New Revision: 2414

Modified:
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
Log:
[compat,bugfix] coil::flatten() in RELENG_1_1 has no second argument.

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp	2014-02-06 03:20:51 UTC (rev 2413)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp	2014-02-06 03:57:04 UTC (rev 2414)
@@ -258,7 +258,7 @@
    */
   void ModuleManager::setLoadpath(const std::vector<std::string>& load_path)
   {
-    RTC_TRACE(("setLoadpath(%s)", coil::flatten(load_path, ", ").c_str()));
+    RTC_TRACE(("setLoadpath(%s)", coil::flatten(load_path).c_str()));
     m_loadPath = load_path;
     return;
   }
@@ -272,7 +272,7 @@
    */
   void ModuleManager::addLoadpath(const std::vector<std::string>& load_path)
   {
-    RTC_TRACE(("addLoadpath(%s)", coil::flatten(load_path, ", ").c_str()));
+    RTC_TRACE(("addLoadpath(%s)", coil::flatten(load_path).c_str()));
     StringVectorConstItr it(load_path.begin());
     StringVectorConstItr it_end(load_path.end());
     
@@ -354,7 +354,7 @@
 				      const std::vector<std::string>& load_path)
   {
     RTC_TRACE(("findFile(%s, %s)", fname.c_str(),
-	       coil::flatten(load_path, ", ").c_str()));
+	       coil::flatten(load_path).c_str()));
     StringVectorConstItr it, it_end;
     std::string file_name(fname);