summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-12 15:24:53 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-12 15:24:53 +0200
commit2ed28620955108d56f40fc6613185f2595572e60 (patch)
tree6215130e8c632a4d7bf4c82c5e6c0edc68a39cc7 /desktop
parent13801e2c734d44cff49ea3d700749010dcb4c099 (diff)
Silence -Werror,-Wimplicit-fallthrough under NDEBUG
Change-Id: I7b2d5275614af69f6065d1838a76436801be30ef
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/officeipcthread.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 75bd51e7dc9c..c067a92555b9 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -546,15 +546,14 @@ RequestHandler::Status DbusIpcThread::enable(rtl::Reference<IpcThread> * thread)
}
return RequestHandler::IPC_STATUS_2ND_OFFICE;
}
- default:
- assert(false);
- // fall through
case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
case DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER:
SAL_WARN(
"desktop.app",
"dbus_bus_request_name failed with unexpected " << +n);
return RequestHandler::IPC_STATUS_BOOTSTRAP_ERROR;
+ default:
+ for (;;) std::abort();
}
}
}
@@ -636,15 +635,14 @@ void DbusIpcThread::close() {
break;
case DBUS_RELEASE_NAME_REPLY_RELEASED:
break;
- default:
- assert(false);
- // fall through
case DBUS_RELEASE_NAME_REPLY_NOT_OWNER:
case DBUS_RELEASE_NAME_REPLY_NON_EXISTENT:
SAL_WARN(
"desktop.app",
"dbus_bus_release_name failed with unexpected " << +n);
break;
+ default:
+ for (;;) std::abort();
}
connection_.clear();
}