From 2fec998a5b1d8e3e62f65843a377896033cbca80 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Wed, 23 Mar 2022 12:45:15 +0100 Subject: [PATCH 1/3] USD to SDF: Fixed header guard Signed-off-by: ahcorde --- usd/src/usd_parser/USD2SDF.hh | 4 ++-- usd/src/usd_parser/USDMaterial.hh | 4 ++-- usd/src/usd_parser/USDPhysics.hh | 4 ++-- usd/src/usd_parser/USDWorld.hh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usd/src/usd_parser/USD2SDF.hh b/usd/src/usd_parser/USD2SDF.hh index 9844ff043..df2043741 100644 --- a/usd/src/usd_parser/USD2SDF.hh +++ b/usd/src/usd_parser/USD2SDF.hh @@ -15,8 +15,8 @@ * */ -#ifndef USD_PARSER_USD2SDF_HH_ -#define USD_PARSER_USD2SDF_HH_ +#ifndef SDF_USD_USD_PARSER_USD2SDF_HH_ +#define SDF_USD_USD_PARSER_USD2SDF_HH_ #include diff --git a/usd/src/usd_parser/USDMaterial.hh b/usd/src/usd_parser/USDMaterial.hh index 694727147..6d5648ea2 100644 --- a/usd/src/usd_parser/USDMaterial.hh +++ b/usd/src/usd_parser/USDMaterial.hh @@ -15,8 +15,8 @@ * */ -#ifndef SDF_USD_USD_PARSER_UTILS_HH_ -#define SDF_USD_USD_PARSER_UTILS_HH_ +#ifndef SDF_USD_USD_PARSER_USDMATERIAL_HH_ +#define SDF_USD_USD_PARSER_USDMATERIAL_HH_ // TODO(ahcorde) this is to remove deprecated "warnings" in usd, these warnings // are reported using #pragma message so normal diagnostic flags cannot remove diff --git a/usd/src/usd_parser/USDPhysics.hh b/usd/src/usd_parser/USDPhysics.hh index b5835f011..70937ccbc 100644 --- a/usd/src/usd_parser/USDPhysics.hh +++ b/usd/src/usd_parser/USDPhysics.hh @@ -15,8 +15,8 @@ * */ -#ifndef USD_PARSER_PHYSYCS_HH -#define USD_PARSER_PHYSYCS_HH +#ifndef SDF_USD_USD_PARSER_USDPHYSYCS_HH_ +#define SDF_USD_USD_PARSER_USDPHYSYCS_HH_ #pragma push_macro ("__DEPRECATED") #undef __DEPRECATED diff --git a/usd/src/usd_parser/USDWorld.hh b/usd/src/usd_parser/USDWorld.hh index 6574f501e..b15d7fa55 100644 --- a/usd/src/usd_parser/USDWorld.hh +++ b/usd/src/usd_parser/USDWorld.hh @@ -15,8 +15,8 @@ * */ -#ifndef USD_PARSER_USDWORLD_HH -#define USD_PARSER_USDWORLD_HH +#ifndef SDF_USD_USD_PARSER_USDWORLD_HH_ +#define SDF_USD_USD_PARSER_USDWORLD_HH_ #include From f9fe0c719c3e26a0325fa35c781e2b2260966e19 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Wed, 23 Mar 2022 16:21:12 +0100 Subject: [PATCH 2/3] feedback Signed-off-by: ahcorde --- usd/src/usd_parser/USD2SDF.hh | 4 ++-- usd/src/usd_parser/USDMaterial.hh | 4 ++-- usd/src/usd_parser/USDPhysics.hh | 4 ++-- usd/src/usd_parser/USDWorld.hh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usd/src/usd_parser/USD2SDF.hh b/usd/src/usd_parser/USD2SDF.hh index df2043741..9844ff043 100644 --- a/usd/src/usd_parser/USD2SDF.hh +++ b/usd/src/usd_parser/USD2SDF.hh @@ -15,8 +15,8 @@ * */ -#ifndef SDF_USD_USD_PARSER_USD2SDF_HH_ -#define SDF_USD_USD_PARSER_USD2SDF_HH_ +#ifndef USD_PARSER_USD2SDF_HH_ +#define USD_PARSER_USD2SDF_HH_ #include diff --git a/usd/src/usd_parser/USDMaterial.hh b/usd/src/usd_parser/USDMaterial.hh index 6d5648ea2..164f1b9e2 100644 --- a/usd/src/usd_parser/USDMaterial.hh +++ b/usd/src/usd_parser/USDMaterial.hh @@ -15,8 +15,8 @@ * */ -#ifndef SDF_USD_USD_PARSER_USDMATERIAL_HH_ -#define SDF_USD_USD_PARSER_USDMATERIAL_HH_ +#ifndef USD_PARSER_USDMATERIAL_HH_ +#define USD_PARSER_USDMATERIAL_HH_ // TODO(ahcorde) this is to remove deprecated "warnings" in usd, these warnings // are reported using #pragma message so normal diagnostic flags cannot remove diff --git a/usd/src/usd_parser/USDPhysics.hh b/usd/src/usd_parser/USDPhysics.hh index 70937ccbc..6101fb05c 100644 --- a/usd/src/usd_parser/USDPhysics.hh +++ b/usd/src/usd_parser/USDPhysics.hh @@ -15,8 +15,8 @@ * */ -#ifndef SDF_USD_USD_PARSER_USDPHYSYCS_HH_ -#define SDF_USD_USD_PARSER_USDPHYSYCS_HH_ +#ifndef USD_PARSER_PHYSICS_HH_ +#define USD_PARSER_PHYSICS_HH_ #pragma push_macro ("__DEPRECATED") #undef __DEPRECATED diff --git a/usd/src/usd_parser/USDWorld.hh b/usd/src/usd_parser/USDWorld.hh index b15d7fa55..e51dea0e5 100644 --- a/usd/src/usd_parser/USDWorld.hh +++ b/usd/src/usd_parser/USDWorld.hh @@ -15,8 +15,8 @@ * */ -#ifndef SDF_USD_USD_PARSER_USDWORLD_HH_ -#define SDF_USD_USD_PARSER_USDWORLD_HH_ +#ifndef USD_PARSER_USDWORLD_HH_ +#define USD_PARSER_USDWORLD_HH_ #include From 47ebbe999ebc0b5ddef9ca695d3d1625807736e0 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Wed, 23 Mar 2022 16:41:33 +0100 Subject: [PATCH 3/3] fix guard Signed-off-by: ahcorde --- usd/src/usd_parser/USDPhysics.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usd/src/usd_parser/USDPhysics.hh b/usd/src/usd_parser/USDPhysics.hh index 6101fb05c..1b594ae3b 100644 --- a/usd/src/usd_parser/USDPhysics.hh +++ b/usd/src/usd_parser/USDPhysics.hh @@ -15,8 +15,8 @@ * */ -#ifndef USD_PARSER_PHYSICS_HH_ -#define USD_PARSER_PHYSICS_HH_ +#ifndef USD_PARSER_USDPHYSICS_HH_ +#define USD_PARSER_USDPHYSICS_HH_ #pragma push_macro ("__DEPRECATED") #undef __DEPRECATED