Skip to content

Commit

Permalink
Fix compiler warnings (#808)
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Peters <[email protected]>
  • Loading branch information
scpeters committed Dec 29, 2021
1 parent 40b54f0 commit 4abb38c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 18 deletions.
18 changes: 1 addition & 17 deletions src/FrameSemantics.cc
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ static Errors resolveModelPoseWithPlacementFrame(

/////////////////////////////////////////////////
Errors buildFrameAttachedToGraph(
ScopedGraph<FrameAttachedToGraph> &_out, const Model *_model, bool _isRoot)
ScopedGraph<FrameAttachedToGraph> &_out, const Model *_model, bool)
{
Errors errors;

Expand Down Expand Up @@ -313,22 +313,6 @@ Errors buildFrameAttachedToGraph(

const std::string scopeContextName = "__model__";

auto rootId = ignition::math::graph::kNullId;
if (_isRoot)
{
// The __root__ vertex identifies the scope that contains a root level
// model. In the PoseRelativeTo graph, this vertex is connected to the model
// with an edge that holds the value of //model/pose. However, in the
// FrameAttachedTo graph, the vertex is disconnected because nothing is
// attached to it. Since only links and static models are allowed to be
// disconnected in this graph, the STATIC_MODEL was chosen as its frame
// type. A different frame type could potentially be used, but that adds
// more complexity to the validateFrameAttachedToGraph code.
_out = _out.AddScopeVertex(
"", "__root__", scopeContextName, sdf::FrameType::STATIC_MODEL);
rootId = _out.ScopeVertexId();
}

const auto modelId = _out.AddVertex(_model->Name(), frameType).Id();

auto outModel = _out.AddScopeVertex(
Expand Down
2 changes: 1 addition & 1 deletion src/World.cc
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ Errors World::Load(sdf::ElementPtr _sdf, const ParserConfig &_config)

for (const auto &ifaceModelPair : this->dataPtr->interfaceModels)
{
frameNames.insert(ifaceModelPair.second->Name()).second;
frameNames.insert(ifaceModelPair.second->Name());
}

// Load all the physics.
Expand Down

0 comments on commit 4abb38c

Please sign in to comment.