change interface to rosconsole backend from list-of-pairs to map

ros · Oct 31, 2013 · a2eba21 · a2eba21 · tfoote · Oct 31, 2013
1 parent 764f278
commit a2eba21
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/clients/roscpp/src/libros/init.cpp b/clients/roscpp/src/libros/init.cpp
@@ -170,11 +170,11 @@ void shutdownCallback(XmlRpc::XmlRpcValue& params, XmlRpc::XmlRpcValue& result)
 
 bool getLoggers(roscpp::GetLoggers::Request&, roscpp::GetLoggers::Response& resp)
 {
-  std::list<std::pair<std::string, ros::console::levels::Level> > loggers;
+  std::map<std::string, ros::console::levels::Level> loggers;
   bool success = ::ros::console::get_loggers(loggers);
   if (success)
   {
-    for (std::list<std::pair<std::string, ros::console::levels::Level> >::const_iterator it = loggers.begin(); it != loggers.end(); it++)
+    for (std::map<std::string, ros::console::levels::Level>::const_iterator it = loggers.begin(); it != loggers.end(); it++)
     {
       roscpp::Logger logger;
       logger.name = it->first;

diff --git a/tools/rosconsole/include/ros/console.h b/tools/rosconsole/include/ros/console.h
@@ -37,7 +37,7 @@
 #include <ros/time.h>
 #include <cstdarg>
 #include <ros/macros.h>
-#include <list>
+#include <map>
 
 // Import/export for windows dll's and visibility for gcc shared libraries.
 
@@ -88,7 +88,7 @@ enum Level
 }
 typedef levels::Level Level;
 
-extern ROSCONSOLE_DECL bool get_loggers(std::list<std::pair<std::string, levels::Level> >& loggers);
+extern ROSCONSOLE_DECL bool get_loggers(std::map<std::string, levels::Level>& loggers);
 extern ROSCONSOLE_DECL bool set_logger_level(const std::string& name, levels::Level level);
 
 /**

diff --git a/tools/rosconsole/src/rosconsole/impl/rosconsole_glog.cpp b/tools/rosconsole/src/rosconsole/impl/rosconsole_glog.cpp
@@ -100,11 +100,11 @@ void register_appender(LogAppender* appender)
 void shutdown()
 {}
 
-bool get_loggers(std::list<std::pair<std::string, levels::Level> >& loggers)
+bool get_loggers(std::map<std::string, levels::Level> >& loggers)
 {
   for(std::vector<std::pair<std::string, levels::Level> >::const_iterator it = rosconsole_glog_log_levels.begin(); it != rosconsole_glog_log_levels.end(); it++)
   {
-    loggers.push_back(*it);
+    loggers[it->first] = it->second;
   }
   return true;
 }

diff --git a/tools/rosconsole/src/rosconsole/impl/rosconsole_log4cxx.cpp b/tools/rosconsole/src/rosconsole/impl/rosconsole_log4cxx.cpp
@@ -214,7 +214,7 @@ std::string getName(void* handle)
 #endif
 }
 
-bool get_loggers(std::list<std::pair<std::string, levels::Level> >& loggers)
+bool get_loggers(std::map<std::string, levels::Level>& loggers)
 {
   log4cxx::spi::LoggerRepositoryPtr repo = log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME)->getLoggerRepository();
 
@@ -252,7 +252,7 @@ bool get_loggers(std::list<std::pair<std::string, levels::Level> >& loggers)
     {
       level = levels::Fatal;
     }
-    loggers.push_back(std::pair<std::string, levels::Level>(name, level));
+    loggers[name] = level;
   }
 
   return true;

diff --git a/tools/rosconsole/src/rosconsole/impl/rosconsole_print.cpp b/tools/rosconsole/src/rosconsole/impl/rosconsole_print.cpp
@@ -73,7 +73,7 @@ void register_appender(LogAppender* appender)
 void shutdown()
 {}
 
-bool get_loggers(std::list<std::pair<std::string, levels::Level> >& loggers)
+bool get_loggers(std::map<std::string, levels::Level>& loggers)
 {
   return true;
 }

diff --git a/tools/rosconsole/src/rosconsole/rosconsole.cpp b/tools/rosconsole/src/rosconsole/rosconsole.cpp
@@ -71,7 +71,7 @@ void* getHandle(const std::string& name);
 
 std::string getName(void* handle);
 
-bool get_loggers(std::list<std::pair<std::string, levels::Level> >& loggers);
+bool get_loggers(std::map<std::string, levels::Level>& loggers);
 
 bool set_logger_level(const std::string& name, levels::Level level);
 
@@ -656,7 +656,7 @@ void shutdown()
   ros::console::impl::shutdown();
 }
 
-bool get_loggers(std::list<std::pair<std::string, levels::Level> >& loggers)
+bool get_loggers(std::map<std::string, levels::Level>& loggers)
 {
   return ros::console::impl::get_loggers(loggers);
 }