Skip to content

Commit 4549718

Browse files
Levi ArmstrongLevi-Armstrong
authored andcommitted
Update to clang-tidy version 10
1 parent 21afd36 commit 4549718

File tree

21 files changed

+81
-238
lines changed

21 files changed

+81
-238
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ Tesseract currently leverages Compiler Warnigs, Clang Tidy and Code Coverage. Al
122122
- cppcoreguidelines-no-malloc
123123
- cppcoreguidelines-slicing
124124
- cppcoreguidelines-special-member-functions
125-
- misc-*
126-
- modernize-*
125+
- misc-*,-misc-non-private-member-variables-in-classes
126+
- modernize-*,-modernize-use-trailing-return-type,-modernize-use-nodiscard
127127
- performance-*
128128
- readability-avoid-const-params-in-decls
129129
- readability-container-size-empty

tesseract/tesseract_collision/include/tesseract_collision/test_suite/collision_octomap_mesh_unit.hpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,11 @@ inline void runTest(DiscreteContactManager& checker, const std::string& file_pat
106106
idx = 1;
107107

108108
mesh_vertices_color[static_cast<std::size_t>(
109-
(*mesh_triangles)[static_cast<std::size_t>(4 * r.subshape_id[static_cast<std::size_t>(idx)] + 1)])] =
110-
Eigen::Vector3i(255, 0, 0);
109+
(*mesh_triangles)[4 * r.subshape_id[static_cast<std::size_t>(idx)] + 1])] = Eigen::Vector3i(255, 0, 0);
111110
mesh_vertices_color[static_cast<std::size_t>(
112-
(*mesh_triangles)[static_cast<std::size_t>(4 * r.subshape_id[static_cast<std::size_t>(idx)] + 2)])] =
113-
Eigen::Vector3i(255, 0, 0);
111+
(*mesh_triangles)[4 * r.subshape_id[static_cast<std::size_t>(idx)] + 2])] = Eigen::Vector3i(255, 0, 0);
114112
mesh_vertices_color[static_cast<std::size_t>(
115-
(*mesh_triangles)[static_cast<std::size_t>(4 * r.subshape_id[static_cast<std::size_t>(idx)] + 3)])] =
116-
Eigen::Vector3i(255, 0, 0);
113+
(*mesh_triangles)[4 * r.subshape_id[static_cast<std::size_t>(idx)] + 3])] = Eigen::Vector3i(255, 0, 0);
117114
}
118115

119116
writeSimplePlyFile(file_path, *mesh_vertices, mesh_vertices_color, *mesh_triangles, mesh->getTriangleCount());

