Skip to content

Commit d15c121

Browse files
mjcarrollcwecht
andauthored
ConfigType.h.template: fixed warnings (ros#136) (ros#149)
Co-authored-by: Christopher Wecht <[email protected]>
1 parent 6dcd1af commit d15c121

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

templates/ConfigType.h.template

+14-11
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ namespace ${pkgname}
4444
description = d;
4545
edit_method = e;
4646
}
47+
virtual ~AbstractParamDescription() = default;
4748

4849
virtual void clamp(${configname}Config &config, const ${configname}Config &max, const ${configname}Config &min) const = 0;
4950
virtual void calcLevel(uint32_t &level, const ${configname}Config &config1, const ${configname}Config &config2) const = 0;
@@ -71,7 +72,7 @@ namespace ${pkgname}
7172

7273
T ${configname}Config::* field;
7374

74-
virtual void clamp(${configname}Config &config, const ${configname}Config &max, const ${configname}Config &min) const
75+
virtual void clamp(${configname}Config &config, const ${configname}Config &max, const ${configname}Config &min) const override
7576
{
7677
if (config.*field > max.*field)
7778
config.*field = max.*field;
@@ -80,33 +81,33 @@ namespace ${pkgname}
8081
config.*field = min.*field;
8182
}
8283

83-
virtual void calcLevel(uint32_t &comb_level, const ${configname}Config &config1, const ${configname}Config &config2) const
84+
virtual void calcLevel(uint32_t &comb_level, const ${configname}Config &config1, const ${configname}Config &config2) const override
8485
{
8586
if (config1.*field != config2.*field)
8687
comb_level |= level;
8788
}
8889

89-
virtual void fromServer(const ros::NodeHandle &nh, ${configname}Config &config) const
90+
virtual void fromServer(const ros::NodeHandle &nh, ${configname}Config &config) const override
9091
{
9192
nh.getParam(name, config.*field);
9293
}
9394

94-
virtual void toServer(const ros::NodeHandle &nh, const ${configname}Config &config) const
95+
virtual void toServer(const ros::NodeHandle &nh, const ${configname}Config &config) const override
9596
{
9697
nh.setParam(name, config.*field);
9798
}
9899

99-
virtual bool fromMessage(const dynamic_reconfigure::Config &msg, ${configname}Config &config) const
100+
virtual bool fromMessage(const dynamic_reconfigure::Config &msg, ${configname}Config &config) const override
100101
{
101102
return dynamic_reconfigure::ConfigTools::getParameter(msg, name, config.*field);
102103
}
103104

104-
virtual void toMessage(dynamic_reconfigure::Config &msg, const ${configname}Config &config) const
105+
virtual void toMessage(dynamic_reconfigure::Config &msg, const ${configname}Config &config) const override
105106
{
106107
dynamic_reconfigure::ConfigTools::appendParameter(msg, name, config.*field);
107108
}
108109

109-
virtual void getValue(const ${configname}Config &config, boost::any &val) const
110+
virtual void getValue(const ${configname}Config &config, boost::any &val) const override
110111
{
111112
val = config.*field;
112113
}
@@ -124,6 +125,8 @@ namespace ${pkgname}
124125
id = i;
125126
}
126127

128+
virtual ~AbstractGroupDescription() = default;
129+
127130
std::vector<AbstractParamDescriptionConstPtr> abstract_parameters;
128131
bool state;
129132

@@ -161,7 +164,7 @@ namespace ${pkgname}
161164
abstract_parameters = g.abstract_parameters;
162165
}
163166

164-
virtual bool fromMessage(const dynamic_reconfigure::Config &msg, boost::any &cfg) const
167+
virtual bool fromMessage(const dynamic_reconfigure::Config &msg, boost::any &cfg) const override
165168
{
166169
PT* config = boost::any_cast<PT*>(cfg);
167170
if(!dynamic_reconfigure::ConfigTools::getGroupState(msg, name, (*config).*field))
@@ -177,7 +180,7 @@ namespace ${pkgname}
177180
return true;
178181
}
179182

180-
virtual void setInitialState(boost::any &cfg) const
183+
virtual void setInitialState(boost::any &cfg) const override
181184
{
182185
PT* config = boost::any_cast<PT*>(cfg);
183186
T* group = &((*config).*field);
@@ -191,7 +194,7 @@ namespace ${pkgname}
191194

192195
}
193196

194-
virtual void updateParams(boost::any &cfg, ${configname}Config &top) const
197+
virtual void updateParams(boost::any &cfg, ${configname}Config &top) const override
195198
{
196199
PT* config = boost::any_cast<PT*>(cfg);
197200

@@ -205,7 +208,7 @@ namespace ${pkgname}
205208
}
206209
}
207210

208-
virtual void toMessage(dynamic_reconfigure::Config &msg, const boost::any &cfg) const
211+
virtual void toMessage(dynamic_reconfigure::Config &msg, const boost::any &cfg) const override
209212
{
210213
const PT config = boost::any_cast<PT>(cfg);
211214
dynamic_reconfigure::ConfigTools::appendGroup<T>(msg, name, id, parent, config.*field);

0 commit comments

Comments
 (0)