Skip to content

Commit e3e91b9

Browse files
authored
Revert "ConfigType.h.template: fixed warnings (ros#136)" (ros#141)
This reverts commit db5594b.
1 parent 27b9191 commit e3e91b9

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

templates/ConfigType.h.template

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

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

7372
T ${configname}Config::* field;
7473

75-
virtual void clamp(${configname}Config &config, const ${configname}Config &max, const ${configname}Config &min) const override
74+
virtual void clamp(${configname}Config &config, const ${configname}Config &max, const ${configname}Config &min) const
7675
{
7776
if (config.*field > max.*field)
7877
config.*field = max.*field;
@@ -81,33 +80,33 @@ namespace ${pkgname}
8180
config.*field = min.*field;
8281
}
8382

84-
virtual void calcLevel(uint32_t &comb_level, const ${configname}Config &config1, const ${configname}Config &config2) const override
83+
virtual void calcLevel(uint32_t &comb_level, const ${configname}Config &config1, const ${configname}Config &config2) const
8584
{
8685
if (config1.*field != config2.*field)
8786
comb_level |= level;
8887
}
8988

90-
virtual void fromServer(const ros::NodeHandle &nh, ${configname}Config &config) const override
89+
virtual void fromServer(const ros::NodeHandle &nh, ${configname}Config &config) const
9190
{
9291
nh.getParam(name, config.*field);
9392
}
9493

95-
virtual void toServer(const ros::NodeHandle &nh, const ${configname}Config &config) const override
94+
virtual void toServer(const ros::NodeHandle &nh, const ${configname}Config &config) const
9695
{
9796
nh.setParam(name, config.*field);
9897
}
9998

100-
virtual bool fromMessage(const dynamic_reconfigure::Config &msg, ${configname}Config &config) const override
99+
virtual bool fromMessage(const dynamic_reconfigure::Config &msg, ${configname}Config &config) const
101100
{
102101
return dynamic_reconfigure::ConfigTools::getParameter(msg, name, config.*field);
103102
}
104103

105-
virtual void toMessage(dynamic_reconfigure::Config &msg, const ${configname}Config &config) const override
104+
virtual void toMessage(dynamic_reconfigure::Config &msg, const ${configname}Config &config) const
106105
{
107106
dynamic_reconfigure::ConfigTools::appendParameter(msg, name, config.*field);
108107
}
109108

110-
virtual void getValue(const ${configname}Config &config, boost::any &val) const override
109+
virtual void getValue(const ${configname}Config &config, boost::any &val) const
111110
{
112111
val = config.*field;
113112
}
@@ -125,8 +124,6 @@ namespace ${pkgname}
125124
id = i;
126125
}
127126

128-
virtual ~AbstractGroupDescription() = default;
129-
130127
std::vector<AbstractParamDescriptionConstPtr> abstract_parameters;
131128
bool state;
132129

@@ -164,7 +161,7 @@ namespace ${pkgname}
164161
abstract_parameters = g.abstract_parameters;
165162
}
166163

167-
virtual bool fromMessage(const dynamic_reconfigure::Config &msg, boost::any &cfg) const override
164+
virtual bool fromMessage(const dynamic_reconfigure::Config &msg, boost::any &cfg) const
168165
{
169166
PT* config = boost::any_cast<PT*>(cfg);
170167
if(!dynamic_reconfigure::ConfigTools::getGroupState(msg, name, (*config).*field))
@@ -180,7 +177,7 @@ namespace ${pkgname}
180177
return true;
181178
}
182179

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

195192
}
196193

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

@@ -208,7 +205,7 @@ namespace ${pkgname}
208205
}
209206
}
210207

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

0 commit comments

Comments
 (0)