lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master 9797cbc 04/10: Remove undesirable 'default:'


From: Greg Chicares
Subject: [lmi-commits] [lmi] master 9797cbc 04/10: Remove undesirable 'default:' from 'switch'
Date: Thu, 8 Feb 2018 08:40:09 -0500 (EST)

branch: master
commit 9797cbcfe59b9fecc2715be8959236033c9d3e9f
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Remove undesirable 'default:' from 'switch'
    
    Added cases for all enumerators that lacked one. Then removed 'default:'
    because it prevented gcc's '-Wswitch' from diagnosing other missing
    enumerators.
---
 ledger.cpp                  | 9 ++++++---
 ledger_pdf_generator_wx.cpp | 7 +++++--
 ledger_xsl.cpp              | 7 +++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ledger.cpp b/ledger.cpp
index 946e10a..d93fe76 100644
--- a/ledger.cpp
+++ b/ledger.cpp
@@ -108,7 +108,7 @@ void Ledger::SetRunBases(int length)
         // has become inoperative, but the code is preserved in case
         // such a format becomes desirable for some other reason.
         //
-        case nonexistent:  // {current, 0% int, 1/2 int%} X {guar, curr}
+        case mce_prospectus_obsolete: // {curr, 0% int, 1/2 int%} X {guar, 
curr}
             {
             l_map_rep[mce_run_gen_curr_sep_full] = LedgerVariant(length);
             l_map_rep[mce_run_gen_guar_sep_full] = LedgerVariant(length);
@@ -119,9 +119,12 @@ void Ledger::SetRunBases(int length)
             }
             break;
 #endif
-        default:
+        case mce_prospectus_obsolete:                 // fall through
+        case mce_offshore_private_placement_obsolete: // fall through
+        case mce_ill_reg_private_placement_obsolete:  // fall through
+        case mce_variable_annuity:
             {
-            alarum() << "Case '" << ledger_type_ << "' not found." << 
LMI_FLUSH;
+            alarum() << "Unsupported ledger type '" << ledger_type_ << "'." << 
LMI_FLUSH;
             }
         }
 
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index a9b67c7..a3a1f4c 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -2970,8 +2970,11 @@ void ledger_pdf_generator_wx::write
         case mce_individual_private_placement:
             pdf_ill = 
std::make_unique<pdf_illustration_reg_d_individual>(ledger, output);
             break;
-        default:
-            alarum() << "Unknown ledger type '" << z << "'." << LMI_FLUSH;
+        case mce_prospectus_obsolete:                 // fall through
+        case mce_offshore_private_placement_obsolete: // fall through
+        case mce_ill_reg_private_placement_obsolete:  // fall through
+        case mce_variable_annuity:
+            alarum() << "Unsupported ledger type '" << z << "'." << LMI_FLUSH;
         }
 
     pdf_ill->render_all();
diff --git a/ledger_xsl.cpp b/ledger_xsl.cpp
index c6c583b..161a8fe 100644
--- a/ledger_xsl.cpp
+++ b/ledger_xsl.cpp
@@ -50,9 +50,12 @@ std::string xsl_filename(Ledger const& ledger)
         case mce_nasd:                         return "nasd.xsl";
         case mce_group_private_placement:      return "reg_d_group.xsl";
         case mce_individual_private_placement: return "reg_d_individual.xsl";
-        default:
+        case mce_prospectus_obsolete:                 // fall through
+        case mce_offshore_private_placement_obsolete: // fall through
+        case mce_ill_reg_private_placement_obsolete:  // fall through
+        case mce_variable_annuity:
             {
-            alarum() << "Case '" << z << "' not found." << LMI_FLUSH;
+            alarum() << "Case '" << z << "' not supported." << LMI_FLUSH;
             }
         }
     throw "Unreachable--silences a compiler diagnostic.";



reply via email to

[Prev in Thread] Current Thread [Next in Thread]