tesseract/tesseract_common/cmake/tesseract_macros.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ macro(tesseract_variables)
4949
set(TESSERACT_COMPILE_OPTIONS_PUBLIC "")
5050
set(TESSERACT_COMPILE_OPTIONS_PRIVATE "")
5151
if (NOT TESSERACT_ENABLE_TESTING AND NOT TESSERACT_ENABLE_TESTING_ALL)
52-
set(TESSERACT_CLANG_TIDY_ARGS "-header-filter=.*" "-line-filter=[{'name':'EnvironmentMonitorDynamicReconfigureConfig.h','lines':[[9999999,9999999]]}, {'name':'.h'}, {'name':'.hpp'}]" "-checks=-*,clang-analyzer-*,bugprone-*,cppcoreguidelines-avoid-goto,cppcoreguidelines-c-copy-assignment-signature,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-narrowing-conversions,cppcoreguidelines-no-malloc,cppcoreguidelines-slicing,cppcoreguidelines-special-member-functions,misc-*,modernize-*,performance-*,readability-avoid-const-params-in-decls,readability-container-size-empty,readability-delete-null-pointer,readability-deleted-default,readability-else-after-return,readability-function-size,readability-identifier-naming,readability-inconsistent-declaration-parameter-name,readability-misleading-indentation,readability-misplaced-array-index,readability-non-const-parameter,readability-redundant-*,readability-simplify-*,readability-static-*,readability-string-compare,readability-uniqueptr-delete-release,readability-rary-objects")
52+
set(TESSERACT_CLANG_TIDY_ARGS "-header-filter=.*" "-line-filter=[{'name':'EnvironmentMonitorDynamicReconfigureConfig.h','lines':[[9999999,9999999]]}, {'name':'.h'}, {'name':'.hpp'}]" "-checks=-*,clang-analyzer-*,bugprone-*,cppcoreguidelines-avoid-goto,cppcoreguidelines-c-copy-assignment-signature,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-narrowing-conversions,cppcoreguidelines-no-malloc,cppcoreguidelines-slicing,cppcoreguidelines-special-member-functions,misc-*,-misc-non-private-member-variables-in-classes,modernize-*,-modernize-use-trailing-return-type,-modernize-use-nodiscard,performance-*,readability-avoid-const-params-in-decls,readability-container-size-empty,readability-delete-null-pointer,readability-deleted-default,readability-else-after-return,readability-function-size,readability-identifier-naming,readability-inconsistent-declaration-parameter-name,readability-misleading-indentation,readability-misplaced-array-index,readability-non-const-parameter,readability-redundant-*,readability-simplify-*,readability-static-*,readability-string-compare,readability-uniqueptr-delete-release,readability-rary-objects")
5353
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
5454
set(TESSERACT_COMPILE_OPTIONS_PRIVATE -Wall -Wextra -Wconversion -Wsign-conversion -Wno-sign-compare -Wnon-virtual-dtor)
5555
set(TESSERACT_COMPILE_OPTIONS_PUBLIC -mno-avx)
@@ -63,7 +63,7 @@ macro(tesseract_variables)
6363
message(WARNING "${CMAKE_CXX_COMPILER_ID} Unsupported compiler detected.")
6464
endif()
6565
else()
66-
set(TESSERACT_CLANG_TIDY_ARGS "-header-filter=.*" "-line-filter=[{'name':'EnvironmentMonitorDynamicReconfigureConfig.h','lines':[[9999999,9999999]]}, {'name':'.h'}, {'name':'.hpp'}]" "-checks=-*,clang-analyzer-*,bugprone-*,cppcoreguidelines-avoid-goto,cppcoreguidelines-c-copy-assignment-signature,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-narrowing-conversions,cppcoreguidelines-no-malloc,cppcoreguidelines-slicing,cppcoreguidelines-special-member-functions,misc-*,modernize-*,performance-*,readability-avoid-const-params-in-decls,readability-container-size-empty,readability-delete-null-pointer,readability-deleted-default,readability-else-after-return,readability-function-size,readability-identifier-naming,readability-inconsistent-declaration-parameter-name,readability-misleading-indentation,readability-misplaced-array-index,readability-non-const-parameter,readability-redundant-*,readability-simplify-*,readability-static-*,readability-string-compare,readability-uniqueptr-delete-release,readability-rary-objects" "-warnings-as-errors=-*,clang-analyzer-*,bugprone-*,cppcoreguidelines-avoid-goto,cppcoreguidelines-c-copy-assignment-signature,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-narrowing-conversions,cppcoreguidelines-no-malloc,cppcoreguidelines-slicing,cppcoreguidelines-special-member-functions,misc-*,modernize-*,performance-*,readability-avoid-const-params-in-decls,readability-container-size-empty,readability-delete-null-pointer,readability-deleted-default,readability-else-after-return,readability-function-size,readability-identifier-naming,readability-inconsistent-declaration-parameter-name,readability-misleading-indentation,readability-misplaced-array-index,readability-non-const-parameter,readability-redundant-*,readability-simplify-*,readability-static-*,readability-string-compare,readability-uniqueptr-delete-release,readability-rary-objects")
66+
set(TESSERACT_CLANG_TIDY_ARGS "-header-filter=.*" "-line-filter=[{'name':'EnvironmentMonitorDynamicReconfigureConfig.h','lines':[[9999999,9999999]]}, {'name':'.h'}, {'name':'.hpp'}]" "-checks=-*,clang-analyzer-*,bugprone-*,cppcoreguidelines-avoid-goto,cppcoreguidelines-c-copy-assignment-signature,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-narrowing-conversions,cppcoreguidelines-no-malloc,cppcoreguidelines-slicing,cppcoreguidelines-special-member-functions,misc-*,-misc-non-private-member-variables-in-classes,modernize-*,-modernize-use-trailing-return-type,-modernize-use-nodiscard,performance-*,readability-avoid-const-params-in-decls,readability-container-size-empty,readability-delete-null-pointer,readability-deleted-default,readability-else-after-return,readability-function-size,readability-identifier-naming,readability-inconsistent-declaration-parameter-name,readability-misleading-indentation,readability-misplaced-array-index,readability-non-const-parameter,readability-redundant-*,readability-simplify-*,readability-static-*,readability-string-compare,readability-uniqueptr-delete-release,readability-rary-objects" "-warnings-as-errors=-*,clang-analyzer-*,bugprone-*,cppcoreguidelines-avoid-goto,cppcoreguidelines-c-copy-assignment-signature,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-narrowing-conversions,cppcoreguidelines-no-malloc,cppcoreguidelines-slicing,cppcoreguidelines-special-member-functions,misc-*,-misc-non-private-member-variables-in-classes,modernize-*,-modernize-use-trailing-return-type,-modernize-use-nodiscard,performance-*,readability-avoid-const-params-in-decls,readability-container-size-empty,readability-delete-null-pointer,readability-deleted-default,readability-else-after-return,readability-function-size,readability-identifier-naming,readability-inconsistent-declaration-parameter-name,readability-misleading-indentation,readability-misplaced-array-index,readability-non-const-parameter,readability-redundant-*,readability-simplify-*,readability-static-*,readability-string-compare,readability-uniqueptr-delete-release,readability-rary-objects")
6767
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
6868
set(TESSERACT_COMPILE_OPTIONS_PRIVATE -Werror=all -Werror=extra -Werror=conversion -Werror=sign-conversion -Wno-sign-compare -Werror=non-virtual-dtor)
6969
set(TESSERACT_COMPILE_OPTIONS_PUBLIC -mno-avx)

