diff options
| author | François Andriot <francois.andriot@free.fr> | 2021-05-11 20:25:31 +0200 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-12 10:15:26 +0900 |
| commit | 9d4e94e13f2b4f8848911da038eaffcea9dce7a7 (patch) | |
| tree | eb933112528741ceec4ada90a71ae7a8adac3a23 /src/svnqt/client_merge.cpp | |
| parent | eb8fa2d68a46e05c52d67e98abb60e9bb70cfa6c (diff) | |
| download | tdesvn-9d4e94e1.tar.gz tdesvn-9d4e94e1.zip | |
Fix ftbfs on Fedora 34
error: ISO C++17 does not allow dynamic exception specifications
Signed-off-by: François Andriot <francois.andriot@free.fr>
(cherry picked from commit 88eb13611e1e5626069e1a45ad5fd95fd4618431)
Diffstat (limited to 'src/svnqt/client_merge.cpp')
| -rw-r--r-- | src/svnqt/client_merge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; |