Use USD component visibility macro (#849)

scpeters · adlarkin · web-flow · commit 8e832e7f7b1a · 2022-02-10T11:50:35.000-08:00
Each component has its own Export.hh header file
and its own visibility macros, so use the proper
visibility macros in the USD component.

Signed-off-by: Steve Peters &lt;scpeters@openrobotics.org&gt;

* usd full path to Export.hh instead of relative

Signed-off-by: Ashton Larkin &lt;42042756+adlarkin@users.noreply.github.com&gt;
Co-authored-by: Ashton Larkin &lt;42042756+adlarkin@users.noreply.github.com&gt;
diff --git a/usd/include/sdf/usd/sdf_parser/Light.hh b/usd/include/sdf/usd/sdf_parser/Light.hh
@@ -30,7 +30,7 @@
 #pragma pop_macro ("__DEPRECATED")
 
 #include "sdf/config.hh"
-#include "sdf/system_util.hh"
+#include "sdf/usd/Export.hh"
 #include "sdf/Light.hh"
 
 namespace sdf
@@ -48,8 +48,10 @@ namespace sdf
     /// be a valid USD path.
     /// \return Errors, which is a vector of Error objects. Each Error includes
     /// an error code and message. An empty vector indicates no error.
-    sdf::Errors SDFORMAT_VISIBLE ParseSdfLight(const sdf::Light &_light,
-        pxr::UsdStageRefPtr &_stage, const std::string &_path);
+    sdf::Errors IGNITION_SDFORMAT_USD_VISIBLE ParseSdfLight(
+        const sdf::Light &_light,
+        pxr::UsdStageRefPtr &_stage,
+        const std::string &_path);
   }
   }
 }
diff --git a/usd/include/sdf/usd/sdf_parser/Utils.hh b/usd/include/sdf/usd/sdf_parser/Utils.hh
@@ -35,8 +35,8 @@
 #pragma pop_macro ("__DEPRECATED")
 
 #include "sdf/SemanticPose.hh"
-#include "sdf/config.hh"
 #include "sdf/system_util.hh"
+#include "sdf/usd/Export.hh"
 
 namespace sdf
 {
@@ -52,7 +52,8 @@ namespace sdf
     /// \return _obj's pose w.r.t. its parent. If there was an error computing
     /// this pose, the pose's position will be NaNs.
     template <typename T>
-    inline ignition::math::Pose3d SDFORMAT_VISIBLE PoseWrtParent(const T &_obj)
+    inline ignition::math::Pose3d IGNITION_SDFORMAT_USD_VISIBLE
+    PoseWrtParent(const T &_obj)
     {
       ignition::math::Pose3d pose(ignition::math::Vector3d::NaN,
           ignition::math::Quaterniond::Identity);
@@ -70,8 +71,10 @@ namespace sdf
     /// \param[in] _stage The stage that contains the USD prim at path _usdPath.
     /// \param[in] _usdPath The path to the USD prim that should have its
     /// pose modified to match _pose.
-    inline void SDFORMAT_VISIBLE SetPose(const ignition::math::Pose3d &_pose,
-        pxr::UsdStageRefPtr &_stage, const pxr::SdfPath &_usdPath)
+    inline void IGNITION_SDFORMAT_USD_VISIBLE SetPose(
+        const ignition::math::Pose3d &_pose,
+        pxr::UsdStageRefPtr &_stage,
+        const pxr::SdfPath &_usdPath)
     {
       pxr::UsdGeomXformCommonAPI geomXformAPI(_stage->GetPrimAtPath(_usdPath));
 
diff --git a/usd/include/sdf/usd/sdf_parser/World.hh b/usd/include/sdf/usd/sdf_parser/World.hh
@@ -30,7 +30,7 @@
 #pragma pop_macro ("__DEPRECATED")
 
 #include "sdf/config.hh"
-#include "sdf/system_util.hh"
+#include "sdf/usd/Export.hh"
 #include "sdf/World.hh"
 
 namespace sdf
@@ -48,8 +48,10 @@ namespace sdf
     /// a valid USD path.
     /// \return Errors, which is a vector of Error objects. Each Error includes
     /// an error code and message. An empty vector indicates no error.
-    sdf::Errors SDFORMAT_VISIBLE ParseSdfWorld(const sdf::World &_world,
-        pxr::UsdStageRefPtr &_stage, const std::string &_path);
+    sdf::Errors IGNITION_SDFORMAT_USD_VISIBLE ParseSdfWorld(
+        const sdf::World &_world,
+        pxr::UsdStageRefPtr &_stage,
+        const std::string &_path);
   }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`#pragma pop_macro ("__DEPRECATED")`
`31`	`31`
`32`	`32`	`#include "sdf/config.hh"`
`33`		`-#include "sdf/system_util.hh"`
	`33`	`+#include "sdf/usd/Export.hh"`
`34`	`34`	`#include "sdf/Light.hh"`
`35`	`35`
`36`	`36`	`namespace sdf`
`@@ -48,8 +48,10 @@ namespace sdf`
`48`	`48`	`/// be a valid USD path.`
`49`	`49`	`/// \return Errors, which is a vector of Error objects. Each Error includes`
`50`	`50`	`/// an error code and message. An empty vector indicates no error.`
`51`		`- sdf::Errors SDFORMAT_VISIBLE ParseSdfLight(const sdf::Light &_light,`
`52`		`- pxr::UsdStageRefPtr &_stage, const std::string &_path);`
	`51`	`+ sdf::Errors IGNITION_SDFORMAT_USD_VISIBLE ParseSdfLight(`
	`52`	`+ const sdf::Light &_light,`
	`53`	`+ pxr::UsdStageRefPtr &_stage,`
	`54`	`+ const std::string &_path);`
`53`	`55`	`}`
`54`	`56`	`}`
`55`	`57`	`}`