Skip to content

Commit 18b0435

Browse files
authored
core: Fix warnings in sio_message.h (#441)
Add overrides Remove shadowing
1 parent 6a3bd6a commit 18b0435

File tree

1 file changed

+26
-27
lines changed

1 file changed

+26
-27
lines changed

src/sio_message.h

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ namespace sio
143143
return ptr(new bool_message(v));
144144
}
145145

146-
bool get_bool() const
146+
bool get_bool() const override
147147
{
148148
return _v;
149149
}
@@ -164,14 +164,14 @@ namespace sio
164164
return ptr(new int_message(v));
165165
}
166166

167-
int64_t get_int() const
167+
int64_t get_int() const override
168168
{
169169
return _v;
170170
}
171171

172-
double get_double() const//add double accessor for integer.
172+
double get_double() const override
173173
{
174-
return static_cast<double>(_v);
174+
return static_cast<double>(_v);//add double accessor for integer.
175175
}
176176
};
177177

@@ -189,7 +189,7 @@ namespace sio
189189
return ptr(new double_message(v));
190190
}
191191

192-
double get_double() const
192+
double get_double() const override
193193
{
194194
return _v;
195195
}
@@ -218,7 +218,7 @@ namespace sio
218218
return ptr(new string_message(std::move(v)));
219219
}
220220

221-
std::string const& get_string() const
221+
std::string const& get_string() const override
222222
{
223223
return _v;
224224
}
@@ -237,7 +237,7 @@ namespace sio
237237
return ptr(new binary_message(v));
238238
}
239239

240-
std::shared_ptr<const std::string> const& get_binary() const
240+
std::shared_ptr<const std::string> const& get_binary() const override
241241
{
242242
return _v;
243243
}
@@ -256,10 +256,10 @@ namespace sio
256256
return ptr(new array_message());
257257
}
258258

259-
void push(message::ptr const& message)
259+
void push(message::ptr const& msg)
260260
{
261-
if(message)
262-
_v.push_back(message);
261+
if(msg)
262+
_v.push_back(msg);
263263
}
264264

265265
void push(const std::string& text)
@@ -284,9 +284,9 @@ namespace sio
284284
_v.push_back(binary_message::create(binary));
285285
}
286286

287-
void insert(size_t pos,message::ptr const& message)
287+
void insert(size_t pos,message::ptr const& msg)
288288
{
289-
_v.insert(_v.begin()+pos, message);
289+
_v.insert(_v.begin()+pos, msg);
290290
}
291291

292292
void insert(size_t pos,const std::string& text)
@@ -326,12 +326,12 @@ namespace sio
326326
return _v[i];
327327
}
328328

329-
std::vector<ptr>& get_vector()
329+
std::vector<ptr>& get_vector() override
330330
{
331331
return _v;
332332
}
333333

334-
const std::vector<ptr>& get_vector() const
334+
const std::vector<ptr>& get_vector() const override
335335
{
336336
return _v;
337337
}
@@ -349,9 +349,9 @@ namespace sio
349349
return ptr(new object_message());
350350
}
351351

352-
void insert(const std::string & key,message::ptr const& message)
352+
void insert(const std::string & key,message::ptr const& msg)
353353
{
354-
_v[key] = message;
354+
_v[key] = msg;
355355
}
356356

357357
void insert(const std::string & key,const std::string& text)
@@ -400,12 +400,12 @@ namespace sio
400400
return _v.find(key) != _v.end();
401401
}
402402

403-
std::map<std::string,message::ptr>& get_map()
403+
std::map<std::string,message::ptr>& get_map() override
404404
{
405405
return _v;
406406
}
407407

408-
const std::map<std::string,message::ptr>& get_map() const
408+
const std::map<std::string,message::ptr>& get_map() const override
409409
{
410410
return _v;
411411
}
@@ -447,11 +447,10 @@ namespace sio
447447

448448
}
449449

450-
list(message::ptr const& message)
450+
list(message::ptr const& msg)
451451
{
452-
if(message)
453-
m_vector.push_back(message);
454-
452+
if(msg)
453+
m_vector.push_back(msg);
455454
}
456455

457456
list(const std::string& text)
@@ -476,10 +475,10 @@ namespace sio
476475
m_vector.push_back(binary_message::create(binary));
477476
}
478477

479-
void push(message::ptr const& message)
478+
void push(message::ptr const& msg)
480479
{
481-
if(message)
482-
m_vector.push_back(message);
480+
if(msg)
481+
m_vector.push_back(msg);
483482
}
484483

485484
void push(const std::string& text)
@@ -504,9 +503,9 @@ namespace sio
504503
m_vector.push_back(binary_message::create(binary));
505504
}
506505

507-
void insert(size_t pos,message::ptr const& message)
506+
void insert(size_t pos,message::ptr const& msg)
508507
{
509-
m_vector.insert(m_vector.begin()+pos, message);
508+
m_vector.insert(m_vector.begin()+pos, msg);
510509
}
511510

512511
void insert(size_t pos,const std::string& text)

0 commit comments

Comments
 (0)