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 codecheck #499

Merged
merged 2 commits into from
Dec 18, 2020
Merged

Fix codecheck #499

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
ca53234
Fix codecheck
Dec 17, 2020
75d0aa3
Merge branch 'ign-gazebo3' into codecheck_fix_20201217
Dec 17, 2020
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
1 change: 1 addition & 0 deletions include/ignition/gazebo/detail/EntityComponentManager.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ namespace traits
template<typename DataType>
auto CompareData = [](const DataType &_a, const DataType &_b) -> bool
{
// cppcheck-suppress syntaxError
if constexpr (std::is_same<DataType, double>::value)
{
return math::equal(_a, _b);
Expand Down
2 changes: 2 additions & 0 deletions src/gui/plugins/entity_tree/EntityTree.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,14 @@ namespace gazebo
struct EntityInfo
{
/// \brief Entity ID
// cppcheck-suppress unusedStructMember
unsigned int entity;

/// \brief Entity name
QString name;

/// \brief Parent ID
// cppcheck-suppress unusedStructMember
unsigned int parentEntity;

/// \brief Entity type
Expand Down
1 change: 1 addition & 0 deletions src/gui/plugins/resource_spawner/ResourceSpawner.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ namespace gazebo

/// \brief True if the user is currently observing fuel resources and false
/// if the user is currently observing local resources.
// cppcheck-suppress unusedStructMember
bool isFuel = false;
};

Expand Down
8 changes: 4 additions & 4 deletions src/gui/plugins/tape_measure/TapeMeasure.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
*
*/

#include "ignition/gazebo/gui/GuiEvents.hh"

#include "TapeMeasure.hh"
#include <ignition/msgs/marker.pb.h>

#include <iostream>
#include <unordered_set>
Expand All @@ -28,12 +26,14 @@
#include <ignition/gui/Application.hh>
#include <ignition/gui/GuiEvents.hh>
#include <ignition/gui/MainWindow.hh>
#include <ignition/msgs/marker.pb.h>
#include <ignition/msgs/Utility.hh>
#include <ignition/plugin/Register.hh>
#include <ignition/transport/Node.hh>
#include <ignition/transport/Publisher.hh>

#include "ignition/gazebo/gui/GuiEvents.hh"
#include "TapeMeasure.hh"

namespace ignition::gazebo
{
class TapeMeasurePrivate
Expand Down
1 change: 1 addition & 0 deletions src/ign.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ extern "C" IGNITION_GAZEBO_VISIBLE const char *findFuelResource(
ignmsg << "Cached world found." << std::endl;
worldPath = path;
}
// cppcheck-suppress syntaxError
else if (ignition::fuel_tools::Result result =
fuelClient.DownloadWorld(ignition::common::URI(_pathToResource), path);
result)
Expand Down
4 changes: 4 additions & 0 deletions test/integration/scene_broadcaster_system.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ TEST_P(SceneBroadcasterTest, PoseInfo)

unsigned int sleep{0u};
unsigned int maxSleep{10u};
// cppcheck-suppress unmatchedSuppression
// cppcheck-suppress knownConditionTrueFalse
while (!received && sleep++ < maxSleep)
IGN_SLEEP_MS(100);

Expand Down Expand Up @@ -447,6 +449,8 @@ TEST_P(SceneBroadcasterTest, State)
node.Request("/world/default/state_async", req);

sleep = 0;
// cppcheck-suppress unmatchedSuppression
// cppcheck-suppress knownConditionTrueFalse
while (!received && sleep++ < maxSleep)
{
// Run server
Expand Down