Skip to content

Commit 46a6d77

Browse files
authored
Merge pull request #39 from pkunavin/master
Fix GCC-7 Wimplicit-fallthrough warnings.
2 parents d563f7f + 8a2812d commit 46a6d77

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

tinyformat.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,23 +704,27 @@ inline const char* streamStateFromFormat(std::ostream& out, bool& spacePadPositi
704704
break;
705705
case 'X':
706706
out.setf(std::ios::uppercase);
707+
// Falls through
707708
case 'x': case 'p':
708709
out.setf(std::ios::hex, std::ios::basefield);
709710
intConversion = true;
710711
break;
711712
case 'E':
712713
out.setf(std::ios::uppercase);
714+
// Falls through
713715
case 'e':
714716
out.setf(std::ios::scientific, std::ios::floatfield);
715717
out.setf(std::ios::dec, std::ios::basefield);
716718
break;
717719
case 'F':
718720
out.setf(std::ios::uppercase);
721+
// Falls through
719722
case 'f':
720723
out.setf(std::ios::fixed, std::ios::floatfield);
721724
break;
722725
case 'G':
723726
out.setf(std::ios::uppercase);
727+
// Falls through
724728
case 'g':
725729
out.setf(std::ios::dec, std::ios::basefield);
726730
// As in boost::format, let stream decide float format.

0 commit comments

Comments
 (0)