rpms
/
boost
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch to fix #1485641

This commit is contained in:
Jonathan Wakely 2017-09-12 17:46:27 +01:00
parent c993c3c511
commit 70802cf016
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
boost-1.63.0-icl-ttp-matching.patch Normal file
View File

@ -0,0 +1,37 @@
From 32178e147a976419b9ac846d3c40c3ab4d1e0ff6 Mon Sep 17 00:00:00 2001
From: Mathias Gaunard <mathias@gaunard.com>
Date: Thu, 4 May 2017 17:18:22 +0100
Subject: [PATCH] Compatibility with GCC 7.1
The libstdc++ shipped with GCC 7.1 uses a unary class template for std::string.
type_to_string needs to be adapted to deal with this properly.
---
include/boost/icl/type_traits/type_to_string.hpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/boost/icl/type_traits/type_to_string.hpp b/include/boost/icl/type_traits/type_to_string.hpp
index 80c473a..994711b 100644
--- a/include/boost/icl/type_traits/type_to_string.hpp
+++ b/include/boost/icl/type_traits/type_to_string.hpp
@@ -43,7 +43,6 @@ namespace boost{ namespace icl
template<>inline std::string type_to_string<float>::apply() { return "flt"; }
template<>inline std::string type_to_string<double>::apply() { return "dbl"; }
- template<>inline std::string type_to_string<std::string>::apply() { return "string"; }
//-------------------------------------------------------------------------
template<template<class> class Templ>
@@ -78,6 +77,13 @@ namespace boost{ namespace icl
}
};
+ // ---------------------------------------------------------------------------
+ template<>
+ struct type_to_string<std::string>
+ {
+ static std::string apply() { return "string"; }
+ };
+
}} // namespace boost icl
#endif

6
boost.spec
View File

@ -133,6 +133,10 @@ Patch83: boost-1.63.0-dual-python-build.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1478329
Patch84: boost-1.63.0-VERSION-parameter.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1485641
# https://github.com/boostorg/icl/pull/9
Patch86: boost-1.63.0-icl-ttp-matching.patch
%bcond_with tests
%bcond_with docs_generated
@ -654,6 +658,7 @@ a number of significant features and is now developed independently
%patch82 -p0
%patch83 -p1
%patch84 -p1
%patch86 -p2
# At least python2_version needs to be a macro so that it's visible in
# %%install as well.
@ -1301,6 +1306,7 @@ fi
%changelog
* Tue Sep 12 2017 Jonathan Wakely <jwakely@redhat.com> - 1.63.0-7
- Fix descriptions
- Patch to fix #1485641
* Wed Aug 09 2017 Jonathan Wakely <jwakely@redhat.com> - 1.63.0-6
- Rename VERSION variable to avoid clashing with autotools macro (#1478329)