Fix compile error with std::filesystem::canonical()

dartsim · Jan 14, 2022 · 68c8928 · 68c8928
1 parent 49b7b0e
commit 68c8928
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/dart/common/Filesystem.hpp b/dart/common/Filesystem.hpp
@@ -25,7 +25,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#pragma once
+#ifndef DART_COMMON_FILESYSTEM_HPP_
+#define DART_COMMON_FILESYSTEM_HPP_
 
 #include "dart/common/Platform.hpp"
 
@@ -107,3 +108,5 @@ using error_code = ::std::error_code;
   #endif
 
 #endif // #ifndef DART_INCLUDE_STD_FILESYSTEM_EXPERIMENTAL
+
+#endif // #ifndef DART_COMMON_FILESYSTEM_HPP_
diff --git a/dart/gui/osg/render/MeshShapeNode.cpp b/dart/gui/osg/render/MeshShapeNode.cpp
@@ -315,7 +315,7 @@ void MeshShapeNode::extractData(bool firstTime)
           const common::filesystem::path relativeImagePath = imagePath.C_Str();
           const common::filesystem::path absoluteImagePath
               = common::filesystem::canonical(
-                  relativeImagePath, meshPath.parent_path(), ec);
+                  meshPath.parent_path() / relativeImagePath, ec);
 
           if (ec)
           {