From 88eb13611e1e5626069e1a45ad5fd95fd4618431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 11 May 2021 20:25:31 +0200 Subject: Fix ftbfs on Fedora 34 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit error: ISO C++17 does not allow dynamic exception specifications Signed-off-by: François Andriot --- src/svnqt/client_merge.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/svnqt/client_merge.cpp') diff --git a/src/svnqt/client_merge.cpp b/src/svnqt/client_merge.cpp index a067244..feb846c 100644 --- a/src/svnqt/client_merge.cpp +++ b/src/svnqt/client_merge.cpp @@ -22,7 +22,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, bool dry_run, bool record_only, const StringArray&merge_options - ) throw (ClientException) + ) { Pool pool; svn_error_t * error = 0; @@ -87,7 +87,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, bool force, bool record_only, const StringArray&merge_options - ) throw (ClientException) + ) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) Pool pool; @@ -129,7 +129,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, bool dry_run, bool force, const StringArray&merge_options - ) throw (ClientException) + ) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) RevisionRanges ranges; -- cgit v1.2.1