Merge branch 'ign-physics2' into claire/canonical-link

gazebosim · Nov 12, 2020 · 13ef221 · 13ef221
2 parents 888d158 + c11a47d
commit 13ef221
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 11 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -115,6 +115,17 @@
 
 ## Ignition Physics 1.x
 
+### Ignition Physics 1.10.0 (2020-11-04)
+
+1. Resolved codecheck issues
+    * [Pull request 154](https://github.com/ignitionrobotics/ign-physics/pull/154)
+
+1. Ignore invalid joint commands in the dartsim-plugin
+    * [Pull request 137](https://github.com/ignitionrobotics/ign-physics/pull/137)
+
+1.  Fix CONFIG arg in ign_find_package(DART) call
+    * [Pull request 119](https://github.com/ignitionrobotics/ign-physics/pull/119)
+
 ### Ignition Physics 1.9.0 (2020-09-17)
 
 1. Support for slip compliance in the dartsim-plugin.

diff --git a/dartsim/src/CustomMeshShape.cc b/dartsim/src/CustomMeshShape.cc
@@ -15,11 +15,14 @@
  *
 */
 
+#include "CustomMeshShape.hh"
+
+#include <memory>
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/common/SubMesh.hh>
 
-#include "CustomMeshShape.hh"
-
 namespace ignition {
 namespace physics {
 namespace dartsim {

diff --git a/dartsim/src/EntityManagementFeatures.cc b/dartsim/src/EntityManagementFeatures.cc
@@ -17,6 +17,9 @@
 
 #include "EntityManagementFeatures.hh"
 
+#include <memory>
+#include <string>
+
 #include <dart/config.hpp>
 #include <dart/collision/ode/OdeCollisionDetector.hpp>
 #include <dart/constraint/ConstraintSolver.hpp>
@@ -25,8 +28,6 @@
 #include <dart/collision/CollisionFilter.hpp>
 #include <dart/collision/CollisionObject.hpp>
 
-#include <string>
-
 namespace ignition {
 namespace physics {
 namespace dartsim {

diff --git a/dartsim/src/SDFFeatures.cc b/dartsim/src/SDFFeatures.cc
@@ -17,6 +17,10 @@
 
 #include "SDFFeatures.hh"
 
+#include <cmath>
+#include <limits>
+#include <memory>
+
 #include <dart/constraint/ConstraintSolver.hpp>
 #include <dart/dynamics/BallJoint.hpp>
 #include <dart/dynamics/BoxShape.hpp>
@@ -32,8 +36,6 @@
 #include <dart/constraint/WeldJointConstraint.hpp>
 #include <dart/dynamics/WeldJoint.hpp>
 
-#include <cmath>
-
 #include <ignition/common/Console.hh>
 #include <ignition/math/eigen3/Conversions.hh>
 #include <ignition/math/Helpers.hh>

diff --git a/dartsim/src/ShapeFeatures.cc b/dartsim/src/ShapeFeatures.cc
@@ -15,6 +15,10 @@
  *
 */
 
+#include "ShapeFeatures.hh"
+
+#include <memory>
+
 #include <dart/dynamics/BoxShape.hpp>
 #include <dart/dynamics/CylinderShape.hpp>
 #include <dart/dynamics/MeshShape.hpp>
@@ -23,7 +27,6 @@
 #include <dart/dynamics/SphereShape.hpp>
 
 #include "CustomMeshShape.hh"
-#include "ShapeFeatures.hh"
 
 namespace ignition {
 namespace physics {

diff --git a/include/ignition/physics/Cloneable.hh b/include/ignition/physics/Cloneable.hh
@@ -107,13 +107,13 @@ namespace ignition
       public: MakeCloneable& operator=(MakeCloneable &&_other);
 
       // Documentation inherited
-      public: std::unique_ptr<Cloneable> Clone() const override final;
+      public: std::unique_ptr<Cloneable> Clone() const final;
 
       // Documentation inherited
-      public: void Copy(const Cloneable &_other) override final;
+      public: void Copy(const Cloneable &_other) final;
 
       // Documentation inherited
-      public: void Copy(Cloneable &&_other) override final;
+      public: void Copy(Cloneable &&_other) final;
     };
   }
 }

diff --git a/include/ignition/physics/RelativeQuantity.hh b/include/ignition/physics/RelativeQuantity.hh
@@ -50,7 +50,7 @@ namespace ignition
       /// \brief This constructor will specify the parent frame and then forward
       /// the remaining arguments to the constructor of the underlying quantity.
       public: template <typename... Args>
-      RelativeQuantity(const FrameID &_parentID, Args&&... _args);
+      explicit RelativeQuantity(const FrameID &_parentID, Args&&... _args);
 
       /// \brief Implicit conversion constructor.
       public: RelativeQuantity(const Q &_rawValue);