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

Patch incorrect placement of BOOST_UBLAS_INLINE macros.

This commit is contained in:
Jonathan Wakely 2015-08-08 16:26:24 +01:00
parent ab7969c7cd
commit ece46177bc
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
boost-1.58-ublas-inlines.patch Normal file
View File

@ -0,0 +1,52 @@
From ca2ff08600fa63c8dea90897cfe649427bf58a6e Mon Sep 17 00:00:00 2001
From: Nasos <nasos_i@hotmail.com>
Date: Wed, 5 Aug 2015 10:17:51 -0400
Subject: [PATCH] Corrected inline issue in storage.hpp
---
include/boost/numeric/ublas/storage.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/boost/numeric/ublas/storage.hpp b/include/boost/numeric/ublas/storage.hpp
index 8821309..19bc907 100644
--- a/include/boost/numeric/ublas/storage.hpp
+++ b/include/boost/numeric/ublas/storage.hpp
@@ -777,8 +777,8 @@ namespace boost { namespace numeric { namespace ublas {
BOOST_UBLAS_INLINE
shallow_array_adaptor (size_type size, pointer data):
size_ (size), own_ (false), data_ (data, leaker<value_type> ()) {}
- BOOST_UBLAS_INLINE
template <size_t N>
+ BOOST_UBLAS_INLINE
shallow_array_adaptor (T (&data)[N]):
size_ (N), own_ (false), data_ (data, leaker<value_type> ()) {}
From b805369990aed13a2c837f642a280a7b6352e012 Mon Sep 17 00:00:00 2001
From: Nasos <nasos_i@hotmail.com>
Date: Wed, 5 Aug 2015 10:31:25 -0400
Subject: [PATCH] Corrected inline issue in storage.hpp
---
include/boost/numeric/ublas/storage.hpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/boost/numeric/ublas/storage.hpp b/include/boost/numeric/ublas/storage.hpp
index 19bc907..bd64892 100644
--- a/include/boost/numeric/ublas/storage.hpp
+++ b/include/boost/numeric/ublas/storage.hpp
@@ -833,13 +833,13 @@ namespace boost { namespace numeric { namespace ublas {
void resize (size_type size, pointer data, value_type init) {
resize_internal (size, data, init, true);
}
- BOOST_UBLAS_INLINE
template <size_t N>
+ BOOST_UBLAS_INLINE
void resize (T (&data)[N]) {
resize_internal (N, data, value_type (), false);
}
- BOOST_UBLAS_INLINE
template <size_t N>
+ BOOST_UBLAS_INLINE
void resize (T (&data)[N], value_type init) {
resize_internal (N, data, init, true);
}

9
boost.spec
View File

@ -32,7 +32,7 @@ Name: boost
Summary: The free peer-reviewed portable C++ source libraries
Version: 1.58.0
%define version_enc 1_58_0
Release: 3%{?dist}
Release: 4%{?dist}
License: Boost and MIT and Python
%define toplev_dirname %{name}_%{version_enc}
@ -130,6 +130,9 @@ Patch67: boost-1.58.0-variant-includes.patch
# Prevent gcc.jam from setting -m32 or -m64.
Patch68: boost-1.58.0-address-model.patch
# https://github.com/boostorg/ublas/pull/25
Patch69: boost-1.58-ublas-inlines.patch
Patch78: boost-context-use-sysv-not-aapcs.patch
%bcond_with tests
@ -621,6 +624,7 @@ a number of significant features and is now developed independently
%patch66 -p2
%patch67 -p2
%patch68 -p1
%patch69 -p2
%patch78 -p1
# At least python2_version needs to be a macro so that it's visible in
@ -1240,6 +1244,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/bjam.1*
%changelog
* Sat Aug 08 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-4
- Patch incorrect placement of BOOST_UBLAS_INLINE macros.
* Tue Aug 04 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-3
- Patch to prevent address model being set by Boost.Build.