diff options
| -rw-r--r-- | 453.patch | 57 | ||||
| -rw-r--r-- | cassandra-cpp-driver.spec | 9 |
2 files changed, 65 insertions, 1 deletions
diff --git a/453.patch b/453.patch new file mode 100644 index 0000000..0e1f8cb --- /dev/null +++ b/453.patch @@ -0,0 +1,57 @@ +From 1709ca129d0d1da3e473a0fcc3a90ccc409012bd Mon Sep 17 00:00:00 2001 +From: Eric Evans <eevans@wikimedia.org> +Date: Fri, 16 Aug 2019 18:43:22 -0500 +Subject: [PATCH] CPP-754: remove user-defined copy contructors + +Under GCC9 `-Werror=deprecated-copy` makes an implicit declaration of +a copy contructor an error if a user-provided one exists. + +See also: https://gcc.gnu.org/onlinedocs/gcc-9.1.0/gcc/C_002b_002b-Dialect-Options.html#index-Wdeprecated-copy +--- + src/deque.hpp | 3 --- + src/map.hpp | 3 --- + src/vector.hpp | 3 --- + 3 files changed, 9 deletions(-) + +diff --git a/src/deque.hpp b/src/deque.hpp +index f4671f180..5541c6c51 100644 +--- a/src/deque.hpp ++++ b/src/deque.hpp +@@ -28,9 +28,6 @@ class Deque : public std::deque<T, internal::Allocator<T> > { + template <class InputIt> + Deque(InputIt first, InputIt last, const Allocator& alloc = Allocator()) + : std::deque<T, Allocator>(first, last, alloc) {} +- +- Deque(const Deque& other) +- : std::deque<T, Allocator>(other) {} + }; + + }} // namespace datastax::internal +diff --git a/src/map.hpp b/src/map.hpp +index 679cdfa5c..aa9999924 100644 +--- a/src/map.hpp ++++ b/src/map.hpp +@@ -25,9 +25,6 @@ class Map + explicit Map(const Compare& compare = Compare(), const Allocator& alloc = Allocator()) + : std::map<K, V, Compare, Allocator>(compare, alloc) {} + +- Map(const Map& other) +- : std::map<K, V, Compare, Allocator>(other) {} +- + template <class InputIt> + Map(InputIt first, InputIt last, const Compare& compare = Compare(), + const Allocator& alloc = Allocator()) +diff --git a/src/vector.hpp b/src/vector.hpp +index 71114c75a..1d4204201 100644 +--- a/src/vector.hpp ++++ b/src/vector.hpp +@@ -28,9 +28,6 @@ class Vector + explicit Vector(size_t count, const T& value = T()) + : std::vector<T, Allocator>(count, value) {} + +- Vector(const Vector& other) +- : std::vector<T, Allocator>(other) {} +- + template <class InputIt> + Vector(InputIt first, InputIt last) + : std::vector<T, Allocator>(first, last) {} diff --git a/cassandra-cpp-driver.spec b/cassandra-cpp-driver.spec index d73d5f1..0068ee8 100644 --- a/cassandra-cpp-driver.spec +++ b/cassandra-cpp-driver.spec @@ -18,13 +18,15 @@ Name: cassandra-cpp-driver Summary: DataStax C/C++ Driver for Apache Cassandra Version: 2.13.0%{?prever:~%{prever}} -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://datastax.github.io/cpp-driver/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever:-%{prever}}-%{gh_short}.tar.gz +Patch0: https://patch-diff.githubusercontent.com/raw/datastax/cpp-driver/pull/453.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake >= 2.6.4 @@ -52,6 +54,7 @@ for %{name}. %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 -b .up find examples -name .gitignore -exec rm {} \; -print @@ -90,6 +93,10 @@ make install DESTDIR="%{buildroot}" %changelog +* Tue Aug 20 2019 Remi Collet <remi@remirepo.net> - 2.13.0-2 +- add upstream patch for GCC 9 from + https://github.com/datastax/cpp-driver/pull/453 + * Thu Jul 4 2019 Remi Collet <remi@remirepo.net> - 2.13.0-1 - update to 2.13.0 |