Skip to content

Commit 0851949

Browse files
committed
Added TODO
Signed-off-by: ahcorde <ahcorde@gmail.com>
1 parent c4c189f commit 0851949

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

usd/include/sdf/usd/sdf_parser/World.hh

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020

2121
#include <string>
2222

23+
// TODO(ahcorde):this is to remove deprecated "warnings" in usd, these warnings
24+
// are reported using #pragma message so normal diagnostic flags cannot remove
25+
// them. This workaround requires this block to be used whenever usd is
26+
// included.
2327
#pragma push_macro ("__DEPRECATED")
2428
#undef __DEPRECATED
2529
#include <pxr/usd/usd/stage.h>

usd/src/cmd/sdf2usd.cc

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717

1818
#include <string.h>
1919

20+
// TODO(ahcorde):this is to remove deprecated "warnings" in usd, these warnings
21+
// are reported using #pragma message so normal diagnostic flags cannot remove
22+
// them. This workaround requires this block to be used whenever usd is
23+
// included.
2024
#include <ignition/utils/cli/CLI.hpp>
2125
#pragma push_macro ("__DEPRECATED")
2226
#undef __DEPRECATED

usd/src/sdf_parser/World.cc

+7-3
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,19 @@
2020
#include <iostream>
2121
#include <string>
2222

23+
// TODO(ahcorde):this is to remove deprecated "warnings" in usd, these warnings
24+
// are reported using #pragma message so normal diagnostic flags cannot remove
25+
// them. This workaround requires this block to be used whenever usd is
26+
// included.
27+
#pragma push_macro ("__DEPRECATED")
28+
#undef __DEPRECATED
2329
#include <pxr/base/gf/vec3f.h>
2430
#include <pxr/usd/sdf/path.h>
2531
#include <pxr/usd/usd/prim.h>
26-
#pragma push_macro ("__DEPRECATED")
27-
#undef __DEPRECATED
2832
#include <pxr/usd/usd/stage.h>
29-
#pragma pop_macro ("__DEPRECATED")
3033
#include <pxr/usd/usdGeom/tokens.h>
3134
#include <pxr/usd/usdPhysics/scene.h>
35+
#pragma pop_macro ("__DEPRECATED")
3236

3337
#include "sdf/World.hh"
3438

usd/src/sdf_parser/World_Sdf2Usd_TEST.cc

+5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
#include <string>
1919

2020
#include <gtest/gtest.h>
21+
22+
// TODO(ahcorde):this is to remove deprecated "warnings" in usd, these warnings
23+
// are reported using #pragma message so normal diagnostic flags cannot remove
24+
// them. This workaround requires this block to be used whenever usd is
25+
// included.
2126
#pragma push_macro ("__DEPRECATED")
2227
#undef __DEPRECATED
2328
#include <pxr/base/gf/vec3f.h>

0 commit comments

Comments
 (0)