Fix strings

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
gazebosim · Aug 10, 2023 · 119cabd · 119cabd
1 parent cc8a96a
commit 119cabd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/include/sdf/Param.hh b/include/sdf/Param.hh
@@ -85,6 +85,11 @@ namespace sdf
        : val(_val), precision(_precision) {}
   };
 
+  // Template deduction guide for ParamVariant
+  template<typename ParamVariant>
+  ParamStreamer(const ParamVariant &_val, int _precision)
+    -> ParamStreamer<ParamVariant>;
+
   template<class T>
   std::ostream& operator<<(std::ostream &os, ParamStreamer<T> s)
   {

diff --git a/src/SDF.cc b/src/SDF.cc
@@ -126,7 +126,7 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath,
 
   // Next check the versioned install path.
   path = sdf::filesystem::append(sdfSharePath(),
-                                 "sdformat" SDF_MAJOR_VERSION_STR,
+                                 "sdformat" + std::string(SDF_MAJOR_VERSION_STR),
                                  sdf::SDF::Version(), filename);
   if (sdf::filesystem::exists(path))
   {