From f7b3cef45b26321f76ec24e5fd027b1c096d3118 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 12 May 2016 14:11:38 +0200
Subject: Massage code to avoid warnings

Change-Id: I112f5e7c845184b9aa5285ecfa40b5bbb34ffde1
---
 unoidl/source/unoidl-check.cxx | 5 ++---
 unoidl/source/unoidl-read.cxx  | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'unoidl')

diff --git a/unoidl/source/unoidl-check.cxx b/unoidl/source/unoidl-check.cxx
index ff01d24d493a..6504f0fd333a 100644
--- a/unoidl/source/unoidl-check.cxx
+++ b/unoidl/source/unoidl-check.cxx
@@ -206,9 +206,6 @@ void checkMap(
                 std::exit(EXIT_FAILURE);
             }
             switch (entA->getSort()) {
-            case unoidl::Entity::SORT_MODULE:
-                assert(false && "this cannot happen");
-                //deliberate fall-through anyway
             case unoidl::Entity::SORT_ENUM_TYPE:
                 {
                     rtl::Reference<unoidl::EnumTypeEntity> ent2A(
@@ -886,6 +883,8 @@ void checkMap(
                     }
                     break;
                 }
+            case unoidl::Entity::SORT_MODULE:
+                assert(false && "this cannot happen");
             }
         }
     }
diff --git a/unoidl/source/unoidl-read.cxx b/unoidl/source/unoidl-read.cxx
index 32bd012d8bac..93bbc1907075 100644
--- a/unoidl/source/unoidl-read.cxx
+++ b/unoidl/source/unoidl-read.cxx
@@ -243,8 +243,6 @@ void scanMap(
                                  ->isPublished())))))
                 .first);
             switch (ent->getSort()) {
-            case unoidl::Entity::SORT_MODULE:
-                assert(false && "this cannot happen");
             case unoidl::Entity::SORT_ENUM_TYPE:
             case unoidl::Entity::SORT_CONSTANT_GROUP:
                 break;
@@ -365,6 +363,8 @@ void scanMap(
                     insertEntityDependency(manager, i, ent2->getBase());
                     break;
                 }
+            case unoidl::Entity::SORT_MODULE:
+                assert(false && "this cannot happen");
             }
         }
     }
@@ -575,9 +575,6 @@ void writeEntity(
         rtl::Reference<unoidl::PublishableEntity> ent(
             static_cast<unoidl::PublishableEntity *>(i->second.entity.get()));
         switch (ent->getSort()) {
-        case unoidl::Entity::SORT_MODULE:
-            assert(false && "this cannot happen");
-            //deliberate fall-through anyway
         case unoidl::Entity::SORT_ENUM_TYPE:
             {
                 rtl::Reference<unoidl::EnumTypeEntity> ent2(
@@ -1010,6 +1007,8 @@ void writeEntity(
                 std::cout << "; };";
                 break;
             }
+        case unoidl::Entity::SORT_MODULE:
+            assert(false && "this cannot happen");
         }
     }
 }
-- 
cgit