urdf_parser: convert remaining files to HAVE_TINYXML

ros · Feb 14, 2023 · 0bca496 · 0bca496
1 parent a65ae22
commit 0bca496
Show file tree

Hide file tree

Showing 10 changed files with 1,782 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,7 @@ endif (MSVC OR MSVC90 OR MSVC10)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-if(DISABLE_TINYXML_SUPPORT)
+if(NOT DISABLE_TINYXML_SUPPORT)
   find_package(tinyxml_vendor QUIET)
   find_package(TinyXML)
   # bionic has not cmake module, workaround

diff --git a/urdf_parser/include/urdf_parser/urdf_parser.h b/urdf_parser/include/urdf_parser/urdf_parser.h
@@ -154,8 +154,8 @@ namespace urdf{
   URDFDOM_DLLAPI bool parseSensor(Sensor&, TiXmlElement*);
   URDFDOM_DLLAPI bool parseModelState(ModelState&, TiXmlElement*);
 #endif
-  URDFDOM_DLLAPI void exportURDF(ModelInterfaceSharedPtr &model, XMLDocument &doc);
-  URDFDOM_DLLAPI void exportURDF(const ModelInterface &model, XMLDocument &doc);
+  URDFDOM_DLLAPI void exportURDF(ModelInterfaceSharedPtr &model, tinyxml2::XMLDocument &doc);
+  URDFDOM_DLLAPI void exportURDF(const ModelInterface &model, tinyxml2::XMLDocument &doc);
   URDFDOM_DLLAPI bool parsePose(Pose&, tinyxml2::XMLElement*);
   URDFDOM_DLLAPI bool parseCamera(Camera&, tinyxml2::XMLElement*);
   URDFDOM_DLLAPI bool parseRay(Ray&, tinyxml2::XMLElement*);