Browse Source

[5150a] Changed module by app_name as it can be reserved on some C++ extensions

Francis Dupont 8 years ago
parent
commit
a4e3825235
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/lib/process/d_controller.cc

+ 4 - 4
src/lib/process/d_controller.cc

@@ -491,7 +491,7 @@ ConstElementPtr
 DControllerBase::configTestHandler(const std::string&, ConstElementPtr args) {
 DControllerBase::configTestHandler(const std::string&, ConstElementPtr args) {
     const int status_code = COMMAND_ERROR; // 1 indicates an error
     const int status_code = COMMAND_ERROR; // 1 indicates an error
     ConstElementPtr module_config;
     ConstElementPtr module_config;
-    std::string module = getAppName();
+    std::string app_name = getAppName();
     std::string message;
     std::string message;
 
 
     // Command arguments are expected to be:
     // Command arguments are expected to be:
@@ -501,11 +501,11 @@ DControllerBase::configTestHandler(const std::string&, ConstElementPtr args) {
     if (!args) {
     if (!args) {
         message = "Missing mandatory 'arguments' parameter.";
         message = "Missing mandatory 'arguments' parameter.";
     } else {
     } else {
-      module_config = args->get(module);
+      module_config = args->get(app_name);
         if (!module_config) {
         if (!module_config) {
-            message = "Missing mandatory '" + module + "' parameter.";
+            message = "Missing mandatory '" + app_name + "' parameter.";
         } else if (module_config->getType() != Element::map) {
         } else if (module_config->getType() != Element::map) {
-            message = "'" + module + "' parameter expected to be a map.";
+            message = "'" + app_name + "' parameter expected to be a map.";
         }
         }
     }
     }