diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-11-07 11:57:15 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-11-07 11:57:15 +0200 |
| commit | bc1616e3e45967ccec892d14a9337554238ca332 (patch) | |
| tree | d7783ea36e2c9423d90809bca715537bee99c285 /odb/relational | |
| parent | 6e374de9ae2f2978f2fca3390aba4ea3f72bfade (diff) | |
Get rid of GCC 7 case fall-through warnings
Diffstat (limited to 'odb/relational')
| -rw-r--r-- | odb/relational/mysql/context.cxx | 9 | ||||
| -rw-r--r-- | odb/relational/oracle/context.cxx | 4 | ||||
| -rw-r--r-- | odb/relational/pgsql/context.cxx | 9 | ||||
| -rw-r--r-- | odb/relational/source.cxx | 2 |
4 files changed, 8 insertions, 16 deletions
diff --git a/odb/relational/mysql/context.cxx b/odb/relational/mysql/context.cxx index 3893c16..53df6cf 100644 --- a/odb/relational/mysql/context.cxx +++ b/odb/relational/mysql/context.cxx @@ -513,10 +513,9 @@ namespace relational } } - // Fall through. - // s = parse_name; } + // Fall through. case parse_name: { if (tt == sql_token::t_identifier) @@ -719,10 +718,9 @@ namespace relational return error (ct, "expected MySQL type name"); } - // Fall through. - // s = parse_range; } + // Fall through. case parse_range: { if (t.punctuation () == sql_token::p_lparen) @@ -805,10 +803,9 @@ namespace relational continue; } - // Fall through. - // s = parse_sign; } + // Fall through. case parse_sign: { if (tt == sql_token::t_identifier && diff --git a/odb/relational/oracle/context.cxx b/odb/relational/oracle/context.cxx index 1c5b669..d6cd719 100644 --- a/odb/relational/oracle/context.cxx +++ b/odb/relational/oracle/context.cxx @@ -636,10 +636,8 @@ namespace relational return error (ct, "unexepected '" + t.literal () + "' in Oracle type declaration"); } - - // Fall through. - // } + // Fall through. case parse_prec: { if (t.punctuation () == sql_token::p_lparen) diff --git a/odb/relational/pgsql/context.cxx b/odb/relational/pgsql/context.cxx index 7f900c7..4b4b3d2 100644 --- a/odb/relational/pgsql/context.cxx +++ b/odb/relational/pgsql/context.cxx @@ -495,10 +495,9 @@ namespace relational } } - // Fall through. - // s = parse_name; } + // Fall through. case parse_name: { if (tt == sql_token::t_identifier) @@ -643,10 +642,9 @@ namespace relational : "expected PostgreSQL type name"); } - // Fall through. - // s = parse_range; } + // Fall through. case parse_range: { if (t.punctuation () == sql_token::p_lparen) @@ -691,10 +689,9 @@ namespace relational continue; } - // Fall through. - // s = parse_suffix; } + // Fall through. case parse_suffix: { if (r.type == sql_type::TIME || r.type == sql_type::TIMESTAMP) diff --git a/odb/relational/source.cxx b/odb/relational/source.cxx index acbc073..4a7dc46 100644 --- a/odb/relational/source.cxx +++ b/odb/relational/source.cxx @@ -6247,8 +6247,8 @@ namespace relational continue; // We have already gotten the next token. } } - // Fall through. } + // Fall through. default: { // Handle CPP_KEYWORD here to avoid a warning (it is not |