diff --git a/core/include/moveit/task_constructor/cost_terms.h b/core/include/moveit/task_constructor/cost_terms.h index 35346408..3beb8db9 100644 --- a/core/include/moveit/task_constructor/cost_terms.h +++ b/core/include/moveit/task_constructor/cost_terms.h @@ -70,7 +70,7 @@ public: class TrajectoryCostTerm : public CostTerm { public: - enum class Mode + enum class Mode : uint8_t { AUTO /* TRAJECTORY, or START_INTERFACE if no trajectory is given */, START_INTERFACE, diff --git a/core/include/moveit/task_constructor/stage.h b/core/include/moveit/task_constructor/stage.h index 74fb3941..37be554a 100644 --- a/core/include/moveit/task_constructor/stage.h +++ b/core/include/moveit/task_constructor/stage.h @@ -72,7 +72,7 @@ MOVEIT_CLASS_FORWARD(RobotTrajectory); namespace moveit { namespace task_constructor { -enum InterfaceFlag +enum InterfaceFlag : uint8_t { READS_START = 0x01, READS_END = 0x02, @@ -155,7 +155,7 @@ public: * * INTERFACE takes precedence over PARENT. */ - enum PropertyInitializerSource + enum PropertyInitializerSource : uint8_t { // TODO: move to property.cpp DEFAULT = 0, MANUAL = 1, @@ -293,7 +293,7 @@ public: PRIVATE_CLASS(PropagatingEitherWay) PropagatingEitherWay(const std::string& name = "propagating either way"); - enum Direction + enum Direction : uint8_t { AUTO = 0x00, // auto-derive direction from context FORWARD = 0x01, // propagate forward only diff --git a/core/include/moveit/task_constructor/stages/connect.h b/core/include/moveit/task_constructor/stages/connect.h index bac878fd..c4aba253 100644 --- a/core/include/moveit/task_constructor/stages/connect.h +++ b/core/include/moveit/task_constructor/stages/connect.h @@ -67,7 +67,7 @@ protected: bool compatible(const InterfaceState& from_state, const InterfaceState& to_state) const override; public: - enum MergeMode + enum MergeMode : uint8_t { SEQUENTIAL = 0, WAYPOINTS = 1 diff --git a/core/include/moveit/task_constructor/stages/generate_random_pose.h b/core/include/moveit/task_constructor/stages/generate_random_pose.h index 139a5f4f..c6643daf 100644 --- a/core/include/moveit/task_constructor/stages/generate_random_pose.h +++ b/core/include/moveit/task_constructor/stages/generate_random_pose.h @@ -57,7 +57,7 @@ public: /** Function signature for pose dimension samplers. * The input parameter is the seed, the returned value is the sampling result. */ using PoseDimensionSampler = std::function; - enum PoseDimension + enum PoseDimension : uint8_t { X, Y, diff --git a/core/include/moveit/task_constructor/storage.h b/core/include/moveit/task_constructor/storage.h index e0796980..c1059d33 100644 --- a/core/include/moveit/task_constructor/storage.h +++ b/core/include/moveit/task_constructor/storage.h @@ -80,7 +80,7 @@ class InterfaceState friend class ContainerBasePrivate; // allow setting priority_ for pruning public: - enum Status + enum Status : uint8_t { ENABLED, // state is actively considered during planning ARMED, // disabled state in a Connecting interface that will become re-enabled with a new opposite state @@ -197,12 +197,12 @@ public: const InterfaceState* operator->() const noexcept { return base_type::const_iterator::operator*(); } }; - enum Direction + enum Direction : uint8_t { FORWARD, BACKWARD, }; - enum Update + enum Update : uint8_t { STATUS = 1 << 0, PRIORITY = 1 << 1, diff --git a/core/test/test_container.cpp b/core/test/test_container.cpp index 5d7b722c..670ffef6 100644 --- a/core/test/test_container.cpp +++ b/core/test/test_container.cpp @@ -15,7 +15,7 @@ using namespace moveit::task_constructor; -enum StageType +enum StageType : uint8_t { GEN, FW, diff --git a/rviz_marker_tools/include/rviz_marker_tools/marker_creation.h b/rviz_marker_tools/include/rviz_marker_tools/marker_creation.h index 222456bd..7e0c5c97 100644 --- a/rviz_marker_tools/include/rviz_marker_tools/marker_creation.h +++ b/rviz_marker_tools/include/rviz_marker_tools/marker_creation.h @@ -11,7 +11,7 @@ class Geometry; namespace rviz_marker_tools { -enum Color +enum Color : uint8_t { BLACK = 0, BROWN = 1, diff --git a/visualization/motion_planning_tasks/src/remote_task_model.cpp b/visualization/motion_planning_tasks/src/remote_task_model.cpp index 430a3157..6d5ecc57 100644 --- a/visualization/motion_planning_tasks/src/remote_task_model.cpp +++ b/visualization/motion_planning_tasks/src/remote_task_model.cpp @@ -54,7 +54,7 @@ using namespace moveit::task_constructor; namespace moveit_rviz_plugin { -enum NodeFlag +enum NodeFlag : uint8_t { WAS_VISITED = 0x01, // indicate that model should emit change notifications NAME_CHANGED = 0x02, // indicate that name was manually changed diff --git a/visualization/motion_planning_tasks/src/task_list_model.h b/visualization/motion_planning_tasks/src/task_list_model.h index 0386543d..c82eb06f 100644 --- a/visualization/motion_planning_tasks/src/task_list_model.h +++ b/visualization/motion_planning_tasks/src/task_list_model.h @@ -77,7 +77,7 @@ protected: rviz::DisplayContext* display_context_; public: - enum TaskModelFlag + enum TaskModelFlag : uint8_t { LOCAL_MODEL = 0x01, IS_DESTROYED = 0x02, diff --git a/visualization/motion_planning_tasks/src/task_panel.h b/visualization/motion_planning_tasks/src/task_panel.h index e372731f..58fe9a23 100644 --- a/visualization/motion_planning_tasks/src/task_panel.h +++ b/visualization/motion_planning_tasks/src/task_panel.h @@ -118,7 +118,7 @@ class TaskView : public SubPanel protected: // configuration settings - enum TaskExpand + enum TaskExpand : uint8_t { EXPAND_TOP = 1, EXPAND_ALL, @@ -130,7 +130,7 @@ protected: rviz::BoolProperty* show_time_column; public: - enum OldTaskHandling + enum OldTaskHandling : uint8_t { OLD_TASK_KEEP = 1, OLD_TASK_REPLACE, diff --git a/visualization/motion_planning_tasks/utils/icon.h b/visualization/motion_planning_tasks/utils/icon.h index 630a43a3..7f709ff5 100644 --- a/visualization/motion_planning_tasks/utils/icon.h +++ b/visualization/motion_planning_tasks/utils/icon.h @@ -43,7 +43,7 @@ using IconMaskAndColor = QPair; class Icon : public QVector { public: - enum IconStyleOption + enum IconStyleOption : uint8_t { NONE = 0, TINT = 1,