Add an override for sdf::trim that takes a std::string

Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · Jun 2, 2020 · fdecf77 · fdecf77
1 parent a7b244c
commit fdecf77
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/include/sdf/Types.hh b/include/sdf/Types.hh
@@ -74,6 +74,12 @@ namespace sdf
   SDFORMAT_VISIBLE
   std::string trim(const char *_in);
 
+  /// \brief Trim leading and trailing whitespace from a string.
+  /// \param[in] _in The string to trim.
+  /// \return A string containing the trimmed value.
+  SDFORMAT_VISIBLE
+  std::string trim(const std::string &_in);
+
   /// \brief check if two values are equal, within a tolerance
   /// \param[in] _a the first value
   /// \param[in] _b the second value

diff --git a/src/Types.cc b/src/Types.cc
@@ -53,17 +53,21 @@ std::vector<std::string> split(const std::string &_str,
 //////////////////////////////////////////////////
 std::string trim(const char *_in)
 {
-  std::string str(_in);
+  return sdf::trim(std::string(_in));
+}
 
-  const size_t strBegin = str.find_first_not_of(" \t");
+//////////////////////////////////////////////////
+std::string trim(const std::string &_in)
+{
+  const size_t strBegin = _in.find_first_not_of(" \t");
   if (strBegin == std::string::npos)
   {
     return "";
   }
 
-  const size_t strRange = str.find_last_not_of(" \t") - strBegin + 1;
+  const size_t strRange = _in.find_last_not_of(" \t") - strBegin + 1;
 
-  return str.substr(strBegin, strRange);
+  return _in.substr(strBegin, strRange);
 }
 
 /////////////////////////////////////////////////