From: Shane Carr <shane@unicode.org>
Date: Wed, 2 May 2018 04:29:25 +0000 (+0000)
Subject: ICU-13716 Adding default return values after U_ASSERT(FALSE) to silence compiler... 
X-Git-Tag: release-62-rc~170
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b840d51ed9b0e8017d12e98c2bf2e25ecc74f1f5;p=icu

ICU-13716 Adding default return values after U_ASSERT(FALSE) to silence compiler warnings in non-debug builds.

X-SVN-Rev: 41305
---

diff --git a/icu4c/source/i18n/number_grouping.cpp b/icu4c/source/i18n/number_grouping.cpp
index 5e94fca8f3b..4a1cceb4994 100644
--- a/icu4c/source/i18n/number_grouping.cpp
+++ b/icu4c/source/i18n/number_grouping.cpp
@@ -48,6 +48,7 @@ Grouper Grouper::forStrategy(UGroupingStrategy grouping) {
         return {3, 3, 1, grouping};
     default:
         U_ASSERT(FALSE);
+        return {}; // return a value: silence compiler warning
     }
 }
 
diff --git a/icu4c/source/i18n/number_skeletons.cpp b/icu4c/source/i18n/number_skeletons.cpp
index d5605817041..ec7041d3374 100644
--- a/icu4c/source/i18n/number_skeletons.cpp
+++ b/icu4c/source/i18n/number_skeletons.cpp
@@ -161,6 +161,7 @@ Notation stem_to_object::notation(skeleton::StemEnum stem) {
             return Notation::simple();
         default:
             U_ASSERT(false);
+            return Notation::simple(); // return a value: silence compiler warning
     }
 }
 
@@ -177,6 +178,7 @@ MeasureUnit stem_to_object::unit(skeleton::StemEnum stem) {
             return NoUnit::permille(); // NOLINT
         default:
             U_ASSERT(false);
+            return {}; // return a value: silence compiler warning
     }
 }
 
@@ -192,6 +194,7 @@ Rounder stem_to_object::rounder(skeleton::StemEnum stem) {
             return Rounder::currency(UCURR_USAGE_CASH);
         default:
             U_ASSERT(false);
+            return Rounder::integer(); // return a value: silence compiler warning
     }
 }
 
@@ -601,6 +604,7 @@ skeleton::parseStem(const StringSegment& segment, const UCharsTrie& stemTrie, Se
 
         default:
             U_ASSERT(false);
+            return STATE_NULL; // return a value: silence compiler warning
     }
 }