diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-07-22 21:02:17 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-26 10:22:22 +0000 |
commit | 9bbed86d9c84a4faf6cc36b162d41a77d8480610 (patch) | |
tree | be2f0043ecf56532ce65fab0648485329c85ed8e | |
parent | c79e9046749c094f705234545a10c32279eeef60 (diff) |
Related: tdf#101057 inherit MalformedVersionException from std::exception
so we don't get std::terminate on MacOSX if its thrown up to
JavaVirtualMachine::getJavaVM
Change-Id: I1c6b79bf16cbaa66b8f79d495239e301d3ca58de
(cherry picked from commit a3b3c5fcd7efd3e33a0f0078bd6fd23689c45c41)
Reviewed-on: https://gerrit.libreoffice.org/27508
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r-- | jvmfwk/inc/vendorbase.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx index 1bb7844305e2..d5742783f5bc 100644 --- a/jvmfwk/inc/vendorbase.hxx +++ b/jvmfwk/inc/vendorbase.hxx @@ -82,7 +82,7 @@ OpenJDK at least, but probably not true for Lemotes JDK */ #endif // SPARC, INTEL, POWERPC, MIPS, MIPS64, ARM, IA64, M68K, HPPA, ALPHA -class MalformedVersionException +class MalformedVersionException : public std::exception { public: MalformedVersionException(); |