Merged in remote

JoaoCostaIFG · Jun 4, 2018 · 52a35e2 · 52a35e2
2 parents f4f8e47 + 95fbe9d
commit 52a35e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/flatland_server/include/flatland_server/yaml_preprocessor.h b/flatland_server/include/flatland_server/yaml_preprocessor.h
@@ -78,13 +78,13 @@ void Parse(YAML::Node &node);
 YAML::Node LoadParse(const std::string &path);
 
 /**
- * @brief Find and run any eval nodes ($evalString etc.)
+ * @brief Find and run any $eval nodes
  * @param[in/out] node A Yaml node to recursively parse
  */
 void ProcessNodes(YAML::Node &node);
 
 /**
- * @brief Find and run any eval expressions ($evalString etc.)
+ * @brief Find and run any $eval expressions
  * @param[in/out] node A Yaml string node to parse
  */
 void ProcessScalarNode(YAML::Node &node);
@@ -103,4 +103,4 @@ int LuaGetParam(lua_State *L);
 };
 }
 
-#endif  // FLATLAND_SERVER_YAML_PREPROCESSOR_H
+#endif  // FLATLAND_SERVER_YAML_PREPROCESSOR_H
diff --git a/flatland_server/src/yaml_preprocessor.cpp b/flatland_server/src/yaml_preprocessor.cpp
@@ -75,7 +75,7 @@ void YamlPreprocessor::ProcessNodes(YAML::Node &node) {
         ProcessScalarNode(node);
       }
       break;
-    case default:
+    default:
       ROS_WARN_STREAM(
           "Yaml Preprocessor found an unexpected type: " << node.Type());
       break;