tesseract/tesseract_common/include/tesseract_common/sfinae_utils.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#ifndef TESSEACT_COMMON_SFINAE_UTILS_H
22
#define TESSEACT_COMMON_SFINAE_UTILS_H
33

4+
#include <tesseract_common/macros.h>
5+
TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
46
#include <type_traits>
7+
#include <array>
8+
TESSERACT_COMMON_IGNORE_WARNINGS_POP
59

610
/*
711
* https://stackoverflow.com/questions/257288/templated-check-for-the-existence-of-a-class-member-function
@@ -40,9 +44,9 @@ template <typename Alias, typename AmbiguitySeed>
4044
struct has_member
4145
{
4246
template <typename C>
43-
static char (&f(decltype(&C::value)))[1];
47+
static std::array<char, 1>& f(decltype(&C::value));
4448
template <typename C>
45-
static char (&f(...))[2];
49+
static std::array<char, 2>& f(...);
4650

4751
// Make sure the member name is consistently spelled the same.
4852
static_assert((sizeof(f<AmbiguitySeed>(nullptr)) == 1),

tesseract/tesseract_common/include/tesseract_common/utils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ inline bool toNumeric(const std::string& s, FloatType& value)
127127
* @param limits The limits to generated numbers based on.
128128
* @return A vector of random numbers between the provided limits.
129129
*/
130-
inline Eigen::VectorXd generateRandomNumber(Eigen::MatrixX2d limits)
130+
inline Eigen::VectorXd generateRandomNumber(const Eigen::Ref<const Eigen::MatrixX2d>& limits)
131131
{
132132
Eigen::VectorXd joint_values;
133133
joint_values.resize(limits.rows());
134134
for (long i = 0; i < limits.rows(); ++i)
135135
{
136-
std::uniform_real_distribution<double> sample{ limits(i, 0), limits(i, 1) };
136+
std::uniform_real_distribution<double> sample(limits(i, 0), limits(i, 1));
137137
joint_values(i) = sample(mersenne);
138138
}
139139
return joint_values;

tesseract/tesseract_planning/tesseract_motion_planners/include/tesseract_motion_planners/core/planner.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
3333

3434
#include <tesseract_common/status_code.h>
3535
#include <tesseract_motion_planners/core/types.h>
36-
#include <tesseract_motion_planners/core/trajectory_validator.h>
3736

3837
#ifdef SWIG
3938
%shared_ptr(tesseract_planning::MotionPlanner)

tesseract/tesseract_planning/tesseract_motion_planners/include/tesseract_motion_planners/core/trajectory_validator.h

Lines changed: 0 additions & 168 deletions
This file was deleted.

tesseract/tesseract_planning/tesseract_motion_planners/include/tesseract_motion_planners/descartes/descartes_tesseract_kinematics.h

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,19 @@ class DescartesTesseractKinematics : public descartes_light::KinematicsInterface
5353
* @param tesseract_fk Forward kinematics object
5454
* @param tesseract_ik Inverse kinematics object
5555
*/
56-
DescartesTesseractKinematics(const tesseract_kinematics::ForwardKinematics::ConstPtr tesseract_fk,
57-
const tesseract_kinematics::InverseKinematics::ConstPtr tesseract_ik)
58-
: DescartesTesseractKinematics(tesseract_fk,
59-
tesseract_ik,
60-
std::bind(&descartes_light::isWithinLimits<FloatType>,
61-
std::placeholders::_1,
62-
tesseract_fk->getLimits().joint_limits.cast<FloatType>()),
63-
std::bind(&descartes_light::getRedundantSolutions<FloatType>,
64-
std::placeholders::_1,
65-
tesseract_fk->getLimits().joint_limits.cast<FloatType>()))
56+
DescartesTesseractKinematics(const tesseract_kinematics::ForwardKinematics::ConstPtr& tesseract_fk,
57+
const tesseract_kinematics::InverseKinematics::ConstPtr& tesseract_ik)
58+
: DescartesTesseractKinematics(
59+
tesseract_fk,
60+
tesseract_ik,
61+
[=](const FloatType* vertex) {
62+
return descartes_light::isWithinLimits<FloatType>(vertex,
63+
tesseract_fk->getLimits().joint_limits.cast<FloatType>());
64+
},
65+
[=](const FloatType* vertex) {
66+
return descartes_light::getRedundantSolutions<FloatType>(
67+
vertex, tesseract_fk->getLimits().joint_limits.cast<FloatType>());
68+
})
6669
{
6770
ik_seed_ = Eigen::VectorXd::Zero(dof());
6871
}

tesseract/tesseract_planning/tesseract_motion_planners/include/tesseract_motion_planners/descartes/descartes_vertex_evaluator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class DescartesJointLimitsVertexEvaluator : public DescartesVertexEvaluator<Floa
5858
{
5959
public:
6060
using Ptr = typename std::shared_ptr<DescartesJointLimitsVertexEvaluator<FloatType>>;
61-
DescartesJointLimitsVertexEvaluator(Eigen::MatrixX2d limits) : limits_(std::move(limits)) {}
61+
DescartesJointLimitsVertexEvaluator(const Eigen::Ref<const Eigen::MatrixX2d>& limits) : limits_(limits) {}
6262

6363
bool operator()(const Eigen::Ref<const Eigen::Matrix<FloatType, Eigen::Dynamic, 1>>& vertex) const override
6464
{

0 commit comments

Comments
 (0)