desktop/source/app/officeipcthread.cxx | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 2ed28620955108d56f40fc6613185f2595572e60
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu May 12 15:24:53 2016 +0200
Silence -Werror,-Wimplicit-fallthrough under NDEBUG
Change-Id: I7b2d5275614af69f6065d1838a76436801be30ef
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 75bd51e..c067a92 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();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
