update file structure, include guards and namespaces

adlarkin · adlarkin · commit 2088f1e756d7 · 2022-01-24T15:18:33.000-07:00
Signed-off-by: Ashton Larkin &lt;42042756+adlarkin@users.noreply.github.com&gt;
diff --git a/usd/include/sdf/usd/usd_parser/USDData.hh b/usd/include/sdf/usd/usd_parser/USDData.hh
@@ -15,8 +15,8 @@
  *
 */
 
-#ifndef SDF_USD_PARSER_USDDATA_HH
-#define SDF_USD_PARSER_USDDATA_HH
+#ifndef SDF_USD_USD_PARSER_USDDATA_HH_
+#define SDF_USD_USD_PARSER_USDDATA_HH_
 
 #include <memory>
 #include <set>
@@ -36,7 +36,7 @@
 #include "sdf/Material.hh"
 #include "sdf/sdf_config.h"
 #include "sdf/system_util.hh"
-#include "sdf/usd_parser/USDStage.hh"
+#include "sdf/usd/usd_parser/USDStage.hh"
 
 namespace sdf
 {
diff --git a/usd/include/sdf/usd/usd_parser/USDStage.hh b/usd/include/sdf/usd/usd_parser/USDStage.hh
@@ -15,8 +15,8 @@
  *
 */
 
-#ifndef SDF_USD_PARSER_USDSTAGE_HH
-#define SDF_USD_PARSER_USDSTAGE_HH
+#ifndef SDF_USD_USD_PARSER_USDSTAGE_HH_
+#define SDF_USD_USD_PARSER_USDSTAGE_HH_
 
 #include <string>
 #include <set>
diff --git a/usd/include/sdf/usd/usd_parser/utils.hh b/usd/include/sdf/usd/usd_parser/utils.hh
@@ -15,8 +15,8 @@
  *
 */
 
-#ifndef SDF_USD_PARSER_UTILS_HH
-#define SDF_USD_PARSER_UTILS_HH
+#ifndef SDF_USD_USD_PARSER_UTILS_HH_
+#define SDF_USD_USD_PARSER_UTILS_HH_
 
 #include <string>
 
diff --git a/usd/src/usd_parser/USDData.cc b/usd/src/usd_parser/USDData.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
 */
-#include "sdf/usd_parser/USDData.hh"
+#include "sdf/usd/usd_parser/USDData.hh"
 
 #include <string>
 #include <set>
@@ -35,11 +35,13 @@
 #include <ignition/common/Filesystem.hh>
 #include <ignition/common/Util.hh>
 
-#include "sdf/usd_parser/utils.hh"
+#include "sdf/usd/usd_parser/utils.hh"
 #include "sdf/Material.hh"
 
 namespace sdf {
-
+// Inline bracke to help doxygen filtering.
+inline namespace SDF_VERSION_NAMESPACE {
+//
 namespace usd {
   /// \brief USDStage private data.
   class USDData::Implementation
@@ -260,3 +262,4 @@ namespace usd {
   }
 }
 }
+}
diff --git a/usd/src/usd_parser/USDData_TEST.cc b/usd/src/usd_parser/USDData_TEST.cc
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 
 #include <ignition/common/Filesystem.hh>
-#include <sdf/usd_parser/USDData.hh>
+#include <sdf/usd/usd_parser/USDData.hh>
 
 #include <ignition/utilities/ExtraTestMacros.hh>
 
diff --git a/usd/src/usd_parser/USDStage.cc b/usd/src/usd_parser/USDStage.cc
@@ -30,11 +30,13 @@
 #include <pxr/usd/usd/stage.h>
 #pragma pop_macro ("__DEPRECATED")
 
-#include "sdf/usd_parser/USDStage.hh"
-#include "sdf/usd_parser/utils.hh"
+#include "sdf/usd/usd_parser/USDStage.hh"
+#include "sdf/usd/usd_parser/utils.hh"
 
-namespace sdf
-{
+namespace sdf {
+// Inline bracke to help doxygen filtering.
+inline namespace SDF_VERSION_NAMESPACE {
+//
 namespace usd
 {
   /// \brief USDStage private data.
@@ -116,4 +118,5 @@ namespace usd
     return this->dataPtr->paths;
   }
 }  // usd
+}  // sdf version namespace
 }  // sdf
diff --git a/usd/src/usd_parser/USDStage_TEST.cc b/usd/src/usd_parser/USDStage_TEST.cc
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 
 #include <ignition/common/Filesystem.hh>
-#include <sdf/usd_parser/USDStage.hh>
+#include <sdf/usd/usd_parser/USDStage.hh>
 
 #include <ignition/utilities/ExtraTestMacros.hh>
 
diff --git a/usd/src/usd_parser/utils.cc b/usd/src/usd_parser/utils.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include "sdf/usd_parser/utils.hh"
+#include "sdf/usd/usd_parser/utils.hh"
 
 #include <pxr/usd/usdShade/input.h>
 #include <pxr/usd/usdShade/material.h>

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
`18`		`-#ifndef SDF_USD_PARSER_USDSTAGE_HH`
`19`		`-#define SDF_USD_PARSER_USDSTAGE_HH`
	`18`	`+#ifndef SDF_USD_USD_PARSER_USDSTAGE_HH_`
	`19`	`+#define SDF_USD_USD_PARSER_USDSTAGE_HH_`
`20`	`20`
`21`	`21`	`#include <string>`
`22`	`22`	`#include <set>`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
`18`		`-#include "sdf/usd_parser/utils.hh"`
	`18`	`+#include "sdf/usd/usd_parser/utils.hh"`
`19`	`19`
`20`	`20`	`#include <pxr/usd/usdShade/input.h>`
`21`	`21`	`#include <pxr/usd/usdShade/material.h>`