summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Beyer <stephan.beyer@uni-osnabrueck.de>2017-03-03 15:27:49 +0100
committerStephan Beyer <s-beyer@gmx.net>2017-03-05 22:12:10 +0100
commit87fc170cdfcb2f7f03e8adca1579feb734a81e70 (patch)
treeec14df97e1f682a6b2cc80666868405fda338429
parent8ce4592e159bc42f7c6136fb5a4627ff2b32efff (diff)
Silence g++ 7.0.1 -Wimplicit-fallthrough warnings
This is accomplished by putting a // fallthrough comment at the right place. This seems to be more portable than an attribute-based solution like [[fallthrough]] or __attribute__((fallthrough)).
-rw-r--r--src/pugixml.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index 53bb83c..cb8e862 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -10110,10 +10110,9 @@ PUGI__NS_BEGIN
if (_rettype == xpath_type_boolean)
return _data.variable->get_boolean();
-
- // fallthrough to type conversion
}
+ // fallthrough
default:
{
switch (_rettype)
@@ -10246,10 +10245,9 @@ PUGI__NS_BEGIN
if (_rettype == xpath_type_number)
return _data.variable->get_number();
-
- // fallthrough to type conversion
}
+ // fallthrough
default:
{
switch (_rettype)
@@ -10538,10 +10536,9 @@ PUGI__NS_BEGIN
if (_rettype == xpath_type_string)
return xpath_string::from_const(_data.variable->get_string());
-
- // fallthrough to type conversion
}
+ // fallthrough
default:
{
switch (_rettype)
@@ -10688,10 +10685,9 @@ PUGI__NS_BEGIN
return ns;
}
-
- // fallthrough to type conversion
}
+ // fallthrough
default:
assert(false && "Wrong expression for return type node set");
return xpath_node_set_raw();