Fix line length and other linting errors

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
gazebosim · Mar 15, 2022 · 038107a · 038107a
1 parent c17a7ec
commit 038107a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/usd/include/sdf/usd/usd_parser/USDData.hh b/usd/include/sdf/usd/usd_parser/USDData.hh
@@ -52,18 +52,18 @@ namespace sdf
 
       /// \brief Initialize the data inside the class with the stage
       /// defined in the constructor
-      /// \return Errors, which is a vector of Error objects. Each Error includes
+      /// \return A vector of Error objects. Each Error includes
       /// an error code and message. An empty vector indicates no error.
       public: UsdErrors Init();
 
       /// \brief If a stage contains substages, this will allow to include
       /// them.
-      /// \return Errors, which is a vector of Error objects. Each Error includes
+      /// \return A vector of Error objects. Each Error includes
       /// an error code and message. An empty vector indicates no error.
       public: UsdErrors AddStage(const std::string &_ref);
 
       /// \brief Read materials
-      /// \return Errors, which is a vector of Error objects. Each Error includes
+      /// \return A vector of Error objects. Each Error includes
       /// an error code and message. An empty vector indicates no error.
       public: UsdErrors ParseMaterials();
 

diff --git a/usd/include/sdf/usd/usd_parser/USDStage.hh b/usd/include/sdf/usd/usd_parser/USDStage.hh
@@ -47,7 +47,7 @@ namespace sdf
       public: explicit USDStage(const std::string &_refFileName);
 
       /// \brief Initialize the data structure
-      /// \return Errors, which is a vector of Error objects. Each Error includes
+      /// \return A vector of Error objects. Each Error includes
       /// an error code and message. An empty vector indicates no error.
       public: UsdErrors Init();
 

diff --git a/usd/src/usd_parser/USDData.cc b/usd/src/usd_parser/USDData.cc
@@ -251,7 +251,7 @@ namespace usd {
         }
       }
     }
-    return std::make_pair<std::string, std::shared_ptr<USDStage>>("", nullptr);
+    return std::make_pair("", nullptr);
   }
 
   /////////////////////////////////////////////////

diff --git a/usd/src/usd_parser/USDMaterial.cc b/usd/src/usd_parser/USDMaterial.cc
@@ -15,6 +15,7 @@
  *
 */
 
+#include <string>
 #include "USDMaterial.hh"
 
 #include <ignition/common/Filesystem.hh>

diff --git a/usd/src/usd_parser/USDStage.cc b/usd/src/usd_parser/USDStage.cc
@@ -19,7 +19,7 @@
 #include <set>
 #include <string>
 
-// TODO(ahcorde):this is to remove deprecated "warnings" in usd, these warnings
+// TODO(ahcorde) this is to remove deprecated "warnings" in usd, these warnings
 // are reported using #pragma message so normal diagnostic flags cannot remove
 // them. This workaround requires this block to be used whenever usd is
 // included.
-Original file line number
+Diff line change
@@ Expand Up / @@ -251,7 +251,7 @@ namespace usd { @@
             }
           }
         }
-        return std::make_pair<std::string, std::shared_ptr<USDStage>>("", nullptr);
+        return std::make_pair("", nullptr);
       }
       /////////////////////////////////////////////////
@@ Expand Down @@