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

Fix compilation warnings and build error #480

Merged
merged 2 commits into from
Aug 2, 2015
Merged

Fix compilation warnings and build error #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e602449
Fix signed/unsigned mismatch
jslee02 Aug 1, 2015
b370483
Remove dummy function that was added to suppress warnings from bullet
jslee02 Aug 1, 2015
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
8 changes: 4 additions & 4 deletions apps/atlasSimbicon/State.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,31 +648,31 @@ double State::getDerivativeGain(int _idx) const
//==============================================================================
void State::setFeedbackSagitalCOMDistance(size_t _index, double _val)
{
assert(_index <= mSagitalCd.size() && "Invalid index.");
assert(static_cast<int>(_index) <= mSagitalCd.size() && "Invalid index.");

mSagitalCd[_index] = _val;
}

//==============================================================================
void State::setFeedbackSagitalCOMVelocity(size_t _index, double _val)
{
assert(_index <= mSagitalCv.size() && "Invalid index.");
assert(static_cast<int>(_index) <= mSagitalCv.size() && "Invalid index.");

mSagitalCv[_index] = _val;
}

//==============================================================================
void State::setFeedbackCoronalCOMDistance(size_t _index, double _val)
{
assert(_index <= mCoronalCd.size() && "Invalid index.");
assert(static_cast<int>(_index) <= mCoronalCd.size() && "Invalid index.");

mCoronalCd[_index] = _val;
}

//==============================================================================
void State::setFeedbackCoronalCOMVelocity(size_t _index, double _val)
{
assert(_index <= mCoronalCv.size() && "Invalid index.");
assert(static_cast<int>(_index) <= mCoronalCv.size() && "Invalid index.");

mCoronalCv[_index] = _val;
}
Expand Down
8 changes: 0 additions & 8 deletions dart/collision/bullet/BulletTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@
namespace dart {
namespace collision {

#if !defined(__APPLE__) && BT_BULLET_VERSION < 283
/// Dummy inline function to suppress unused-variable warning from bullet
inline int btGetInfinityMask()
{
return btInfinityMask;
}
#endif

/// @brief Convert Bullet vector3 type to Eigen vector3 type
Eigen::Vector3d convertVector3(const btVector3& _vec);

Expand Down
8 changes: 4 additions & 4 deletions unittests/testSdfParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ TEST(SdfParser, SDFSingleBodyWithoutJoint)

SkeletonPtr skel = world->getSkeleton(0);
EXPECT_TRUE(skel != nullptr);
EXPECT_EQ(skel->getNumBodyNodes(), 1);
EXPECT_EQ(skel->getNumJoints(), 1);
EXPECT_EQ(skel->getNumBodyNodes(), 1u);
EXPECT_EQ(skel->getNumJoints(), 1u);

BodyNodePtr bodyNode = skel->getBodyNode(0);
EXPECT_TRUE(bodyNode != nullptr);
EXPECT_EQ(bodyNode->getNumVisualizationShapes(), 1);
EXPECT_EQ(bodyNode->getNumCollisionShapes(), 1);
EXPECT_EQ(bodyNode->getNumVisualizationShapes(), 1u);
EXPECT_EQ(bodyNode->getNumCollisionShapes(), 1u);

JointPtr joint = skel->getJoint(0);
EXPECT_TRUE(joint != nullptr);
Expand Down