Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

USD to SDF: Fixed header guard #906

Merged
merged 6 commits into from
Mar 23, 2022
Merged

USD to SDF: Fixed header guard #906

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fec998
USD to SDF: Fixed header guard
ahcorde Mar 23, 2022
ad3d994
Merge branch 'sdf12' into ahcorde/usd_to_sdf/headerGuard
ahcorde Mar 23, 2022
f9fe0c7
feedback
ahcorde Mar 23, 2022
5700eb5
Merge remote-tracking branch 'origin/sdf12' into ahcorde/usd_to_sdf/h…
ahcorde Mar 23, 2022
4fcc9dd
Merge branch 'ahcorde/usd_to_sdf/headerGuard' of https://github.com/i…
ahcorde Mar 23, 2022
47ebbe9
fix guard
ahcorde Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions usd/src/usd_parser/USD2SDF.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <string>

Expand Down
4 changes: 2 additions & 2 deletions usd/src/usd_parser/USDMaterial.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions usd/src/usd_parser/USDPhysics.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_
ahcorde marked this conversation as resolved.
Show resolved Hide resolved

#pragma push_macro ("__DEPRECATED")
#undef __DEPRECATED
Expand Down
4 changes: 2 additions & 2 deletions usd/src/usd_parser/USDWorld.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <string>

Expand Down