Use relative path in an urdf include to avoid confusion between inter…

…nal and system headers (#1259) Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
gazebosim · Aug 30, 2023 · 9f7a377 · 9f7a377
1 parent b999425
commit 9f7a377
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/src/urdf/urdf_parser/check_urdf.cpp b/src/urdf/urdf_parser/check_urdf.cpp
@@ -35,7 +35,7 @@
 /* Author: Wim Meeussen */
 #pragma warning(push, 0)
 
-#include "urdf_parser/urdf_parser.h"
+#include "../urdf_parser/urdf_parser.h"
 #include <iostream>
 #include <fstream>
 

diff --git a/src/urdf/urdf_parser/joint.cpp b/src/urdf/urdf_parser/joint.cpp
@@ -41,7 +41,7 @@
 #include <urdf_model/joint.h>
 // #include <console_bridge/console.h>
 #include <tinyxml2.h>
-#include <urdf_parser/urdf_parser.h>
+#include "../urdf_parser/urdf_parser.h"
 
 namespace urdf{
 

diff --git a/src/urdf/urdf_parser/link.cpp b/src/urdf/urdf_parser/link.cpp
@@ -35,7 +35,7 @@
 /* Author: Wim Meeussen */
 #pragma warning(push, 0)
 
-#include <urdf_parser/urdf_parser.h>
+#include "../urdf_parser/urdf_parser.h"
 #include <urdf_model/link.h>
 #include <fstream>
 #include <sstream>

diff --git a/src/urdf/urdf_parser/model.cpp b/src/urdf/urdf_parser/model.cpp
@@ -36,7 +36,11 @@
 #pragma warning(push, 0)
 
 #include <vector>
-#include "urdf_parser/urdf_parser.h"
+// Use relative path to avoid confusion with urdf system headers (if present).
+// The change to the relative path is only required to be present in this
+// file given how MSVC include headers. See:
+// https://github.com/gazebosim/sdformat/pull/1259/files#r1149821498
+#include "../urdf_parser/urdf_parser.h"
 // #include <console_bridge/console.h>
 #include <fstream>
 

diff --git a/src/urdf/urdf_parser/pose.cpp b/src/urdf/urdf_parser/pose.cpp
@@ -41,7 +41,7 @@
 #include <algorithm>
 // #include <console_bridge/console.h>
 #include <tinyxml2.h>
-#include <urdf_parser/urdf_parser.h>
+#include "../urdf_parser/urdf_parser.h"
 
 namespace urdf_export_helpers {
 

diff --git a/src/urdf/urdf_parser/urdf_to_graphiz.cpp b/src/urdf/urdf_parser/urdf_to_graphiz.cpp
@@ -35,7 +35,7 @@
 /* Author: Wim Meeussen */
 #pragma warning(push, 0)
 
-#include "urdf_parser/urdf_parser.h"
+#include "../urdf_parser/urdf_parser.h"
 #include <iostream>
 #include <fstream>
 

diff --git a/src/urdf/urdf_parser/world.cpp b/src/urdf/urdf_parser/world.cpp
@@ -37,7 +37,7 @@
 
 #include <urdf_world/world.h>
 #include <urdf_model/model.h>
-#include <urdf_parser/urdf_parser.h>
+#include "../urdf_parser/urdf_parser.h"
 #include <fstream>
 #include <sstream>
 #include <algorithm>