[Libreoffice-commits] core.git: codemaker/source

[Stephan Bergmann]

 codemaker/source/cppumaker/cpputype.cxx |    6 +++---
 codemaker/source/javamaker/javatype.cxx |   10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 0dc02bb9618e9852c5b3326a678910283922ffd7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 12 14:14:54 2016 +0200

    Silence -Werror,-Wimplicit-fallthrough under NDEBUG
    
    Change-Id: I6abfef139197379f04e1a9df80e974c5d4021890

diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 0c7be86..28411ba 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -5,7 +5,7 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+*
  * This file incorporates work covered by the following license notice:
  *
  *   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,6 +21,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdlib>
 #include <map>
 #include <set>
 #include <vector>
@@ -870,8 +871,7 @@ void CppuType::dumpCppuGetType(
         }
         break;
     case codemaker::UnoType::Sort::Typedef:
-        assert(false); // this cannot happen
-        // fall through
+        for (;;) std::abort(); // this cannot happen
     default:
         throw CannotDumpException(
             "unexpected entity \"" + name
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index c39230a..038cd32 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -21,6 +21,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdlib>
 #include <list>
 #include <map>
 #include <memory>
@@ -937,8 +938,7 @@ sal_uInt16 addFieldInit(
             }
         case codemaker::UnoType::Sort::Sequence:
         case codemaker::UnoType::Sort::Typedef:
-            assert(false); // this cannot happen
-            // fall through
+            for (;;) std::abort(); // this cannot happen
         default:
             throw CannotDumpException(
                 "unexpected entity \"" + fieldType
@@ -1241,8 +1241,7 @@ sal_uInt16 addLoadLocal(
                 break;
             case codemaker::UnoType::Sort::Sequence:
             case codemaker::UnoType::Sort::Typedef:
-                assert(false); // this cannot happen
-                // fall through
+                for (;;) std::abort(); // this cannot happen
             default:
                 throw CannotDumpException(
                     "unexpected entity \"" + type
@@ -1280,8 +1279,7 @@ sal_uInt16 addLoadLocal(
                     break;
                 case codemaker::UnoType::Sort::Sequence:
                 case codemaker::UnoType::Sort::Typedef:
-                    assert(false); // this cannot happen
-                    // fall through
+                    for (;;) std::abort(); // this cannot happen
                 default:
                     throw CannotDumpException(
                         "unexpected entity \"" + type