[mdds] fix includes in header file
David Tardon
dtardon at fedoraproject.org
Thu Jan 29 09:15:44 UTC 2015
commit 9b11ee931a8c96db56743883490f54b6a5337892
Author: David Tardon <dtardon at redhat.com>
Date: Thu Jan 29 10:12:32 2015 +0100
fix includes in header file
0001-algorithm-is-needed-unconditionally.patch | 33 ++++++++++++++++++++++++
mdds.spec | 9 +++++-
2 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/0001-algorithm-is-needed-unconditionally.patch b/0001-algorithm-is-needed-unconditionally.patch
new file mode 100644
index 0000000..24e2278
--- /dev/null
+++ b/0001-algorithm-is-needed-unconditionally.patch
@@ -0,0 +1,33 @@
+From c45e0499dded11dc2aacea40b470ab1431ea535a Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Thu, 29 Jan 2015 10:04:56 +0100
+Subject: [PATCH] <algorithm> is needed unconditionally
+
+---
+ include/mdds/multi_type_vector_types.hpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp
+index db8d584..0a36333 100644
+--- a/include/mdds/multi_type_vector_types.hpp
++++ b/include/mdds/multi_type_vector_types.hpp
+@@ -32,6 +32,8 @@
+ #include "compat/unique_ptr.hpp"
+ #include "global.hpp"
+
++#include <algorithm>
++
+ #ifdef MDDS_MULTI_TYPE_VECTOR_USE_DEQUE
+ #include <deque>
+ #else
+@@ -40,7 +42,6 @@
+ #include <boost/noncopyable.hpp>
+
+ #if defined(MDDS_UNIT_TEST) || defined (MDDS_MULTI_TYPE_VECTOR_DEBUG)
+-#include <algorithm>
+ #include <iostream>
+ #include <sstream>
+ using std::cout;
+--
+2.1.0
+
diff --git a/mdds.spec b/mdds.spec
index a593d41..e05481e 100644
--- a/mdds.spec
+++ b/mdds.spec
@@ -3,7 +3,7 @@
Name: mdds
Version: 0.11.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A collection of multi-dimensional data structures and indexing algorithms
Group: Development/Libraries
@@ -13,6 +13,8 @@ Source0: http://kohei.us/files/%{name}/src/%{name}_%{version}.tar.bz2
BuildRequires: boost-devel
+Patch0: 0001-algorithm-is-needed-unconditionally.patch
+
%description
A collection of multi-dimensional data structures and indexing algorithms.
@@ -37,7 +39,7 @@ Provides: %{name}-static = %{version}-%{release}
Headers for %{name}.
%prep
-%setup -q -n %{name}_%{version}
+%autosetup -n %{name}_%{version} -p1
# this is only used in tests
sed -i -e '/^CPPFLAGS_NODEBUG=/s/=.*/="%{optflags}"/' configure
@@ -59,6 +61,9 @@ make check %{?_smp_mflags}
%doc AUTHORS COPYING NEWS README
%changelog
+* Thu Jan 29 2015 David Tardon <dtardon at redhat.com> - 0.11.2-3
+- fix includes in header file
+
* Tue Jan 27 2015 Petr Machata <pmachata at redhat.com> - 0.11.2-2
- Rebuild for boost 1.57.0
More information about the scm-commits
mailing list